Don't watch for OOB data ... unix domain sockets don't support it anyway.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28109 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2009-03-21 09:21:05 +00:00
parent fc9ea5d5c4
commit 4eb3bbff82

View file

@ -393,18 +393,10 @@ static Class runLoopClass;
type: ET_WDESC type: ET_WDESC
watcher: self watcher: self
forMode: NSConnectionReplyMode]; forMode: NSConnectionReplyMode];
[l addEvent: (void*)(uintptr_t)desc
type: ET_EDESC
watcher: self
forMode: NSConnectionReplyMode];
[l addEvent: (void*)(uintptr_t)desc [l addEvent: (void*)(uintptr_t)desc
type: ET_WDESC type: ET_WDESC
watcher: self watcher: self
forMode: NSDefaultRunLoopMode]; forMode: NSDefaultRunLoopMode];
[l addEvent: (void*)(uintptr_t)desc
type: ET_EDESC
watcher: self
forMode: NSDefaultRunLoopMode];
while (valid == YES && state == GS_H_TRYCON while (valid == YES && state == GS_H_TRYCON
&& [when timeIntervalSinceNow] > 0) && [when timeIntervalSinceNow] > 0)
@ -416,18 +408,10 @@ static Class runLoopClass;
type: ET_WDESC type: ET_WDESC
forMode: NSConnectionReplyMode forMode: NSConnectionReplyMode
all: NO]; all: NO];
[l removeEvent: (void*)(uintptr_t)desc
type: ET_EDESC
forMode: NSConnectionReplyMode
all: NO];
[l removeEvent: (void*)(uintptr_t)desc [l removeEvent: (void*)(uintptr_t)desc
type: ET_WDESC type: ET_WDESC
forMode: NSDefaultRunLoopMode forMode: NSDefaultRunLoopMode
all: NO]; all: NO];
[l removeEvent: (void*)(uintptr_t)desc
type: ET_EDESC
forMode: NSDefaultRunLoopMode
all: NO];
if (state == GS_H_TRYCON) if (state == GS_H_TRYCON)
{ {
@ -504,10 +488,6 @@ static Class runLoopClass;
type: ET_WDESC type: ET_WDESC
forMode: nil forMode: nil
all: YES]; all: YES];
[l removeEvent: (void*)(uintptr_t)desc
type: ET_EDESC
forMode: nil
all: YES];
NSDebugMLLog(@"NSMessagePort", @"invalidated 0x%x", self); NSDebugMLLog(@"NSMessagePort", @"invalidated 0x%x", self);
[[self recvPort] removeHandle: self]; [[self recvPort] removeHandle: self];
[[self sendPort] removeHandle: self]; [[self sendPort] removeHandle: self];
@ -549,10 +529,6 @@ static Class runLoopClass;
type: ET_WDESC type: ET_WDESC
forMode: mode forMode: mode
all: YES]; all: YES];
[l removeEvent: data
type: ET_EDESC
forMode: mode
all: YES];
return; return;
} }
@ -1029,18 +1005,10 @@ static Class runLoopClass;
type: ET_WDESC type: ET_WDESC
watcher: self watcher: self
forMode: NSConnectionReplyMode]; forMode: NSConnectionReplyMode];
[l addEvent: (void*)(uintptr_t)desc
type: ET_EDESC
watcher: self
forMode: NSConnectionReplyMode];
[l addEvent: (void*)(uintptr_t)desc [l addEvent: (void*)(uintptr_t)desc
type: ET_WDESC type: ET_WDESC
watcher: self watcher: self
forMode: NSDefaultRunLoopMode]; forMode: NSDefaultRunLoopMode];
[l addEvent: (void*)(uintptr_t)desc
type: ET_EDESC
watcher: self
forMode: NSDefaultRunLoopMode];
while (valid == YES while (valid == YES
&& [wMsgs indexOfObjectIdenticalTo: components] != NSNotFound && [wMsgs indexOfObjectIdenticalTo: components] != NSNotFound
@ -1055,18 +1023,10 @@ static Class runLoopClass;
type: ET_WDESC type: ET_WDESC
forMode: NSConnectionReplyMode forMode: NSConnectionReplyMode
all: NO]; all: NO];
[l removeEvent: (void*)(uintptr_t)desc
type: ET_EDESC
forMode: NSConnectionReplyMode
all: NO];
[l removeEvent: (void*)(uintptr_t)desc [l removeEvent: (void*)(uintptr_t)desc
type: ET_WDESC type: ET_WDESC
forMode: NSDefaultRunLoopMode forMode: NSDefaultRunLoopMode
all: NO]; all: NO];
[l removeEvent: (void*)(uintptr_t)desc
type: ET_EDESC
forMode: NSDefaultRunLoopMode
all: NO];
if ([wMsgs indexOfObjectIdenticalTo: components] == NSNotFound) if ([wMsgs indexOfObjectIdenticalTo: components] == NSNotFound)
{ {
@ -1673,7 +1633,6 @@ typedef struct {
if (type == ET_RDESC) t = "rdesc"; if (type == ET_RDESC) t = "rdesc";
else if (type == ET_WDESC) t = "wdesc"; else if (type == ET_WDESC) t = "wdesc";
else if (type == ET_EDESC) t = "edesc";
else if (type == ET_RPORT) t = "rport"; else if (type == ET_RPORT) t = "rport";
else t = "unknown"; else t = "unknown";
NSLog(@"No handle for event %s on descriptor %d", t, desc); NSLog(@"No handle for event %s on descriptor %d", t, desc);