Differences From Artifact [41b087a39c]:
- File
src/OFStreamObserver.m
— part of check-in
[440e95fd4a]
at
2012-09-12 17:27:53
on branch trunk
— Split -[OFStream fileDescriptor].
It is now -[fileDescriptorForReading] and -[fileDescriptorForWriting].
The split was necessary as some stream types (e.g. OFProcess) don't have
a single file descriptor, but two. This allows to use those stream types
with OFStreamObserver as well. (user: js, size: 8761) [annotate] [blame] [check-ins using]
To Artifact [4eb84860f4]:
- File src/OFStreamObserver.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: 8783) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
258 259 260 261 262 263 264 | OF_ENSURE(write(cancelFD[1], "", 1) > 0); #else OF_ENSURE(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr, sizeof(cancelAddr)) > 0); #endif } | | > > > > > > | | < < < < < < | | 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 |
OF_ENSURE(write(cancelFD[1], "", 1) > 0);
#else
OF_ENSURE(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr,
sizeof(cancelAddr)) > 0);
#endif
}
- (void)OF_addFileDescriptorForReading: (int)fd
{
@throw [OFNotImplementedException exceptionWithClass: [self class]
selector: _cmd];
}
- (void)OF_addFileDescriptorForWriting: (int)fd
{
@throw [OFNotImplementedException exceptionWithClass: [self class]
selector: _cmd];
}
- (void)OF_removeFileDescriptorForReading: (int)fd
{
@throw [OFNotImplementedException exceptionWithClass: [self class]
selector: _cmd];
}
- (void)OF_removeFileDescriptorForWriting: (int)fd
{
@throw [OFNotImplementedException exceptionWithClass: [self class]
selector: _cmd];
}
- (void)OF_processQueue
{
[mutex lock];
@try {
OFStream **queueObjects = [queue objects];
int *queueInfoCArray = [queueInfo cArray];
int *queueFDsCArray = [queueFDs cArray];
size_t i, count = [queue count];
|
| ︙ | ︙ | |||
317 318 319 320 321 322 323 |
FDToStream[fd] = nil;
}
switch (action) {
case QUEUE_ADD | QUEUE_READ:
[readStreams addObject: stream];
| | | | | | 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 348 349 |
FDToStream[fd] = nil;
}
switch (action) {
case QUEUE_ADD | QUEUE_READ:
[readStreams addObject: stream];
[self OF_addFileDescriptorForReading: fd];
break;
case QUEUE_ADD | QUEUE_WRITE:
[writeStreams addObject: stream];
[self OF_addFileDescriptorForWriting: fd];
break;
case QUEUE_REMOVE | QUEUE_READ:
[readStreams removeObjectIdenticalTo: stream];
[self OF_removeFileDescriptorForReading: fd];
break;
case QUEUE_REMOVE | QUEUE_WRITE:
[writeStreams removeObjectIdenticalTo: stream];
[self OF_removeFileDescriptorForWriting: fd];
break;
default:
assert(0);
}
}
|
| ︙ | ︙ | |||
372 373 374 375 376 377 378 | OF_ENSURE(write(cancelFD[1], "", 1) > 0); #else OF_ENSURE(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr, sizeof(cancelAddr)) > 0); #endif } | | | | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 |
OF_ENSURE(write(cancelFD[1], "", 1) > 0);
#else
OF_ENSURE(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr,
sizeof(cancelAddr)) > 0);
#endif
}
- (BOOL)OF_processCache
{
OFStream **objects = [readStreams objects];
size_t i, count = [readStreams count];
BOOL foundInCache = NO;
for (i = 0; i < count; i++) {
if ([objects[i] pendingBytes] > 0 &&
![objects[i] OF_isWaitingForDelimiter]) {
void *pool = objc_autoreleasePoolPush();
[delegate streamIsReadyForReading: objects[i]];
foundInCache = YES;
objc_autoreleasePoolPop(pool);
}
}
|
| ︙ | ︙ |