Differences From Artifact [e69a794cf2]:
- File
src/OFStreamObserver_kqueue.m
— part of check-in
[3de549d6a5]
at
2012-09-12 06:00:29
on branch trunk
— OFStreamObserver: Cancel is no event anymore.
As cancel internally was an event, -[observeWithTimeout:] returned YES
before when an observe call was canceled. Now, the number of real events
is counted and NO returned if this is 0. (user: js, size: 3632) [annotate] [blame] [check-ins using]
To Artifact [daffa70891]:
- File src/OFStreamObserver_kqueue.m — part of check-in [c137da5e5b] at 2012-09-16 15:27:48 on branch trunk — Prefix all private methods with OF_. (user: js, size: 3646) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
45 46 47 48 49 50 51 | if ((kernelQueue = kqueue()) == -1) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; changeList = [[OFDataArray alloc] initWithItemSize: sizeof(struct kevent)]; | | | | | | | | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 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 |
if ((kernelQueue = kqueue()) == -1)
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
changeList = [[OFDataArray alloc] initWithItemSize:
sizeof(struct kevent)];
[self OF_addFileDescriptorForReading: cancelFD[0]];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
close(kernelQueue);
[changeList release];
[super dealloc];
}
- (void)OF_addFileDescriptorForReading: (int)fd
{
struct kevent event;
EV_SET(&event, fd, EVFILT_READ, EV_ADD, 0, 0, 0);
[changeList addItem: &event];
}
- (void)OF_addFileDescriptorForWriting: (int)fd
{
struct kevent event;
EV_SET(&event, fd, EVFILT_WRITE, EV_ADD, 0, 0, 0);
[changeList addItem: &event];
}
- (void)OF_removeFileDescriptorForReading: (int)fd
{
struct kevent event;
EV_SET(&event, fd, EVFILT_READ, EV_DELETE, 0, 0, 0);
[changeList addItem: &event];
}
- (void)OF_removeFileDescriptorForWriting: (int)fd
{
struct kevent event;
EV_SET(&event, fd, EVFILT_WRITE, EV_DELETE, 0, 0, 0);
[changeList addItem: &event];
}
- (BOOL)observeWithTimeout: (double)timeout
{
void *pool = objc_autoreleasePoolPush();
struct timespec timespec;
struct kevent eventList[EVENTLIST_SIZE];
int i, events, realEvents = 0;
timespec.tv_sec = timeout;
timespec.tv_nsec = (timeout - timespec.tv_sec) * 1000000000;
[self OF_processQueue];
if ([self OF_processCache]) {
objc_autoreleasePoolPop(pool);
return YES;
}
objc_autoreleasePoolPop(pool);
events = kevent(kernelQueue, [changeList cArray],
|
| ︙ | ︙ |