Overview
Comment: | Add OFKernelEventObserver_epoll |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
ed4a6f396bead2d7894013ad26212290 |
User & Date: | js on 2015-05-04 14:30:16 |
Other Links: | manifest | tags |
Context
2015-05-04
| ||
20:34 | Refactor OFKernelEventObserver check-in: bbe4040126 user: js tags: trunk | |
14:30 | Add OFKernelEventObserver_epoll check-in: ed4a6f396b user: js tags: trunk | |
2015-05-03
| ||
13:23 | Update PLATFORMS.md check-in: e0465438de user: js tags: trunk | |
Changes
Modified configure.ac from [4c2fd70cb1] to [d87836b9cb].
︙ | ︙ | |||
767 768 769 770 771 772 773 774 775 776 777 778 779 780 | AC_CHECK_FUNC(kqueue, [ AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue]) AC_SUBST(OFKERNELEVENTOBSERVER_KQUEUE_M, "OFKernelEventObserver_kqueue.m") AC_CHECK_FUNCS(kqueue1) ]) AC_CHECK_HEADER(poll.h, [ AC_DEFINE(HAVE_POLL_H, 1, [Whether we have poll.h]) AC_SUBST(OFKERNELEVENTOBSERVER_POLL_M, "OFKernelEventObserver_poll.m") ]) AC_CHECK_HEADER(sys/select.h, [ AC_DEFINE(HAVE_SYS_SELECT_H, 1, [Whether we have sys/select.h]) | > > > > > > > | 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 | AC_CHECK_FUNC(kqueue, [ AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue]) AC_SUBST(OFKERNELEVENTOBSERVER_KQUEUE_M, "OFKernelEventObserver_kqueue.m") AC_CHECK_FUNCS(kqueue1) ]) AC_CHECK_FUNC(epoll_create, [ AC_DEFINE(HAVE_EPOLL, 1, [Whether we have epoll]) AC_SUBST(OFKERNELEVENTOBSERVER_EPOLL_M, "OFKernelEventObserver_epoll.m") AC_CHECK_FUNCS(epoll_create1) ]) AC_CHECK_HEADER(poll.h, [ AC_DEFINE(HAVE_POLL_H, 1, [Whether we have poll.h]) AC_SUBST(OFKERNELEVENTOBSERVER_POLL_M, "OFKernelEventObserver_poll.m") ]) AC_CHECK_HEADER(sys/select.h, [ AC_DEFINE(HAVE_SYS_SELECT_H, 1, [Whether we have sys/select.h]) |
︙ | ︙ |
Modified extra.mk.in from [020c04615c] to [0ac12cacfe].
︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 | LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ OFBLOCKTESTS_M = @OFBLOCKTESTS_M@ OFHASH = @OFHASH@ OFHTTP = @OFHTTP@ OFHTTPCLIENTTESTS_M = @OFHTTPCLIENTTESTS_M@ OFPROCESS_M = @OFPROCESS_M@ OFKERNELEVENTOBSERVER_KQUEUE_M = @OFKERNELEVENTOBSERVER_KQUEUE_M@ OFKERNELEVENTOBSERVER_POLL_M = @OFKERNELEVENTOBSERVER_POLL_M@ OFKERNELEVENTOBSERVER_SELECT_M = @OFKERNELEVENTOBSERVER_SELECT_M@ OFZIP = @OFZIP@ PROPERTIESTESTS_M = @PROPERTIESTESTS_M@ REEXPORT_LIBOBJC = @REEXPORT_LIBOBJC@ RUNTIME = @RUNTIME@ | > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ OFBLOCKTESTS_M = @OFBLOCKTESTS_M@ OFHASH = @OFHASH@ OFHTTP = @OFHTTP@ OFHTTPCLIENTTESTS_M = @OFHTTPCLIENTTESTS_M@ OFPROCESS_M = @OFPROCESS_M@ OFKERNELEVENTOBSERVER_EPOLL_M = @OFKERNELEVENTOBSERVER_EPOLL_M@ OFKERNELEVENTOBSERVER_KQUEUE_M = @OFKERNELEVENTOBSERVER_KQUEUE_M@ OFKERNELEVENTOBSERVER_POLL_M = @OFKERNELEVENTOBSERVER_POLL_M@ OFKERNELEVENTOBSERVER_SELECT_M = @OFKERNELEVENTOBSERVER_SELECT_M@ OFZIP = @OFZIP@ PROPERTIESTESTS_M = @PROPERTIESTESTS_M@ REEXPORT_LIBOBJC = @REEXPORT_LIBOBJC@ RUNTIME = @RUNTIME@ |
︙ | ︙ |
Modified src/Makefile from [b319088420] to [8088893933].
︙ | ︙ | |||
135 136 137 138 139 140 141 | ${AUTORELEASE_M} \ codepage_437.m \ ${FOUNDATION_COMPAT_M} \ ${INSTANCE_M} \ iso_8859_15.m \ windows_1252.m SRCS_FILES += OFSettings_INIFile.m | | > | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | ${AUTORELEASE_M} \ codepage_437.m \ ${FOUNDATION_COMPAT_M} \ ${INSTANCE_M} \ iso_8859_15.m \ windows_1252.m SRCS_FILES += OFSettings_INIFile.m SRCS_SOCKETS += ${OFKERNELEVENTOBSERVER_EPOLL_M} \ ${OFKERNELEVENTOBSERVER_KQUEUE_M} \ ${OFKERNELEVENTOBSERVER_POLL_M} \ ${OFKERNELEVENTOBSERVER_SELECT_M} \ OFTCPSocket+SOCKS5.m OBJS_EXTRA = ${RUNTIME_RUNTIME_A} \ ${EXCEPTIONS_EXCEPTIONS_A} \ ${FORWARDING_FORWARDING_A} |
︙ | ︙ |
Modified src/OFKernelEventObserver.m from [57b253b8a0] to [566a494d67].
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | # import "OFMutex.h" #endif #import "OFDate.h" #ifdef HAVE_KQUEUE # import "OFKernelEventObserver_kqueue.h" #endif #if defined(HAVE_POLL_H) || defined(__wii__) # import "OFKernelEventObserver_poll.h" #endif #if defined(HAVE_SYS_SELECT_H) || defined(_WIN32) # import "OFKernelEventObserver_select.h" #endif | > > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | # import "OFMutex.h" #endif #import "OFDate.h" #ifdef HAVE_KQUEUE # import "OFKernelEventObserver_kqueue.h" #endif #ifdef HAVE_EPOLL # import "OFKernelEventObserver_epoll.h" #endif #if defined(HAVE_POLL_H) || defined(__wii__) # import "OFKernelEventObserver_poll.h" #endif #if defined(HAVE_SYS_SELECT_H) || defined(_WIN32) # import "OFKernelEventObserver_select.h" #endif |
︙ | ︙ | |||
72 73 74 75 76 77 78 | } + (instancetype)observer { return [[[self alloc] init] autorelease]; } | < > | | < < < < < < < < < < > > > < | 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 | } + (instancetype)observer { return [[[self alloc] init] autorelease]; } + alloc { if (self == [OFKernelEventObserver class]) #if defined(HAVE_KQUEUE) return [OFKernelEventObserver_kqueue alloc]; #elif defined(HAVE_EPOLL) return [OFKernelEventObserver_epoll alloc]; #elif defined(HAVE_POLL_H) || defined(__wii__) return [OFKernelEventObserver_poll alloc]; #elif defined(HAVE_SYS_SELECT_H) || defined(_WIN32) return [OFKernelEventObserver_select alloc]; #else # error No kqueue / epoll / poll / select found! #endif return [super alloc]; } - init { self = [super init]; @try { #if !defined(OF_HAVE_PIPE) && !defined(__wii__) |
︙ | ︙ |
Added src/OFKernelEventObserver_epoll.h version [a1c28950dc].
> > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFKernelEventObserver.h" @class OFMapTable; @interface OFKernelEventObserver_epoll: OFKernelEventObserver { int _epfd; OFMapTable *_FDToEvents; } @end |
Added src/OFKernelEventObserver_epoll.m version [b4f29b6ca3].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 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 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 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 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <assert.h> #include <errno.h> #include <fcntl.h> #include <unistd.h> #include <sys/epoll.h> #import "OFKernelEventObserver.h" #import "OFKernelEventObserver+Private.h" #import "OFKernelEventObserver_epoll.h" #import "OFMapTable.h" #import "OFInitializationFailedException.h" #import "OFObserveFailedException.h" #define EVENTLIST_SIZE 64 static const of_map_table_functions_t mapFunctions = { NULL }; @implementation OFKernelEventObserver_epoll - init { self = [super init]; @try { #ifdef HAVE_EPOLL_CREATE1 if ((_epfd = epoll_create1(EPOLL_CLOEXEC)) == -1) @throw [OFInitializationFailedException exception]; #else int flags; if ((_epfd = epoll_create(1)) == -1) @throw [OFInitializationFailedException exception]; if ((flags = fcntl(_epfd, F_GETFD, 0)) != -1) fcntl(_epfd, F_SETFD, flags | FD_CLOEXEC); #endif _FDToEvents = [[OFMapTable alloc] initWithKeyFunctions: mapFunctions valueFunctions: mapFunctions]; [self OF_addFileDescriptorForReading: _cancelFD[0]]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { close(_epfd); [_FDToEvents release]; [super dealloc]; } - (void)OF_addFileDescriptor: (int)fd forEvents: (int)addEvents { intptr_t events; events = (intptr_t)[_FDToEvents valueForKey: (void*)(intptr_t)fd]; if (events == 0) { struct epoll_event event; memset(&event, 0, sizeof(event)); event.events = addEvents; event.data.fd = fd; if (epoll_ctl(_epfd, EPOLL_CTL_ADD, fd, &event) == -1) @throw [OFObserveFailedException exceptionWithObserver: self errNo: errno]; [_FDToEvents setValue: (void*)(intptr_t)addEvents forKey: (void*)(intptr_t)fd]; } else { struct epoll_event event; memset(&event, 0, sizeof(event)); event.events = (int)events | addEvents; event.data.fd = fd; if (epoll_ctl(_epfd, EPOLL_CTL_MOD, fd, &event) == -1) @throw [OFObserveFailedException exceptionWithObserver: self errNo: errno]; [_FDToEvents setValue: (void*)(events | addEvents) forKey: (void*)(intptr_t)fd]; } } - (void)OF_removeFileDescriptor: (int)fd forEvents: (int)removeEvents { 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.fd = fd; 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]; } } - (void)OF_addFileDescriptorForReading: (int)fd { [self OF_addFileDescriptor: fd forEvents: EPOLLIN]; } - (void)OF_addFileDescriptorForWriting: (int)fd { [self OF_addFileDescriptor: fd forEvents: EPOLLOUT]; } - (void)OF_removeFileDescriptorForReading: (int)fd { [self OF_removeFileDescriptor: fd forEvents: EPOLLIN]; } - (void)OF_removeFileDescriptorForWriting: (int)fd { [self OF_removeFileDescriptor: fd forEvents: EPOLLOUT]; } - (bool)observeForTimeInterval: (of_time_interval_t)timeInterval { void *pool = objc_autoreleasePoolPush(); struct epoll_event eventList[EVENTLIST_SIZE]; int i, events, realEvents = 0; [self OF_processQueueAndStoreRemovedIn: nil]; if ([self OF_processReadBuffers]) { objc_autoreleasePoolPop(pool); return true; } objc_autoreleasePoolPop(pool); events = epoll_wait(_epfd, eventList, EVENTLIST_SIZE, (timeInterval != -1 ? timeInterval * 1000 : -1)); if (events < 0) return [OFObserveFailedException exceptionWithObserver: self errNo: errno]; if (events == 0) return false; for (i = 0; i < events; i++) { if (eventList[i].data.fd == _cancelFD[0]) { char buffer; assert(eventList[i].events == EPOLLIN); OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1); continue; } if (eventList[i].events & EPOLLIN) { pool = objc_autoreleasePoolPush(); if ([_delegate respondsToSelector: @selector(objectIsReadyForReading:)]) [_delegate objectIsReadyForReading: _FDToObject[eventList[i].data.fd]]; realEvents++; objc_autoreleasePoolPop(pool); } if (eventList[i].events & EPOLLOUT) { pool = objc_autoreleasePoolPush(); if ([_delegate respondsToSelector: @selector(objectIsReadyForWriting:)]) [_delegate objectIsReadyForWriting: _FDToObject[eventList[i].data.fd]]; realEvents++; objc_autoreleasePoolPop(pool); } assert((eventList[i].events & ~(EPOLLIN | EPOLLOUT)) == 0); } if (realEvents == 0) return false; return true; } @end |
Modified src/OFKernelEventObserver_kqueue.m from [08d91618ea] to [f6c09249b4].
︙ | ︙ | |||
142 143 144 145 146 147 148 | return true; } objc_autoreleasePoolPop(pool); events = kevent(_kernelQueue, [_changeList items], (int)[_changeList count], eventList, EVENTLIST_SIZE, | | | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | return true; } objc_autoreleasePoolPop(pool); events = kevent(_kernelQueue, [_changeList items], (int)[_changeList count], eventList, EVENTLIST_SIZE, (timeInterval != -1 ? &timeout : NULL)); if (events < 0) return [OFObserveFailedException exceptionWithObserver: self errNo: errno]; [_changeList removeAllItems]; [_removedArray removeAllObjects]; |
︙ | ︙ |
Modified src/OFSet_hashtable.m from [2849e8c8c1] to [fcbd1c81f4].
︙ | ︙ | |||
54 55 56 57 58 59 60 | static const of_map_table_functions_t keyFunctions = { .retain = retain, .release = release, .hash = hash, .equal = equal }; | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | static const of_map_table_functions_t keyFunctions = { .retain = retain, .release = release, .hash = hash, .equal = equal }; static const of_map_table_functions_t valueFunctions = { NULL }; @implementation OFSet_hashtable - init { return [self initWithCapacity: 0]; } |
︙ | ︙ |