Differences From Artifact [af29aae29a]:
- File src/OFRunLoop.m — part of check-in [6ae356af85] at 2017-02-04 21:37:44 on branch trunk — OFRunLoop: Refactor read queue handling (user: js, size: 16237) [annotate] [blame] [check-ins using]
To Artifact [f31ca790af]:
- File
src/OFRunLoop.m
— part of check-in
[4af49a13c3]
at
2017-05-07 20:10:13
on branch trunk
— Small code style change
Casts are now written like types in variable declarations. (user: js, size: 16308) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
128 129 130 131 132 133 134 | } # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(object, _buffer, length, exception); else { # endif | | > | | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | } # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(object, _buffer, length, exception); else { # endif bool (*func)(id, SEL, OFStream *, void *, size_t, OFException *) = (bool (*)(id, SEL, OFStream *, void *, size_t, OFException *)) [_target methodForSelector: _selector]; return func(_target, _selector, object, _buffer, length, exception); # ifdef OF_HAVE_BLOCKS } # endif |
︙ | ︙ | |||
156 157 158 159 160 161 162 | @implementation OFRunLoop_ExactReadQueueItem - (bool)handleForObject: (id)object { size_t length; OFException *exception = nil; @try { | | | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | @implementation OFRunLoop_ExactReadQueueItem - (bool)handleForObject: (id)object { size_t length; OFException *exception = nil; @try { length = [object readIntoBuffer: (char *)_buffer + _readLength length: _exactLength - _readLength]; } @catch (OFException *e) { length = 0; exception = e; } _readLength += length; |
︙ | ︙ | |||
178 179 180 181 182 183 184 | if (!_block(object, _buffer, _readLength, exception)) return false; _readLength = 0; return true; } else { # endif | | > | | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | if (!_block(object, _buffer, _readLength, exception)) return false; _readLength = 0; return true; } else { # endif bool (*func)(id, SEL, OFStream *, void *, size_t, OFException *) = (bool (*)(id, SEL, OFStream *, void *, size_t, OFException *)) [_target methodForSelector: _selector]; if (!func(_target, _selector, object, _buffer, _readLength, exception)) return false; _readLength = 0; |
︙ | ︙ | |||
224 225 226 227 228 229 230 | return true; # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(object, line, exception); else { # endif | | | | 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | return true; # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(object, line, exception); else { # endif bool (*func)(id, SEL, OFStream *, OFString *, OFException *) = (bool (*)(id, SEL, OFStream *, OFString *, OFException *)) [_target methodForSelector: _selector]; return func(_target, _selector, object, line, exception); # ifdef OF_HAVE_BLOCKS } # endif } |
︙ | ︙ | |||
262 263 264 265 266 267 268 | } # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(object, newSocket, exception); else { # endif | | | | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | } # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(object, newSocket, exception); else { # endif bool (*func)(id, SEL, OFTCPSocket *, OFTCPSocket *, OFException *) = (bool (*)(id, SEL, OFTCPSocket *, OFTCPSocket *, OFException *)) [_target methodForSelector: _selector]; return func(_target, _selector, object, newSocket, exception); # ifdef OF_HAVE_BLOCKS } # endif } |
︙ | ︙ | |||
304 305 306 307 308 309 310 | } # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(object, _buffer, length, address, exception); else { # endif | | | | | | 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | } # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(object, _buffer, length, address, exception); else { # endif bool (*func)(id, SEL, OFUDPSocket *, void *, size_t, of_udp_socket_address_t address, OFException *) = (bool (*)(id, SEL, OFUDPSocket *, void *, size_t, of_udp_socket_address_t, OFException *)) [_target methodForSelector: _selector]; return func(_target, _selector, object, _buffer, length, address, exception); # ifdef OF_HAVE_BLOCKS } # endif |
︙ | ︙ | |||
329 330 331 332 333 334 335 | [super dealloc]; } # endif @end #endif @implementation OFRunLoop | | | | | 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 | [super dealloc]; } # endif @end #endif @implementation OFRunLoop + (OFRunLoop *)mainRunLoop { return [[mainRunLoop retain] autorelease]; } + (OFRunLoop *)currentRunLoop { #ifdef OF_HAVE_THREADS return [[OFThread currentThread] runLoop]; #else return [self mainRunLoop]; #endif } + (void)OF_setMainRunLoop: (OFRunLoop *)runLoop { mainRunLoop = [runLoop retain]; } #ifdef OF_HAVE_SOCKETS # define ADD_READ(type, object, code) \ void *pool = objc_autoreleasePoolPush(); \ |
︙ | ︙ | |||
371 372 373 374 375 376 377 | \ queueItem = [[[type alloc] init] autorelease]; \ code \ [queue appendObject: queueItem]; \ \ objc_autoreleasePoolPop(pool); | | | | | | | | | | | | | | | | | | 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 493 494 495 | \ 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_READ(OFRunLoop_ReadQueueItem, stream, { queueItem->_target = [target retain]; queueItem->_selector = selector; queueItem->_buffer = buffer; queueItem->_length = length; }) } + (void)OF_addAsyncReadForStream: (OFStream *)stream buffer: (void *)buffer exactLength: (size_t)exactLength target: (id)target selector: (SEL)selector { ADD_READ(OFRunLoop_ExactReadQueueItem, stream, { queueItem->_target = [target retain]; queueItem->_selector = selector; queueItem->_buffer = buffer; queueItem->_exactLength = exactLength; }) } + (void)OF_addAsyncReadLineForStream: (OFStream *)stream encoding: (of_string_encoding_t)encoding target: (id)target selector: (SEL)selector { ADD_READ(OFRunLoop_ReadLineQueueItem, stream, { queueItem->_target = [target retain]; queueItem->_selector = selector; queueItem->_encoding = encoding; }) } + (void)OF_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream target: (id)target selector: (SEL)selector { ADD_READ(OFRunLoop_AcceptQueueItem, stream, { queueItem->_target = [target retain]; queueItem->_selector = selector; }) } + (void)OF_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket buffer: (void *)buffer length: (size_t)length target: (id)target selector: (SEL)selector { ADD_READ(OFRunLoop_UDPReceiveQueueItem, socket, { queueItem->_buffer = buffer; queueItem->_length = length; 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_READ(OFRunLoop_ReadQueueItem, stream, { queueItem->_block = [block copy]; queueItem->_buffer = buffer; queueItem->_length = length; }) } + (void)OF_addAsyncReadForStream: (OFStream *)stream buffer: (void *)buffer exactLength: (size_t)exactLength block: (of_stream_async_read_block_t)block { ADD_READ(OFRunLoop_ExactReadQueueItem, stream, { queueItem->_block = [block copy]; queueItem->_buffer = buffer; queueItem->_exactLength = exactLength; }) } + (void)OF_addAsyncReadLineForStream: (OFStream *)stream encoding: (of_string_encoding_t)encoding block: (of_stream_async_read_line_block_t)block { ADD_READ(OFRunLoop_ReadLineQueueItem, stream, { queueItem->_block = [block copy]; queueItem->_encoding = encoding; }) } + (void)OF_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream block: (of_tcp_socket_async_accept_block_t)block { ADD_READ(OFRunLoop_AcceptQueueItem, stream, { queueItem->_block = [block copy]; }) } + (void)OF_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket buffer: (void *)buffer length: (size_t)length block: (of_udp_socket_async_receive_block_t) block { ADD_READ(OFRunLoop_UDPReceiveQueueItem, socket, { queueItem->_buffer = buffer; queueItem->_length = length; |
︙ | ︙ | |||
558 559 560 561 562 563 564 | #elif defined(OF_HAVE_THREADS) [_condition release]; #endif [super dealloc]; } | | | 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 | #elif defined(OF_HAVE_THREADS) [_condition release]; #endif [super dealloc]; } - (void)addTimer: (OFTimer *)timer { #ifdef OF_HAVE_THREADS [_timersQueueLock lock]; @try { #endif [_timersQueue insertObject: timer]; #ifdef OF_HAVE_THREADS |
︙ | ︙ | |||
580 581 582 583 584 585 586 | #if defined(OF_HAVE_SOCKETS) [_kernelEventObserver cancel]; #elif defined(OF_HAVE_THREADS) [_condition signal]; #endif } | | | 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 | #if defined(OF_HAVE_SOCKETS) [_kernelEventObserver cancel]; #elif defined(OF_HAVE_THREADS) [_condition signal]; #endif } - (void)OF_removeTimer: (OFTimer *)timer { #ifdef OF_HAVE_THREADS [_timersQueueLock lock]; @try { #endif of_list_object_t *iter; |
︙ | ︙ | |||
609 610 611 612 613 614 615 | #ifdef OF_HAVE_SOCKETS - (void)objectIsReadyForReading: (id)object { /* * Retain the queue so that it doesn't disappear from us because the * handler called -[cancelAsyncRequests]. */ | | | 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 | #ifdef OF_HAVE_SOCKETS - (void)objectIsReadyForReading: (id)object { /* * Retain the queue so that it doesn't disappear from us because the * handler called -[cancelAsyncRequests]. */ OFList OF_GENERIC(OF_KINDOF(OFRunLoop_ReadQueueItem *)) *queue = [[_readQueues objectForKey: object] retain]; assert(queue != nil); @try { if (![[queue firstObject] handleForObject: object]) { of_list_object_t *listObject = [queue firstListObject]; |
︙ | ︙ | |||
645 646 647 648 649 650 651 | #endif - (void)run { [self runUntilDate: nil]; } | | | 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 | #endif - (void)run { [self runUntilDate: nil]; } - (void)runUntilDate: (OFDate *)deadline { _stop = false; for (;;) { void *pool = objc_autoreleasePoolPush(); OFDate *now = [OFDate date]; OFDate *nextTimer; |
︙ | ︙ |