Overview
Comment: | Improve OFStreamObserver. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
d3f6cf929334ad897a64c727d58d135f |
User & Date: | js on 2011-09-19 12:07:03 |
Other Links: | manifest | tags |
Context
2011-09-19
| ||
12:34 | BOOL naming conventions. check-in: d43eb177bc user: js tags: trunk | |
12:07 | Improve OFStreamObserver. check-in: d3f6cf9293 user: js tags: trunk | |
11:39 | Fix calculation of microseconds. check-in: 6ec0a033bd user: js tags: trunk | |
Changes
Modified src/OFStreamObserver.h from [05b35ad045] to [d581b21593].
︙ | ︙ | |||
67 68 69 70 71 72 73 74 75 76 77 78 79 80 | * * Note: Currently, Win32 can only observe sockets and not files! */ @interface OFStreamObserver: OFObject { OFMutableArray *readStreams; OFMutableArray *writeStreams; OFMutableArray *queue, *queueInfo; id <OFStreamObserverDelegate> delegate; int cancelFD[2]; #ifdef _WIN32 struct sockaddr_in cancelAddr; #endif } | > > | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | * * Note: Currently, Win32 can only observe sockets and not files! */ @interface OFStreamObserver: OFObject { OFMutableArray *readStreams; OFMutableArray *writeStreams; OFStream **FDToStream; size_t maxFD; OFMutableArray *queue, *queueInfo; id <OFStreamObserverDelegate> delegate; int cancelFD[2]; #ifdef _WIN32 struct sockaddr_in cancelAddr; #endif } |
︙ | ︙ | |||
162 163 164 165 166 167 168 169 170 171 172 173 174 | * * \param timeout The time to wait for an event, in milliseconds * \return A boolean whether events occurred during the timeinterval */ - (BOOL)observeWithTimeout: (int)timeout; /// \cond internal - (BOOL)_processCache; /// \endcond @end @interface OFObject (OFStreamObserverDelegate) <OFStreamObserverDelegate> @end | > | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | * * \param timeout The time to wait for an event, in milliseconds * \return A boolean whether events occurred during the timeinterval */ - (BOOL)observeWithTimeout: (int)timeout; /// \cond internal - (void)_processQueue; - (BOOL)_processCache; /// \endcond @end @interface OFObject (OFStreamObserverDelegate) <OFStreamObserverDelegate> @end |
Modified src/OFStreamObserver.m from [d7d6c24d1c] to [547cd504c0].
︙ | ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 | enum { QUEUE_ADD = 0, QUEUE_REMOVE = 1, QUEUE_READ = 0, QUEUE_WRITE = 2 }; @implementation OFStreamObserver + observer { return [[[self alloc] init] autorelease]; } | > | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | enum { QUEUE_ADD = 0, QUEUE_REMOVE = 1, QUEUE_READ = 0, QUEUE_WRITE = 2 }; #define QUEUE_ACTION (QUEUE_ADD | QUEUE_REMOVE) @implementation OFStreamObserver + observer { return [[[self alloc] init] autorelease]; } |
︙ | ︙ | |||
121 122 123 124 125 126 127 128 129 130 131 132 133 134 | cancelAddrLen = sizeof(cancelAddr); if (getsockname(cancelFD[0], (struct sockaddr*)&cancelAddr, &cancelAddrLen)) @throw [OFInitializationFailedException newWithClass: isa]; #endif } @catch (id e) { [self release]; @throw e; } return self; } | > > > > > | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | cancelAddrLen = sizeof(cancelAddr); if (getsockname(cancelFD[0], (struct sockaddr*)&cancelAddr, &cancelAddrLen)) @throw [OFInitializationFailedException newWithClass: isa]; #endif maxFD = cancelFD[0]; FDToStream = [self allocMemoryForNItems: maxFD + 1 withSize: sizeof(OFStream*)]; FDToStream[cancelFD[0]] = nil; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ | |||
232 233 234 235 236 237 238 239 240 241 242 243 244 245 | #else assert(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr, sizeof(cancelAddr)) > 0); #endif [pool release]; } - (void)observe { [self observeWithTimeout: -1]; } - (BOOL)observeWithTimeout: (int)timeout | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | #else assert(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr, sizeof(cancelAddr)) > 0); #endif [pool release]; } - (void)_addStreamToObserveForReading: (OFStream*)strea; { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (void)_addStreamToObserveForWriting: (OFStream*)stream { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (void)_removeStreamToObserveForReading: (OFStream*)stream { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (void)_removeStreamToObserveForWriting: (OFStream*)stream { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (void)_processQueue { @synchronized (queue) { OFStream **queueCArray = [queue cArray]; OFNumber **queueInfoCArray = [queueInfo cArray]; size_t i, count = [queue count]; for (i = 0; i < count; i++) { int action = [queueInfoCArray[i] intValue]; if ((action & QUEUE_ACTION) == QUEUE_ADD) { int fd = [queueCArray[i] fileDescriptor]; if (fd > maxFD) { maxFD = fd; FDToStream = [self resizeMemory: FDToStream toNItems: maxFD + 1 withSize: sizeof(OFStream*)]; } FDToStream[fd] = queueCArray[i]; } if ((action & QUEUE_ACTION) == QUEUE_REMOVE) { int fd = [queueCArray[i] fileDescriptor]; /* FIXME: Maybe downsize? */ FDToStream[fd] = nil; } switch (action) { case QUEUE_ADD | QUEUE_READ: [readStreams addObject: queueCArray[i]]; [self _addStreamToObserveForReading: queueCArray[i]]; break; case QUEUE_ADD | QUEUE_WRITE: [writeStreams addObject: queueCArray[i]]; [self _addStreamToObserveForWriting: queueCArray[i]]; break; case QUEUE_REMOVE | QUEUE_READ: [readStreams removeObjectIdenticalTo: queueCArray[i]]; [self _removeStreamToObserveForReading: queueCArray[i]]; break; case QUEUE_REMOVE | QUEUE_WRITE: [writeStreams removeObjectIdenticalTo: queueCArray[i]]; [self _removeStreamToObserveForWriting: queueCArray[i]]; break; default: assert(0); } } [queue removeNObjects: count]; [queueInfo removeNObjects: count]; } } - (void)observe { [self observeWithTimeout: -1]; } - (BOOL)observeWithTimeout: (int)timeout |
︙ | ︙ |
Modified src/OFStreamObserver_poll.h from [a959253eb3] to [d6d9c7fcfd].
︙ | ︙ | |||
17 18 19 20 21 22 23 | #import "OFStreamObserver.h" @class OFDataArray; @interface OFStreamObserver_poll: OFStreamObserver { OFDataArray *FDs; | < | 17 18 19 20 21 22 23 24 25 | #import "OFStreamObserver.h" @class OFDataArray; @interface OFStreamObserver_poll: OFStreamObserver { OFDataArray *FDs; } @end |
Modified src/OFStreamObserver_poll.m from [e529585f5e] to [103d3eeb79].
︙ | ︙ | |||
28 29 30 31 32 33 34 | #import "OFDictionary.h" #import "OFDataArray.h" #import "OFNumber.h" #import "OFAutoreleasePool.h" #import "OFOutOfRangeException.h" | < < < < < < < < < < | | > < | < < < < < < | < < < < | < < | < < < < < < | < < < < | | | > < < | | | | | | < | < | | | | | < | < | | | < < < < < < < < < < | 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 | #import "OFDictionary.h" #import "OFDataArray.h" #import "OFNumber.h" #import "OFAutoreleasePool.h" #import "OFOutOfRangeException.h" @implementation OFStreamObserver_poll - init { self = [super init]; @try { struct pollfd p = { 0, POLLIN, 0 }; FDs = [[OFDataArray alloc] initWithItemSize: sizeof(struct pollfd)]; p.fd = cancelFD[0]; [FDs addItem: &p]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [FDs release]; [super dealloc]; } - (void)_addStream: (OFStream*)stream withEvents: (short)events { struct pollfd *FDsCArray = [FDs cArray]; size_t i, count = [FDs count]; int fd = [stream fileDescriptor]; BOOL found = NO; for (i = 0; i < count; i++) { if (FDsCArray[i].fd == fd) { FDsCArray[i].events |= events; found = YES; break; } } if (!found) { struct pollfd p = { fd, events | POLLERR, 0 }; [FDs addItem: &p]; } } - (void)_removeStream: (OFStream*)stream withEvents: (short)events { struct pollfd *FDsCArray = [FDs cArray]; size_t i, nFDs = [FDs count]; int fileDescriptor = [stream fileDescriptor]; for (i = 0; i < nFDs; i++) { if (FDsCArray[i].fd == fileDescriptor) { FDsCArray[i].events &= ~events; if ((FDsCArray[i].events & ~POLLERR) == 0) [FDs removeItemAtIndex: i]; break; } } } - (void)_addStreamToObserveForReading: (OFStream*)stream { [self _addStream: stream withEvents: POLLIN]; } - (void)_addStreamToObserveForWriting: (OFStream*)stream { [self _addStream: stream withEvents: POLLOUT]; } - (void)_removeStreamToObserveForReading: (OFStream*)stream { [self _removeStream: stream withEvents: POLLIN]; } - (void)_removeStreamToObserveForWriting: (OFStream*)stream { [self _removeStream: stream withEvents: POLLOUT]; } - (BOOL)observeWithTimeout: (int)timeout { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; struct pollfd *FDsCArray; size_t i, nFDs; |
︙ | ︙ | |||
191 192 193 194 195 196 197 | @throw [OFOutOfRangeException newWithClass: isa]; #endif if (poll(FDsCArray, (nfds_t)nFDs, timeout) < 1) return NO; for (i = 0; i < nFDs; i++) { | < < < < < | > < < | > < < | > | 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 | @throw [OFOutOfRangeException newWithClass: isa]; #endif if (poll(FDsCArray, (nfds_t)nFDs, timeout) < 1) return NO; for (i = 0; i < nFDs; i++) { if (FDsCArray[i].revents & POLLIN) { if (FDsCArray[i].fd == cancelFD[0]) { char buffer; assert(read(cancelFD[0], &buffer, 1) > 0); FDsCArray[i].revents = 0; continue; } [delegate streamDidBecomeReadyForReading: FDToStream[FDsCArray[i].fd]]; [pool releaseObjects]; } if (FDsCArray[i].revents & POLLOUT) { [delegate streamDidBecomeReadyForReading: FDToStream[FDsCArray[i].fd]]; [pool releaseObjects]; } if (FDsCArray[i].revents & POLLERR) { [delegate streamDidReceiveException: FDToStream[FDsCArray[i].fd]]; [pool releaseObjects]; } FDsCArray[i].revents = 0; } [pool release]; return YES; } @end |
Modified src/OFStreamObserver_select.h from [88be060809] to [480977f809].
︙ | ︙ | |||
21 22 23 24 25 26 27 | #import "OFStreamObserver.h" @interface OFStreamObserver_select: OFStreamObserver { fd_set readFDs; fd_set writeFDs; fd_set exceptFDs; | < | 21 22 23 24 25 26 27 28 29 | #import "OFStreamObserver.h" @interface OFStreamObserver_select: OFStreamObserver { fd_set readFDs; fd_set writeFDs; fd_set exceptFDs; } @end |
Modified src/OFStreamObserver_select.m from [08466b38d3] to [e296c3f2eb].
︙ | ︙ | |||
24 25 26 27 28 29 30 | #import "OFStreamObserver_select.h" #import "OFStream.h" #import "OFArray.h" #import "OFNumber.h" #import "OFAutoreleasePool.h" | < < < < < < < < < < < < | < < | | | | < < < < < | < < | < | < | < < < < < < | < < < < | | < | < < < | > | < < < < | < < | | < < < < | < | < < < < | < < < | 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 | #import "OFStreamObserver_select.h" #import "OFStream.h" #import "OFArray.h" #import "OFNumber.h" #import "OFAutoreleasePool.h" @implementation OFStreamObserver_select - init { self = [super init]; FD_ZERO(&readFDs); FD_ZERO(&writeFDs); FD_SET(cancelFD[0], &readFDs); return self; } - (void)_addStreamToObserveForReading: (OFStream*)stream { int fd = [stream fileDescriptor]; FD_SET(fd, &readFDs); FD_SET(fd, &exceptFDs); } - (void)_addStreamToObserveForWriting: (OFStream*)stream { int fd = [stream fileDescriptor]; FD_SET(fd, &writeFDs); FD_SET(fd, &exceptFDs); } - (void)_removeStreamToObserveForReading: (OFStream*)stream { int fd = [stream fileDescriptor]; FD_CLR(fd, &readFDs); if (!FD_ISSET(fd, &writeFDs)) FD_CLR(fd, &exceptFDs); } - (void)_removeStreamToObserveForWriting: (OFStream*)stream { int fd = [stream fileDescriptor]; FD_CLR(fd, &writeFDs); if (!FD_ISSET(fd, &readFDs)) FD_CLR(fd, &exceptFDs); } - (BOOL)observeWithTimeout: (int)timeout { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFStream **cArray; fd_set readFDs_; |
︙ | ︙ | |||
155 156 157 158 159 160 161 | writeFDs_ = writeFDs; exceptFDs_ = exceptFDs; # endif time.tv_sec = timeout / 1000; time.tv_usec = (timeout % 1000) * 1000; | | | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | writeFDs_ = writeFDs; exceptFDs_ = exceptFDs; # endif time.tv_sec = timeout / 1000; time.tv_usec = (timeout % 1000) * 1000; if (select((int)maxFD + 1, &readFDs_, &writeFDs_, &exceptFDs_, (timeout != -1 ? &time : NULL)) < 1) return NO; if (FD_ISSET(cancelFD[0], &readFDs_)) { char buffer; #ifndef _WIN32 assert(read(cancelFD[0], &buffer, 1) > 0); |
︙ | ︙ |