Differences From Artifact [d49b28d198]:
- File
src/OFKernelEventObserver_kqueue.m
— part of check-in
[62e2de30b9]
at
2015-02-16 08:39:17
on branch trunk
— Explicitly pass errno to exceptions
The old behaviour where the exception would access errno directly on
creation of the exception was very fragile. The two main problems with
it were that sometimes it would pick up an errno even though none had
been set and in other cases that when the exception was created errno
had already been overridden.This also greatly increases errno handling on Win32, especially in
conjunction with sockets. It can still be improved further, though. (user: js, size: 4432) [annotate] [blame] [check-ins using]
To Artifact [80d98ba3c7]:
- File src/OFKernelEventObserver_kqueue.m — part of check-in [97da88f926] at 2015-04-12 20:04:12 on branch trunk — Add OFObserveFailedException (user: js, size: 4568) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #include "config.h" #include <assert.h> #include <errno.h> #include <math.h> #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> #import "OFKernelEventObserver.h" #import "OFKernelEventObserver+Private.h" #import "OFKernelEventObserver_kqueue.h" #import "OFDataArray.h" #import "OFArray.h" #import "OFInitializationFailedException.h" | > > > | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | #include "config.h" #include <assert.h> #include <errno.h> #include <math.h> #include <fcntl.h> #include <unistd.h> #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> #import "OFKernelEventObserver.h" #import "OFKernelEventObserver+Private.h" #import "OFKernelEventObserver_kqueue.h" #import "OFDataArray.h" #import "OFArray.h" #import "OFInitializationFailedException.h" #import "OFObserveFailedException.h" #import "OFOutOfRangeException.h" #import "socket_helpers.h" #define EVENTLIST_SIZE 64 @implementation OFKernelEventObserver_kqueue |
| ︙ | ︙ | |||
121 122 123 124 125 126 127 |
}
- (bool)observeForTimeInterval: (of_time_interval_t)timeInterval
{
void *pool = objc_autoreleasePoolPush();
struct timespec timeout;
struct kevent eventList[EVENTLIST_SIZE];
| | > | > | 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 |
}
- (bool)observeForTimeInterval: (of_time_interval_t)timeInterval
{
void *pool = objc_autoreleasePoolPush();
struct timespec timeout;
struct kevent eventList[EVENTLIST_SIZE];
int i, events, errNo, realEvents = 0;
timeout.tv_sec = (time_t)timeInterval;
timeout.tv_nsec = lrint((timeInterval - timeout.tv_sec) * 1000000000);
/*
* Make sure to keep the streams retained and thus the file descriptors
* valid until the actual change has been performed.
*/
[self OF_processQueueAndStoreRemovedIn: _removedArray];
if ([self OF_processCache]) {
objc_autoreleasePoolPop(pool);
return true;
}
objc_autoreleasePoolPop(pool);
events = kevent(_kernelQueue, [_changeList items],
(int)[_changeList count], eventList, EVENTLIST_SIZE,
(timeInterval == -1 ? NULL : &timeout));
errNo = errno;
[_removedArray removeAllObjects];
if (events < 0)
return [OFObserveFailedException exceptionWithObserver: self
errNo: errNo];
[_changeList removeAllItems];
if (events == 0)
return false;
for (i = 0; i < events; i++) {
|
| ︙ | ︙ |