Differences From Artifact [c7ee699c53]:
- File
src/OFKernelEventObserver_select.m
— part of check-in
[7ae17af9f0]
at
2016-03-20 11:57:06
on branch trunk
— Never block when the read buffer is non-empty
This was broken by 88f2f03. The problem only existed when something was
in the read buffer, but not processed completely, as after processing
the read buffer, it would go on to wait for data - but since not the
entire read buffer had been processed, it meant there was still data
left there that needed to be handled first. (user: js, size: 4765) [annotate] [blame] [check-ins using]
To Artifact [e66acd4ec0]:
- File
src/OFKernelEventObserver_select.m
— part of check-in
[45518ae7b7]
at
2016-03-20 14:07:47
on branch trunk
— Use the locked queue for kqueue and epoll as well
_readObjects must only be changed from the thread running the observer
and not from a thread adding or removing objects to observe. This is
already handled by the locked queue used by poll and select, so the best
way to solve this is to use the locked queue for kqueue and epoll as
well. (user: js, size: 4955) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
60 61 62 63 64 65 66 | @throw [OFOutOfRangeException exception]; _maxFD = (int)_cancelFD[0]; return self; } | | > | | | > | | | < > > | < > > | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 |
@throw [OFOutOfRangeException exception];
_maxFD = (int)_cancelFD[0];
return self;
}
- (void)OF_addObjectForReading: (id <OFReadyForReadingObserving>)object
{
int fd = [object fileDescriptorForReading];
if (fd < 0 || fd > INT_MAX - 1)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET(fd, &_readFDs);
}
- (void)OF_addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
int fd = [object fileDescriptorForWriting];
if (fd < 0 || fd > INT_MAX - 1)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET(fd, &_writeFDs);
}
- (void)OF_removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = [object fileDescriptorForReading];
if (fd < 0)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
FD_CLR(fd, &_readFDs);
}
- (void)OF_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = [object fileDescriptorForWriting];
if (fd < 0)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= FD_SETSIZE)
@throw [OFOutOfRangeException exception];
|
| ︙ | ︙ |