Differences From Artifact [d65aafd84c]:
- File
src/OFKernelEventObserver_epoll.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: 5499) [annotate] [blame] [check-ins using]
To Artifact [f5a39990c0]:
- File
src/OFKernelEventObserver_epoll.m
— part of check-in
[2c3910e9fd]
at
2016-04-24 16:57:48
on branch trunk
— OFKernelEventObserver_epoll: Use fd + 1 as key
OFMapTable does not allow using 0 for the key, but stdin has file
descriptor 0. (user: js, size: 5529) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
92 93 94 95 96 97 98 |
- (void)OF_addObject: (id)object
fileDescriptor: (int)fd
events: (int)addEvents
{
struct epoll_event event;
intptr_t events;
| | | | | | | 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 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 |
- (void)OF_addObject: (id)object
fileDescriptor: (int)fd
events: (int)addEvents
{
struct epoll_event event;
intptr_t events;
events = (intptr_t)[_FDToEvents valueForKey: (void*)((intptr_t)fd + 1)];
memset(&event, 0, sizeof(event));
event.events = (int)events | addEvents;
event.data.ptr = object;
if (epoll_ctl(_epfd, (events == 0 ? EPOLL_CTL_ADD : EPOLL_CTL_MOD),
fd, &event) == -1)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
[_FDToEvents setValue: (void*)(events | addEvents)
forKey: (void*)((intptr_t)fd + 1)];
}
- (void)OF_removeObject: (id)object
fileDescriptor: (int)fd
events: (int)removeEvents
{
intptr_t events;
events = (intptr_t)[_FDToEvents valueForKey: (void*)((intptr_t)fd + 1)];
events &= ~removeEvents;
if (events == 0) {
if (epoll_ctl(_epfd, EPOLL_CTL_DEL, fd, NULL) == -1)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
[_FDToEvents removeValueForKey: (void*)((intptr_t)fd + 1)];
} else {
struct epoll_event event;
memset(&event, 0, sizeof(event));
event.events = (int)events;
event.data.ptr = object;
if (epoll_ctl(_epfd, EPOLL_CTL_MOD, fd, &event) == -1)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
[_FDToEvents setValue: (void*)events
forKey: (void*)((intptr_t)fd + 1)];
}
}
- (void)OF_addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self OF_addObject: object
fileDescriptor: [object fileDescriptorForReading]
|
| ︙ | ︙ |