Differences From Artifact [5d7da15761]:
- File
src/OFRunLoop.m
— part of check-in
[6343e04dcd]
at
2012-10-17 20:16:10
on branch trunk
— Pass exceptions on async I/O.
This makes it possible to handle exceptions that occurred during async
I/O in the specified handler. (user: js, size: 12900) [annotate] [blame] [check-ins using] [more...]
To Artifact [c937fefc13]:
- File src/OFRunLoop.m — part of check-in [13ea2fc8b1] at 2012-10-30 18:50:15 on branch trunk — Async I/O: Pass a context. (user: js, size: 13378) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | #import "OFDate.h" #import "autorelease.h" #import "macros.h" static OFRunLoop *mainRunLoop = nil; | > > > > > > > > > | < < | < < | < < | < < | > > > > > > > > > < < < | 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 |
#import "OFDate.h"
#import "autorelease.h"
#import "macros.h"
static OFRunLoop *mainRunLoop = nil;
@interface OFRunLoop_QueueItem: OFObject
{
@public
id target;
SEL selector;
id context;
}
@end
@interface OFRunLoop_ReadQueueItem: OFRunLoop_QueueItem
{
@public
void *buffer;
size_t length;
#ifdef OF_HAVE_BLOCKS
of_stream_async_read_block_t block;
#endif
}
@end
@interface OFRunLoop_ExactReadQueueItem: OFRunLoop_QueueItem
{
@public
void *buffer;
size_t exactLength, readLength;
#ifdef OF_HAVE_BLOCKS
of_stream_async_read_block_t block;
#endif
}
@end
@interface OFRunLoop_ReadLineQueueItem: OFRunLoop_QueueItem
{
@public
of_string_encoding_t encoding;
#ifdef OF_HAVE_BLOCKS
of_stream_async_read_line_block_t block;
#endif
}
@end
@interface OFRunLoop_AcceptQueueItem: OFRunLoop_QueueItem
{
@public
#ifdef OF_HAVE_BLOCKS
of_tcpsocket_async_accept_block_t block;
#endif
}
@end
@implementation OFRunLoop_QueueItem
- (void)dealloc
{
[target release];
[context release];
[super dealloc];
}
@end
@implementation OFRunLoop_ReadQueueItem
- (void)dealloc
{
#ifdef OF_HAVE_BLOCKS
[block release];
#endif
[super dealloc];
}
@end
@implementation OFRunLoop_ExactReadQueueItem
- (void)dealloc
{
#ifdef OF_HAVE_BLOCKS
[block release];
#endif
[super dealloc];
}
@end
@implementation OFRunLoop_ReadLineQueueItem
- (void)dealloc
{
#ifdef OF_HAVE_BLOCKS
[block release];
#endif
[super dealloc];
}
@end
@implementation OFRunLoop_AcceptQueueItem
- (void)dealloc
{
#ifdef OF_HAVE_BLOCKS
[block release];
#endif
[super dealloc];
}
@end
|
| ︙ | ︙ | |||
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 |
objc_autoreleasePoolPop(pool);
+ (void)OF_addAsyncReadForStream: (OFStream*)stream
buffer: (void*)buffer
length: (size_t)length
target: (id)target
selector: (SEL)selector
{
ADD(OFRunLoop_ReadQueueItem, {
queueItem->buffer = buffer;
queueItem->length = length;
queueItem->target = [target retain];
queueItem->selector = selector;
})
}
+ (void)OF_addAsyncReadForStream: (OFStream*)stream
buffer: (void*)buffer
exactLength: (size_t)exactLength
target: (id)target
selector: (SEL)selector
{
ADD(OFRunLoop_ExactReadQueueItem, {
queueItem->buffer = buffer;
queueItem->exactLength = exactLength;
queueItem->target = [target retain];
queueItem->selector = selector;
})
}
+ (void)OF_addAsyncReadLineForStream: (OFStream*)stream
encoding: (of_string_encoding_t)encoding
target: (id)target
selector: (SEL)selector
{
ADD(OFRunLoop_ReadLineQueueItem, {
queueItem->encoding = encoding;
queueItem->target = [target retain];
queueItem->selector = selector;
})
}
+ (void)OF_addAsyncAcceptForTCPSocket: (OFTCPSocket*)stream
target: (id)target
selector: (SEL)selector
{
ADD(OFRunLoop_AcceptQueueItem, {
queueItem->target = [target retain];
queueItem->selector = selector;
})
}
#ifdef OF_HAVE_BLOCKS
+ (void)OF_addAsyncReadForStream: (OFStream*)stream
buffer: (void*)buffer
length: (size_t)length
| > > > > > > > > | 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 |
objc_autoreleasePoolPop(pool);
+ (void)OF_addAsyncReadForStream: (OFStream*)stream
buffer: (void*)buffer
length: (size_t)length
target: (id)target
selector: (SEL)selector
context: (id)context
{
ADD(OFRunLoop_ReadQueueItem, {
queueItem->buffer = buffer;
queueItem->length = length;
queueItem->target = [target retain];
queueItem->selector = selector;
queueItem->context = [context retain];
})
}
+ (void)OF_addAsyncReadForStream: (OFStream*)stream
buffer: (void*)buffer
exactLength: (size_t)exactLength
target: (id)target
selector: (SEL)selector
context: (id)context
{
ADD(OFRunLoop_ExactReadQueueItem, {
queueItem->buffer = buffer;
queueItem->exactLength = exactLength;
queueItem->target = [target retain];
queueItem->selector = selector;
queueItem->context = [context retain];
})
}
+ (void)OF_addAsyncReadLineForStream: (OFStream*)stream
encoding: (of_string_encoding_t)encoding
target: (id)target
selector: (SEL)selector
context: (id)context
{
ADD(OFRunLoop_ReadLineQueueItem, {
queueItem->encoding = encoding;
queueItem->target = [target retain];
queueItem->selector = selector;
queueItem->context = [context retain];
})
}
+ (void)OF_addAsyncAcceptForTCPSocket: (OFTCPSocket*)stream
target: (id)target
selector: (SEL)selector
context: (id)context
{
ADD(OFRunLoop_AcceptQueueItem, {
queueItem->target = [target retain];
queueItem->selector = selector;
queueItem->context = [context retain];
})
}
#ifdef OF_HAVE_BLOCKS
+ (void)OF_addAsyncReadForStream: (OFStream*)stream
buffer: (void*)buffer
length: (size_t)length
|
| ︙ | ︙ | |||
329 330 331 332 333 334 335 |
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
} else {
#endif
| | | | > | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 |
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, void*, size_t, id,
OFException*) = (BOOL(*)(id, SEL, OFStream*, void*,
size_t, id, OFException*))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target, queueItem->selector,
stream, queueItem->buffer, length,
queueItem->context, exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
|
| ︙ | ︙ | |||
386 387 388 389 390 391 392 |
stream];
[readQueues
removeObjectForKey: stream];
}
}
} else {
#endif
| | | | | | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 |
stream];
[readQueues
removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, void*, size_t,
id, OFException*) = (BOOL(*)(id, SEL,
OFStream*, void*, size_t, id, OFException*))
[queueItem->target
methodForSelector: queueItem->selector];
if (func(queueItem->target,
queueItem->selector, stream,
queueItem->buffer, queueItem->readLength,
queueItem->context, exception))
queueItem->readLength = 0;
else {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
|
| ︙ | ︙ | |||
445 446 447 448 449 450 451 |
[readQueues
removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, OFString*,
| | | | | 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 |
[readQueues
removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, OFString*,
id, OFException*) = (BOOL(*)(id, SEL,
OFStream*, OFString*, id, OFException*))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target,
queueItem->selector, stream, line,
queueItem->context, exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
|
| ︙ | ︙ | |||
495 496 497 498 499 500 501 |
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFTCPSocket*, OFTCPSocket*,
| | | | > | 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 |
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFTCPSocket*, OFTCPSocket*,
id, OFException*) =
(BOOL(*)(id, SEL, OFTCPSocket*, OFTCPSocket*,
id, OFException*))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target, queueItem->selector,
(OFTCPSocket*)stream, newSocket, queueItem->context,
exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
|
| ︙ | ︙ |