Differences From Artifact [2fb0c01789]:
- File src/OFRunLoop.m — part of check-in [be6adc6e06] at 2012-09-17 15:48:52 on branch trunk — Add -[asyncReadIntoBuffer:exactLength:block:]. (user: js, size: 9277) [annotate] [blame] [check-ins using]
To Artifact [019d6ee84a]:
- File
src/OFRunLoop.m
— part of check-in
[4d9a641d87]
at
2012-09-19 23:02:02
on branch trunk
— Make async I/O possible without blocks.
Async connecting is still missing. (user: js, size: 12122) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
26 27 28 29 30 31 32 | #import "OFDate.h" #import "autorelease.h" #import "macros.h" static OFRunLoop *mainRunLoop = nil; | < > > > > > > > > > > > > | > > > > > > > > > > > > > > > > < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < | < < < < < < < < < < < | | | < | < < < < | < < < < < < < < < < < | | | < | < < < < | | < < < < < < < < < < | < < | < | < < < | | < < < < | | < < | < < < < < | | 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 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 |
#import "OFDate.h"
#import "autorelease.h"
#import "macros.h"
static OFRunLoop *mainRunLoop = nil;
@interface OFRunLoop_ReadQueueItem: OFObject
{
@public
void *buffer;
size_t length;
id target;
SEL selector;
#ifdef OF_HAVE_BLOCKS
of_stream_async_read_block_t block;
#endif
}
@end
@interface OFRunLoop_ExactReadQueueItem: OFObject
{
@public
void *buffer;
size_t exactLength, readLength;
id target;
SEL selector;
#ifdef OF_HAVE_BLOCKS
of_stream_async_read_block_t block;
#endif
}
@end
@interface OFRunLoop_ReadLineQueueItem: OFObject
{
@public
of_string_encoding_t encoding;
id target;
SEL selector;
#ifdef OF_HAVE_BLOCKS
of_stream_async_read_line_block_t block;
#endif
}
@end
@interface OFRunLoop_AcceptQueueItem: OFObject
{
@public
id target;
SEL selector;
#ifdef OF_HAVE_BLOCKS
of_tcpsocket_async_accept_block_t block;
#endif
}
@end
@implementation OFRunLoop_ReadQueueItem
- (void)dealloc
{
[target release];
#ifdef OF_HAVE_BLOCKS
[block release];
#endif
[super dealloc];
}
@end
@implementation OFRunLoop_ExactReadQueueItem
- (void)dealloc
{
[target release];
#ifdef OF_HAVE_BLOCKS
[block release];
#endif
[super dealloc];
}
@end
@implementation OFRunLoop_ReadLineQueueItem
- (void)dealloc
{
[target release];
#ifdef OF_HAVE_BLOCKS
[block release];
#endif
[super dealloc];
}
@end
@implementation OFRunLoop_AcceptQueueItem
- (void)dealloc
{
[target release];
#ifdef OF_HAVE_BLOCKS
[block release];
#endif
[super dealloc];
}
@end
@implementation OFRunLoop
+ (OFRunLoop*)mainRunLoop
{
return [[mainRunLoop retain] autorelease];
}
+ (OFRunLoop*)currentRunLoop
{
return [[OFThread currentThread] runLoop];
}
+ (void)OF_setMainRunLoop
{
void *pool = objc_autoreleasePoolPush();
mainRunLoop = [[self currentRunLoop] retain];
objc_autoreleasePoolPop(pool);
}
#define ADD(type, code) \
void *pool = objc_autoreleasePoolPush(); \
OFRunLoop *runLoop = [self currentRunLoop]; \
OFList *queue = [runLoop->readQueues objectForKey: stream]; \
type *queueItem; \
\
if (queue == nil) { \
queue = [OFList list]; \
[runLoop->readQueues setObject: queue \
forKey: stream]; \
} \
\
if ([queue count] == 0) \
[runLoop->streamObserver addStreamForReading: stream]; \
\
queueItem = [[[type alloc] init] autorelease]; \
code \
[queue appendObject: queueItem]; \
\
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
block: (of_stream_async_read_block_t)block
{
ADD(OFRunLoop_ReadQueueItem, {
queueItem->buffer = buffer;
queueItem->length = length;
queueItem->block = [block copy];
})
}
+ (void)OF_addAsyncReadForStream: (OFStream*)stream
buffer: (void*)buffer
exactLength: (size_t)exactLength
block: (of_stream_async_read_block_t)block
{
ADD(OFRunLoop_ExactReadQueueItem, {
queueItem->buffer = buffer;
queueItem->exactLength = exactLength;
queueItem->block = [block copy];
})
}
+ (void)OF_addAsyncReadLineForStream: (OFStream*)stream
encoding: (of_string_encoding_t)encoding
block: (of_stream_async_read_line_block_t)block
{
ADD(OFRunLoop_ReadLineQueueItem, {
queueItem->encoding = encoding;
queueItem->block = [block copy];
})
}
+ (void)OF_addAsyncAcceptForTCPSocket: (OFTCPSocket*)stream
block: (of_tcpsocket_async_accept_block_t)block
{
ADD(OFRunLoop_AcceptQueueItem, {
queueItem->block = [block copy];
})
}
#endif
#undef ADD
- init
{
self = [super init];
@try {
timersQueue = [[OFSortedList alloc] init];
|
| ︙ | ︙ | |||
259 260 261 262 263 264 265 |
{
@synchronized (timersQueue) {
[timersQueue addObject: timer];
}
[streamObserver cancel];
}
| < > > | > | | > | | | | > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | > > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < | < < | | < < < < < | 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 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 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 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 |
{
@synchronized (timersQueue) {
[timersQueue addObject: timer];
}
[streamObserver cancel];
}
- (void)streamIsReadyForReading: (OFStream*)stream
{
OFList *queue = [readQueues objectForKey: stream];
of_list_object_t *listObject;
OF_ENSURE(queue != nil);
listObject = [queue firstListObject];
if ([listObject->object isKindOfClass:
[OFRunLoop_ReadQueueItem class]]) {
OFRunLoop_ReadQueueItem *queueItem = listObject->object;
size_t length = [stream readIntoBuffer: queueItem->buffer
length: queueItem->length];
#ifdef OF_HAVE_BLOCKS
if (queueItem->block != NULL) {
if (!queueItem->block(stream, queueItem->buffer,
length)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, void*, size_t) =
(BOOL(*)(id, SEL, OFStream*, void*, size_t))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target, queueItem->selector,
stream, queueItem->buffer, length)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
#ifdef OF_HAVE_BLOCKS
}
#endif
} else if ([listObject->object isKindOfClass:
[OFRunLoop_ExactReadQueueItem class]]) {
OFRunLoop_ExactReadQueueItem *queueItem = listObject->object;
size_t length = [stream
readIntoBuffer: (char*)queueItem->buffer +
queueItem->readLength
length: queueItem->exactLength -
queueItem->readLength];
queueItem->readLength += length;
if (queueItem->readLength == queueItem->exactLength ||
[stream isAtEndOfStream]) {
#ifdef OF_HAVE_BLOCKS
if (queueItem->block != NULL) {
if (queueItem->block(stream, queueItem->buffer,
queueItem->readLength))
queueItem->readLength = 0;
else {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, void*,
size_t) = (BOOL(*)(id, SEL, OFStream*,
void*, size_t))[queueItem->target
methodForSelector: queueItem->selector];
if (func(queueItem->target,
queueItem->selector, stream,
queueItem->buffer, queueItem->readLength))
queueItem->readLength = 0;
else {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
removeObjectForKey: stream];
}
}
#ifdef OF_HAVE_BLOCKS
}
#endif
}
} else if ([listObject->object isKindOfClass:
[OFRunLoop_ReadLineQueueItem class]]) {
OFRunLoop_ReadLineQueueItem *queueItem = listObject->object;
OFString *line;
line = [stream tryReadLineWithEncoding: queueItem->encoding];
if (line != nil || [stream isAtEndOfStream]) {
#ifdef OF_HAVE_BLOCKS
if (queueItem->block != NULL) {
if (!queueItem->block(stream, line)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, OFString*) =
(BOOL(*)(id, SEL, OFStream*, OFString*))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target,
queueItem->selector, stream, line)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
removeObjectForKey: stream];
}
}
#ifdef OF_HAVE_BLOCKS
}
#endif
}
} else if ([listObject->object isKindOfClass:
[OFRunLoop_AcceptQueueItem class]]) {
OFRunLoop_AcceptQueueItem *queueItem = listObject->object;
OFTCPSocket *newSocket = [(OFTCPSocket*)stream accept];
#ifdef OF_HAVE_BLOCKS
if (queueItem->block != NULL) {
if (!queueItem->block((OFTCPSocket*)stream,
newSocket)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFTCPSocket*, OFTCPSocket*) =
(BOOL(*)(id, SEL, OFTCPSocket*, OFTCPSocket*))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target, queueItem->selector,
(OFTCPSocket*)stream, newSocket)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
#ifdef OF_HAVE_BLOCKS
}
#endif
} else
OF_ENSURE(0);
}
- (void)run
{
for (;;) {
void *pool = objc_autoreleasePoolPush();
OFDate *now = [OFDate date];
OFTimer *timer;
|
| ︙ | ︙ |