Differences From Artifact [02fb70080b]:
- File
src/OFKernelEventObserver_epoll.m
— part of check-in
[e9b4700cb6]
at
2015-12-29 21:33:07
on branch trunk
— Refactor OFKernelEventObserver
This moves the locked queue for actions to
OFKernelEventObserver_LockedQueue, which is now used for select and
poll, but skipped for kqueue and epoll, as they natively support changes
from another thread.This fixes the problem that removing an object is delayed until the next
observe call - at which point it might have already been closed, meaning
the fd is no longer available. This was mainly a problem with kqueue, as
closing the fd already removed it from the kqueue, which then resulted
in an error being returned when trying to manually remove the fd from
the kqueue. (user: js, size: 5811) [annotate] [blame] [check-ins using] [more...]
To Artifact [e19549d9cb]:
- File
src/OFKernelEventObserver_epoll.m
— part of check-in
[258b8a4944]
at
2016-01-03 00:35:01
on branch trunk
— Fix a regression from the previous refactorization
kqueue and epoll were not updating _readObjects and _writeObjects
anymore, since this was done by the queue handling code, which they no
longer use after the refactorization. (user: js, size: 6170) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
#include <unistd.h>
#include <sys/epoll.h>
#import "OFKernelEventObserver.h"
#import "OFKernelEventObserver+Private.h"
#import "OFKernelEventObserver_epoll.h"
#import "OFMapTable.h"
#import "OFNull.h"
#import "OFInitializationFailedException.h"
#import "OFObserveFailedException.h"
#define EVENTLIST_SIZE 64
static const of_map_table_functions_t mapFunctions = { NULL };
| > > > > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 |
#include <unistd.h>
#include <sys/epoll.h>
#import "OFKernelEventObserver.h"
#import "OFKernelEventObserver+Private.h"
#import "OFKernelEventObserver_epoll.h"
#import "OFArray.h"
#import "OFMapTable.h"
#import "OFNull.h"
#ifdef OF_HAVE_THREADS
# import "OFMutex.h"
#endif
#import "OFInitializationFailedException.h"
#import "OFObserveFailedException.h"
#define EVENTLIST_SIZE 64
static const of_map_table_functions_t mapFunctions = { NULL };
|
| ︙ | ︙ | |||
84 85 86 87 88 89 90 91 |
[super dealloc];
}
- (void)OF_addObject: (id)object
fileDescriptor: (int)fd
events: (int)addEvents
{
| > < | | > | | < < < < < < < | < | < < > > | > > > > > > > > > > > > > | | > | | | | | | | | | | | | | | | | | | | > > > > > > > | > | > | > | > | 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 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 |
[super dealloc];
}
- (void)OF_addObject: (id)object
fileDescriptor: (int)fd
events: (int)addEvents
objectsArray: (OFMutableArray*)objectsArray
{
#ifdef OF_HAVE_THREADS
[_mutex lock];
@try {
#endif
struct epoll_event event;
intptr_t events;
events = (intptr_t)[_FDToEvents
valueForKey: (void*)(intptr_t)fd];
memset(&event, 0, sizeof(event));
event.events = (int)events | addEvents;
event.data.ptr = object;
[objectsArray addObject: object];
if (epoll_ctl(_epfd,
(events == 0 ? EPOLL_CTL_ADD : EPOLL_CTL_MOD),
fd, &event) == -1) {
[objectsArray removeObjectIdenticalTo: object];
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
}
[_FDToEvents setValue: (void*)(events | addEvents)
forKey: (void*)(intptr_t)fd];
#ifdef OF_HAVE_THREADS
} @finally {
[_mutex unlock];
}
#endif
}
- (void)OF_removeObject: (id)object
fileDescriptor: (int)fd
events: (int)removeEvents
objectsArray: (OFMutableArray*)objectsArray
{
#ifdef OF_HAVE_THREADS
[_mutex lock];
@try {
#endif
intptr_t events;
events = (intptr_t)[_FDToEvents
valueForKey: (void*)(intptr_t)fd];
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];
} 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];
}
[objectsArray removeObjectIdenticalTo: object];
#ifdef OF_HAVE_THREADS
} @finally {
[_mutex unlock];
}
#endif
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self OF_addObject: object
fileDescriptor: [object fileDescriptorForReading]
events: EPOLLIN
objectsArray: _readObjects];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self OF_addObject: object
fileDescriptor: [object fileDescriptorForWriting]
events: EPOLLOUT
objectsArray: _writeObjects];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self OF_removeObject: object
fileDescriptor: [object fileDescriptorForReading]
events: EPOLLIN
objectsArray: _readObjects];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self OF_removeObject: object
fileDescriptor: [object fileDescriptorForWriting]
events: EPOLLOUT
objectsArray: _writeObjects];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
OFNull *nullObject = [OFNull null];
void *pool = objc_autoreleasePoolPush();
struct epoll_event eventList[EVENTLIST_SIZE];
|
| ︙ | ︙ |