Overview
Comment: | OFStream: Rework blocks-based API |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
9808f35fb3869d286cd16913c9d34ff0 |
User & Date: | js on 2024-10-27 17:45:20 |
Other Links: | manifest | tags |
Context
2024-10-27
| ||
17:59 | OFStreamSocket: Rework blocks-based API check-in: 34b4d743ad user: js tags: trunk | |
17:45 | OFStream: Rework blocks-based API check-in: 9808f35fb3 user: js tags: trunk | |
16:38 | OFSPXStreamSocket: Rework blocks-based API check-in: 0bd1d8f35c user: js tags: trunk | |
Changes
Modified src/OFRunLoop+Private.h from [0d2c27a15c] to [b12dfba6a5].
︙ | ︙ | |||
44 45 46 47 48 49 50 | #ifdef OF_HAVE_SOCKETS + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *) stream buffer: (void *)buffer length: (size_t)length mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS | | | | | | > | | > | 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 | #ifdef OF_HAVE_SOCKETS + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *) stream buffer: (void *)buffer length: (size_t)length mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (nullable OFStreamReadHandler)handler # endif delegate: (nullable id <OFStreamDelegate>)delegate; + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *) stream buffer: (void *)buffer exactLength: (size_t)length mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (nullable OFStreamReadHandler)handler # endif delegate: (nullable id <OFStreamDelegate>)delegate; + (void)of_addAsyncReadStringForStream: (OFStream <OFReadyForReadingObserving > *)stream encoding: (OFStringEncoding)encoding mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (nullable OFStreamStringReadHandler) handler # endif delegate: (nullable id <OFStreamDelegate>) delegate; + (void)of_addAsyncReadLineForStream: (OFStream <OFReadyForReadingObserving> *) stream encoding: (OFStringEncoding)encoding mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (nullable OFStreamStringReadHandler) handler # endif delegate: (nullable id <OFStreamDelegate>)delegate; + (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *) stream data: (OFData *)data mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (nullable OFStreamDataWrittenHandler)handler # endif delegate: (nullable id <OFStreamDelegate>)delegate; + (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *) stream string: (OFString *)string encoding: (OFStringEncoding)encoding mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (nullable OFStreamStringWrittenHandler) handler # endif delegate: (nullable id <OFStreamDelegate>)delegate; # if !defined(OF_WII) && !defined(OF_NINTENDO_3DS) + (void)of_addAsyncConnectForSocket: (id)socket mode: (OFRunLoopMode)mode delegate: (id <OFRunLoopConnectDelegate>)delegate; # endif |
︙ | ︙ |
Modified src/OFRunLoop.m from [9b4c3f5704] to [61bab8a258].
︙ | ︙ | |||
92 93 94 95 96 97 98 | - (bool)handleObject: (id)object; @end @interface OFRunLoopReadQueueItem: OFRunLoopQueueItem { @public # ifdef OF_HAVE_BLOCKS | | | | | | | | 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 | - (bool)handleObject: (id)object; @end @interface OFRunLoopReadQueueItem: OFRunLoopQueueItem { @public # ifdef OF_HAVE_BLOCKS OFStreamReadHandler _handler; # endif void *_buffer; size_t _length; } @end @interface OFRunLoopExactReadQueueItem: OFRunLoopQueueItem { @public # ifdef OF_HAVE_BLOCKS OFStreamReadHandler _handler; # endif void *_buffer; size_t _exactLength, _readLength; } @end @interface OFRunLoopReadStringQueueItem: OFRunLoopQueueItem { @public # ifdef OF_HAVE_BLOCKS OFStreamStringReadHandler _handler; # endif OFStringEncoding _encoding; } @end @interface OFRunLoopReadLineQueueItem: OFRunLoopQueueItem { @public # ifdef OF_HAVE_BLOCKS OFStreamStringReadHandler _handler; # endif OFStringEncoding _encoding; } @end @interface OFRunLoopWriteDataQueueItem: OFRunLoopQueueItem { @public # ifdef OF_HAVE_BLOCKS OFStreamDataWrittenHandler _handler; # endif OFData *_data; size_t _writtenLength; } @end @interface OFRunLoopWriteStringQueueItem: OFRunLoopQueueItem { @public # ifdef OF_HAVE_BLOCKS OFStreamStringWrittenHandler _handler; # endif OFString *_string; OFStringEncoding _encoding; size_t _writtenLength; } @end |
︙ | ︙ | |||
467 468 469 470 471 472 473 | length = [object readIntoBuffer: _buffer length: _length]; } @catch (id e) { length = 0; exception = e; } # ifdef OF_HAVE_BLOCKS | | | | | 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 496 497 498 499 500 501 | length = [object readIntoBuffer: _buffer length: _length]; } @catch (id e) { length = 0; exception = e; } # ifdef OF_HAVE_BLOCKS if (_handler != NULL) return _handler(object, _buffer, length, exception); else { # endif if (![_delegate respondsToSelector: @selector(stream:didReadIntoBuffer:length:exception:)]) return false; return [_delegate stream: object didReadIntoBuffer: _buffer length: length exception: exception]; # ifdef OF_HAVE_BLOCKS } # endif } # ifdef OF_HAVE_BLOCKS - (void)dealloc { [_handler release]; [super dealloc]; } # endif @end @implementation OFRunLoopExactReadQueueItem |
︙ | ︙ | |||
515 516 517 518 519 520 521 | _readLength += length; if (_readLength != _exactLength && ![object isAtEndOfStream] && exception == nil) return true; # ifdef OF_HAVE_BLOCKS | | | | 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | _readLength += length; if (_readLength != _exactLength && ![object isAtEndOfStream] && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_handler != NULL) { if (!_handler(object, _buffer, _readLength, exception)) return false; _readLength = 0; return true; } else { # endif if (![_delegate respondsToSelector: |
︙ | ︙ | |||
543 544 545 546 547 548 549 | } # endif } # ifdef OF_HAVE_BLOCKS - (void)dealloc { | | | 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 | } # endif } # ifdef OF_HAVE_BLOCKS - (void)dealloc { [_handler release]; [super dealloc]; } # endif @end @implementation OFRunLoopReadStringQueueItem |
︙ | ︙ | |||
567 568 569 570 571 572 573 | exception = e; } if (string == nil && ![object isAtEndOfStream] && exception == nil) return true; # ifdef OF_HAVE_BLOCKS | | | | | 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 | exception = e; } if (string == nil && ![object isAtEndOfStream] && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_handler != NULL) return _handler(object, string, exception); else { # endif if (![_delegate respondsToSelector: @selector(stream:didReadString:exception:)]) return false; return [_delegate stream: object didReadString: string exception: exception]; # ifdef OF_HAVE_BLOCKS } # endif } # ifdef OF_HAVE_BLOCKS - (void)dealloc { [_handler release]; [super dealloc]; } # endif @end @implementation OFRunLoopReadLineQueueItem |
︙ | ︙ | |||
610 611 612 613 614 615 616 | exception = e; } if (line == nil && ![object isAtEndOfStream] && exception == nil) return true; # ifdef OF_HAVE_BLOCKS | | | | | 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 | exception = e; } if (line == nil && ![object isAtEndOfStream] && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_handler != NULL) return _handler(object, line, exception); else { # endif if (![_delegate respondsToSelector: @selector(stream:didReadLine:exception:)]) return false; return [_delegate stream: object didReadLine: line exception: exception]; # ifdef OF_HAVE_BLOCKS } # endif } # ifdef OF_HAVE_BLOCKS - (void)dealloc { [_handler release]; [super dealloc]; } # endif @end @implementation OFRunLoopWriteDataQueueItem |
︙ | ︙ | |||
665 666 667 668 669 670 671 | _writtenLength += length; OFEnsure(_writtenLength <= dataLength); if (_writtenLength != dataLength && exception == nil) return true; # ifdef OF_HAVE_BLOCKS | | | | 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 | _writtenLength += length; OFEnsure(_writtenLength <= dataLength); if (_writtenLength != dataLength && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_handler != NULL) { newData = _handler(object, _data, _writtenLength, exception); if (newData == nil) return false; oldData = _data; _data = [newData copy]; [oldData release]; |
︙ | ︙ | |||
705 706 707 708 709 710 711 | } # endif } - (void)dealloc { # ifdef OF_HAVE_BLOCKS | | | 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 | } # endif } - (void)dealloc { # ifdef OF_HAVE_BLOCKS [_handler release]; # endif [_data release]; [super dealloc]; } @end |
︙ | ︙ | |||
742 743 744 745 746 747 748 | _writtenLength += length; OFEnsure(_writtenLength <= cStringLength); if (_writtenLength != cStringLength && exception == nil) return true; # ifdef OF_HAVE_BLOCKS | | > | | 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 | _writtenLength += length; OFEnsure(_writtenLength <= cStringLength); if (_writtenLength != cStringLength && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_handler != NULL) { newString = _handler(object, _string, _encoding, _writtenLength, exception); if (newString == nil) return false; oldString = _string; _string = [newString copy]; [oldString release]; |
︙ | ︙ | |||
784 785 786 787 788 789 790 | # endif } - (void)dealloc { [_string release]; # ifdef OF_HAVE_BLOCKS | | | 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 | # endif } - (void)dealloc { [_string release]; # ifdef OF_HAVE_BLOCKS [_handler release]; # endif [super dealloc]; } @end # if !defined(OF_WII) && !defined(OF_NINTENDO_3DS) |
︙ | ︙ | |||
1297 1298 1299 1300 1301 1302 1303 | + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *) stream buffer: (void *)buffer length: (size_t)length mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS | | | | | | | | | | | | | | 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 | + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *) stream buffer: (void *)buffer length: (size_t)length mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (OFStreamReadHandler)handler # endif delegate: (id <OFStreamDelegate>)delegate { NEW_READ(OFRunLoopReadQueueItem, stream, mode) queueItem->_delegate = [delegate retain]; # ifdef OF_HAVE_BLOCKS queueItem->_handler = [handler copy]; # endif queueItem->_buffer = buffer; queueItem->_length = length; QUEUE_ITEM } + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *) stream buffer: (void *)buffer exactLength: (size_t)exactLength mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (OFStreamReadHandler)handler # endif delegate: (id <OFStreamDelegate>)delegate { NEW_READ(OFRunLoopExactReadQueueItem, stream, mode) queueItem->_delegate = [delegate retain]; # ifdef OF_HAVE_BLOCKS queueItem->_handler = [handler copy]; # endif queueItem->_buffer = buffer; queueItem->_exactLength = exactLength; QUEUE_ITEM } + (void)of_addAsyncReadStringForStream: (OFStream <OFReadyForReadingObserving > *)stream encoding: (OFStringEncoding)encoding mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (OFStreamStringReadHandler)handler # endif delegate: (id <OFStreamDelegate>)delegate { NEW_READ(OFRunLoopReadStringQueueItem, stream, mode) queueItem->_delegate = [delegate retain]; # ifdef OF_HAVE_BLOCKS queueItem->_handler = [handler copy]; # endif queueItem->_encoding = encoding; QUEUE_ITEM } + (void)of_addAsyncReadLineForStream: (OFStream <OFReadyForReadingObserving> *) stream encoding: (OFStringEncoding)encoding mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (OFStreamStringReadHandler)handler # endif delegate: (id <OFStreamDelegate>)delegate { NEW_READ(OFRunLoopReadLineQueueItem, stream, mode) queueItem->_delegate = [delegate retain]; # ifdef OF_HAVE_BLOCKS queueItem->_handler = [handler copy]; # endif queueItem->_encoding = encoding; QUEUE_ITEM } + (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *) stream data: (OFData *)data mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (OFStreamDataWrittenHandler)handler # endif delegate: (id <OFStreamDelegate>)delegate { NEW_WRITE(OFRunLoopWriteDataQueueItem, stream, mode) queueItem->_delegate = [delegate retain]; # ifdef OF_HAVE_BLOCKS queueItem->_handler = [handler copy]; # endif queueItem->_data = [data copy]; QUEUE_ITEM } + (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *) stream string: (OFString *)string encoding: (OFStringEncoding)encoding mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS handler: (OFStreamStringWrittenHandler)handler # endif delegate: (id <OFStreamDelegate>)delegate { NEW_WRITE(OFRunLoopWriteStringQueueItem, stream, mode) queueItem->_delegate = [delegate retain]; # ifdef OF_HAVE_BLOCKS queueItem->_handler = [handler copy]; # endif queueItem->_string = [string copy]; queueItem->_encoding = encoding; QUEUE_ITEM } |
︙ | ︙ |
Modified src/OFStream.h from [cb4dc06f17] to [f7c20b4fad].
︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 49 50 51 52 | @class OFStream; @class OFData; #if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_BLOCKS) /** * @brief A block which is called when data was read asynchronously from a * stream. * * @param length The length of the data that has been read * @param exception An exception which occurred while reading or `nil` on * success * @return A bool whether the same block should be used for the next read */ | > > | > > > > > > > > > > > > > > > > | | > > | > > > | > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > | 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 | @class OFStream; @class OFData; #if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_BLOCKS) /** * @brief A block which is called when data was read asynchronously from a * stream. * * @deprecated Use @ref OFStreamReadHandler instead. * * @param length The length of the data that has been read * @param exception An exception which occurred while reading or `nil` on * success * @return A bool whether the same block should be used for the next read */ typedef bool (^OFStreamAsyncReadBlock)(size_t length, id _Nullable exception) OF_DEPRECATED(ObjFW, 1, 2, "Use OFStreamReadHandler instead"); /** * @brief A handler which is called when data was read asynchronously from a * stream. * * @param stream The stream on which data was read * @param buffer A buffer with the data that has been read * @param length The length of the data that has been read * @param exception An exception which occurred while reading or `nil` on * success * @return A bool whether the same handler should be used for the next read */ typedef bool (^OFStreamReadHandler)(OFStream *stream, void *buffer, size_t length, id _Nullable exception); /** * @brief A block which is called when a string was read asynchronously from a * stream. * * @param stream The stream on which a string was read * @param string The string which has been read or `nil` when the end of stream * occurred * @param exception An exception which occurred while reading or `nil` on * success * @return A bool whether the same block should be used for the next read */ typedef bool (^OFStreamStringReadHandler)(OFStream *stream, OFString *_Nullable string, id _Nullable exception); /** * @brief A block which is called when a line was read asynchronously from a * stream. * * @deprecated Use @ref OFStreamStringReadHandler instead. * * @param line The line which has been read or `nil` when the end of stream * occurred * @param exception An exception which occurred while reading or `nil` on * success * @return A bool whether the same block should be used for the next read */ typedef bool (^OFStreamAsyncReadLineBlock)(OFString *_Nullable line, id _Nullable exception) OF_DEPRECATED(ObjFW, 1, 2, "Use OFStreamStringReadHandler instead"); /** * @brief A block which is called when data was written asynchronously to a * stream. * * @deprecated Use @ref OFStreamDataWrittenHandler instead. * * @param bytesWritten The number of bytes which have been written. This * matches the length of the specified data on the * asynchronous write if no exception was encountered. * @param exception An exception which occurred while writing or `nil` on * success * @return The data to repeat the write with or nil if it should not repeat */ typedef OFData *_Nullable (^OFStreamAsyncWriteDataBlock)(size_t bytesWritten, id _Nullable exception) OF_DEPRECATED(ObjFW, 1, 2, "Use OFStreamDataWrittenHandler instead"); /** * @brief A handler which is called when data was written asynchronously to a * stream. * * @param stream The stream to which data was written * @param data The data which was written to the stream * @param bytesWritten The number of bytes which have been written. This * matches the length of the specified data on the * asynchronous write if no exception was encountered. * @param exception An exception which occurred while writing or `nil` on * success * @return The data to repeat the write with or nil if it should not repeat */ typedef OFData *_Nullable (^OFStreamDataWrittenHandler)(OFStream *stream, OFData *data, size_t bytesWritten, id _Nullable exception); /** * @brief A block which is called when a string was written asynchronously to a * stream. * * @deprecated Use @ref OFStreamStringWrittenHandler instead. * * @param bytesWritten The number of bytes which have been written. This * matches the length of the specified data on the * asynchronous write if no exception was encountered. * @param exception An exception which occurred while writing or `nil` on * success * @return The string to repeat the write with or nil if it should not repeat */ typedef OFString *_Nullable (^OFStreamAsyncWriteStringBlock)( size_t bytesWritten, id _Nullable exception) OF_DEPRECATED(ObjFW, 1, 2, "Use OFStreamStringWrittenHandler instead"); /** * @brief A handler which is called when a string was written asynchronously to * a stream. * * @param stream The stream to which a string was written * @param string The string which was written to the stream * @param encoding The encoding in which the string was written * @param bytesWritten The number of bytes which have been written. This * matches the length of the specified data on the * asynchronous write if no exception was encountered. * @param exception An exception which occurred while writing or `nil` on * success * @return The string to repeat the write with or nil if it should not repeat */ typedef OFString *_Nullable (^OFStreamStringWrittenHandler)(OFStream *stream, OFString *string, OFStringEncoding encoding, size_t bytesWritten, id _Nullable exception); #endif /** * @protocol OFStreamDelegate OFStream.h ObjFW/ObjFW.h * * A delegate for OFStream. */ |
︙ | ︙ | |||
129 130 131 132 133 134 135 | length: (size_t)length exception: (nullable id)exception; /** * @brief This method is called when a string was read asynchronously from a * stream. * | | | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 | length: (size_t)length exception: (nullable id)exception; /** * @brief This method is called when a string was read asynchronously from a * stream. * * @param stream The stream on which a string was read * @param string The string which has been read or `nil` when the end of stream * occurred * @param exception An exception that occurred while reading, or nil on success * @return A bool whether the read should be repeated */ - (bool)stream: (OFStream *)stream didReadString: (nullable OFString *)string |
︙ | ︙ | |||
391 392 393 394 395 396 397 398 399 400 401 402 403 404 | exactLength: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode; # ifdef OF_HAVE_BLOCKS /** * @brief Asynchronously reads *at most* ref `length` bytes from the stream * into a buffer. * * On network streams, this might read less than the specified number of bytes. * If you want to read exactly the specified number of bytes, use * @ref asyncReadIntoBuffer:exactLength:block:. Note that a read can even * return 0 bytes - this does not necessarily mean that the stream ended, so * you still need to check @ref atEndOfStream. Do not assume that the stream * ended just because a read returned 0 bytes - some streams do internal | > > | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 | exactLength: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode; # ifdef OF_HAVE_BLOCKS /** * @brief Asynchronously reads *at most* ref `length` bytes from the stream * into a buffer. * * @deprecated Use @ref asyncReadIntoBuffer:length:handler: instead. * * On network streams, this might read less than the specified number of bytes. * If you want to read exactly the specified number of bytes, use * @ref asyncReadIntoBuffer:exactLength:block:. Note that a read can even * return 0 bytes - this does not necessarily mean that the stream ended, so * you still need to check @ref atEndOfStream. Do not assume that the stream * ended just because a read returned 0 bytes - some streams do internal |
︙ | ︙ | |||
415 416 417 418 419 420 421 | * If the block returns true, it will be called again with the same * buffer and maximum length when more data has been received. If * you want the next block in the queue to handle the data * received next, you need to return false from the block. */ - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | * If the block returns true, it will be called again with the same * buffer and maximum length when more data has been received. If * you want the next block in the queue to handle the data * received next, you need to return false from the block. */ - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length block: (OFStreamAsyncReadBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncReadIntoBuffer:length:handler:] instead"); /** * @brief Asynchronously reads *at most* ref `length` bytes from the stream * into a buffer. * * On network streams, this might read less than the specified number of bytes. * If you want to read exactly the specified number of bytes, use * @ref asyncReadIntoBuffer:exactLength:handler:. Note that a read can even * return 0 bytes - this does not necessarily mean that the stream ended, so * you still need to check @ref atEndOfStream. Do not assume that the stream * ended just because a read returned 0 bytes - some streams do internal * processing that has a result of 0 bytes. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param buffer The buffer into which the data is read. * The buffer must not be freed before the async read completed! * @param length The length of the data that should be read at most. * The buffer *must* be *at least* this big! * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again with the * same buffer and maximum length when more data has been * received. If you want the next handler in the queue to handle * the data received next, you need to return false from the * handler. */ - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length handler: (OFStreamReadHandler)handler; /** * @brief Asynchronously reads *at most* `length` bytes from the stream into a * buffer. * * @deprecated Use @ref asyncReadIntoBuffer:length:runLoopMode:handler: instead. * * On network streams, this might read less than the specified number of bytes. * If you want to read exactly the specified number of bytes, use * @ref asyncReadIntoBuffer:exactLength:block:. Note that a read can even * return 0 bytes - this does not necessarily mean that the stream ended, so * you still need to check @ref atEndOfStream. Do not assume that the stream * ended just because a read returned 0 bytes - some streams do internal |
︙ | ︙ | |||
446 447 448 449 450 451 452 | * buffer and maximum length when more data has been received. If * you want the next block in the queue to handle the data * received next, you need to return false from the block. */ - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 | * buffer and maximum length when more data has been received. If * you want the next block in the queue to handle the data * received next, you need to return false from the block. */ - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncReadBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncReadIntoBuffer:length:runLoopMode:handler:] instead"); /** * @brief Asynchronously reads *at most* `length` bytes from the stream into a * buffer. * * On network streams, this might read less than the specified number of bytes. * If you want to read exactly the specified number of bytes, use * @ref asyncReadIntoBuffer:exactLength:handler:. Note that a read can even * return 0 bytes - this does not necessarily mean that the stream ended, so * you still need to check @ref atEndOfStream. Do not assume that the stream * ended just because a read returned 0 bytes - some streams do internal * processing that has a result of 0 bytes. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param buffer The buffer into which the data is read. * The buffer must not be freed before the async read completed! * @param length The length of the data that should be read at most. * The buffer *must* be *at least* this big! * @param runLoopMode The run loop mode in which to perform the async read * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again with the * same buffer and maximum length when more data has been * received. If you want the next handler in the queue to handle * the data received next, you need to return false from the * handler. */ - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamReadHandler)handler; /** * @brief Asynchronously reads exactly the specified `length` bytes from the * stream into a buffer. * * @deprecated Use @ref asyncReadIntoBuffer:exactLength:handler: instead. * * Unlike @ref asyncReadIntoBuffer:length:block:, this method does not invoke * the block when less than the specified length has been read - instead, it * waits until it got exactly the specified length, the stream has ended or an * exception occurred. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param buffer The buffer into which the data is read * @param length The length of the data that should be read. * The buffer *must* be *at least* this big! * @param block The block to call when the data has been received. * If the block returns true, it will be called again with the same * buffer and exact length when more data has been received. If * you want the next block in the queue to handle the data * received next, you need to return false from the block. */ - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length block: (OFStreamAsyncReadBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncReadIntoBuffer:exactLength:handler:] instead"); /** * @brief Asynchronously reads exactly the specified `length` bytes from the * stream into a buffer. * * Unlike @ref asyncReadIntoBuffer:length:handler:, this method does not invoke * the handler when less than the specified length has been read - instead, it * waits until it got exactly the specified length, the stream has ended or an * exception occurred. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param buffer The buffer into which the data is read * @param length The length of the data that should be read. * The buffer *must* be *at least* this big! * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again with the * same buffer and exact length when more data has been * received. If you want the next handler in the queue to handle * the data received next, you need to return false from the * handler. */ - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length handler: (OFStreamReadHandler)handler; /** * @brief Asynchronously reads exactly the specified `length` bytes from the * stream into a buffer. * * @deprecated Use @ref asyncReadIntoBuffer:exactLength:runLoopMode:handler: * instead. * * Unlike @ref asyncReadIntoBuffer:length:block:, this method does not invoke * the block when less than the specified length has been read - instead, it * waits until it got exactly the specified length, the stream has ended or an * exception occurred. * * @note The stream must conform to @ref OFReadyForReadingObserving in order |
︙ | ︙ | |||
498 499 500 501 502 503 504 | * buffer and exact length when more data has been received. If * you want the next block in the queue to handle the data * received next, you need to return false from the block. */ - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 | * buffer and exact length when more data has been received. If * you want the next block in the queue to handle the data * received next, you need to return false from the block. */ - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncReadBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncReadIntoBuffer:exactLength:runLoopMode:handler: instead]"); /** * @brief Asynchronously reads exactly the specified `length` bytes from the * stream into a buffer. * * Unlike @ref asyncReadIntoBuffer:length:handler:, this method does not invoke * the handler when less than the specified length has been read - instead, it * waits until it got exactly the specified length, the stream has ended or an * exception occurred. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param buffer The buffer into which the data is read * @param length The length of the data that should be read. * The buffer *must* be *at least* this big! * @param runLoopMode The run loop mode in which to perform the async read * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again with the * same buffer and exact length when more data has been * received. If you want the next handler in the queue to handle * the data received next, you need to return false from the * handler. */ - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamReadHandler)handler; # endif #endif /** * @brief Reads a uint8_t from the stream. * * @warning Only call this when you know that enough data is available! |
︙ | ︙ | |||
869 870 871 872 873 874 875 | /** * @brief Asynchronously reads until a `\0`, end of stream or an exception * occurs. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * | | | | | | | | | | | | | | | | | | | > > | > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > | 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 | /** * @brief Asynchronously reads until a `\0`, end of stream or an exception * occurs. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again when the * next string has been received. If you want the next handler * in the queue to handle the next string, you need to return * false from the handler. */ - (void)asyncReadStringWithHandler: (OFStreamStringReadHandler)handler; /** * @brief Asynchronously reads with the specified encoding until a `\0`, end of * stream or an exception occurs. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param encoding The encoding used by the stream * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again when the * next string has been received. If you want the next handler * in the queue to handle the next string, you need to return * false from the handler. */ - (void)asyncReadStringWithEncoding: (OFStringEncoding)encoding handler: (OFStreamStringReadHandler)handler; /** * @brief Asynchronously reads with the specified encoding until a `\0`, end of * stream or an exception occurs. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param encoding The encoding used by the stream * @param runLoopMode The run loop mode in which to perform the async read * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again when the * next string has been received. If you want the next handler * in the queue to handle the next string, you need to return * false from the handler. */ - (void)asyncReadStringWithEncoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamStringReadHandler)handler; /** * @brief Asynchronously reads until a newline, `\0`, end of stream or an * exception occurs. * * @deprecated Use @ref asyncReadLineWithHandler: instead. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param block The block to call when the data has been received. * If the block returns true, it will be called again when the next * line has been received. If you want the next block in the queue * to handle the next line, you need to return false from the * block. */ - (void)asyncReadLineWithBlock: (OFStreamAsyncReadLineBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncReadLineWithHandler:] instead"); /** * @brief Asynchronously reads until a newline, `\0`, end of stream or an * exception occurs. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again when the * next line has been received. If you want the next handler in * the queue to handle the next line, you need to return false * from the handler. */ - (void)asyncReadLineWithHandler: (OFStreamStringReadHandler)handler; /** * @brief Asynchronously reads with the specified encoding until a newline, * `\0`, end of stream or an exception occurs. * * @deprecated Use @ref asyncReadLineWithEncoding:handler: instead. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param encoding The encoding used by the stream * @param block The block to call when the data has been received. * If the block returns true, it will be called again when the next * line has been received. If you want the next block in the queue * to handle the next line, you need to return false from the * block. */ - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding block: (OFStreamAsyncReadLineBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncReadLineWithEncoding:handler:] instead"); /** * @brief Asynchronously reads with the specified encoding until a newline, * `\0`, end of stream or an exception occurs. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param encoding The encoding used by the stream * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again when the * next line has been received. If you want the next handler in * the queue to handle the next line, you need to return false * from the handler. */ - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding handler: (OFStreamStringReadHandler)handler; /** * @brief Asynchronously reads with the specified encoding until a newline, * `\0`, end of stream or an exception occurs. * * @deprecated Use @ref asyncReadLineWithEncoding:runLoopMode:handler: instead. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param encoding The encoding used by the stream * @param runLoopMode The run loop mode in which to perform the async read * @param block The block to call when the data has been received. * If the block returns true, it will be called again when the next * line has been received. If you want the next block in the queue * to handle the next line, you need to return false from the * block. */ - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncReadLineBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncReadLineWithEncoding:runLoopMode:handler:] instead"); /** * @brief Asynchronously reads with the specified encoding until a newline, * `\0`, end of stream or an exception occurs. * * @note The stream must conform to @ref OFReadyForReadingObserving in order * for this to work! * * @param encoding The encoding used by the stream * @param runLoopMode The run loop mode in which to perform the async read * @param handler The handler to call when the data has been received. * If the handler returns true, it will be called again when the * next line has been received. If you want the next handler in * the queue to handle the next line, you need to return false * from the handler. */ - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamStringReadHandler)handler; # endif #endif /** * @brief Tries to read a string until a `\0` appears in the stream or the end * of the stream is reached. * |
︙ | ︙ | |||
1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 | - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode; # ifdef OF_HAVE_BLOCKS /** * @brief Asynchronously writes data into the stream. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param data The data which is written into the stream * @param block The block to call when the data has been written. It should * return the data for the next write with the same callback or * nil if it should not repeat. */ - (void)asyncWriteData: (OFData *)data | > > | > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > | 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 | - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode; # ifdef OF_HAVE_BLOCKS /** * @brief Asynchronously writes data into the stream. * * @deprecated Use @ref asyncWriteData:handler: instead. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param data The data which is written into the stream * @param block The block to call when the data has been written. It should * return the data for the next write with the same callback or * nil if it should not repeat. */ - (void)asyncWriteData: (OFData *)data block: (OFStreamAsyncWriteDataBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncWriteData:handler:] instead"); /** * @brief Asynchronously writes data into the stream. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param data The data which is written into the stream * @param handler The handler to call when the data has been written. It should * return the data for the next write with the same callback or * nil if it should not repeat. */ - (void)asyncWriteData: (OFData *)data handler: (OFStreamDataWrittenHandler)handler; /** * @brief Asynchronously writes data into the stream. * * @deprecated Use @ref asyncWriteData:runLoopMode:handler: instead. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param data The data which is written into the stream * @param runLoopMode The run loop mode in which to perform the async write * @param block The block to call when the data has been written. It should * return the data for the next write with the same callback or * nil if it should not repeat. */ - (void)asyncWriteData: (OFData *)data runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncWriteDataBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncWriteData:runLoopMode:handler:] instead"); /** * @brief Asynchronously writes data into the stream. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param data The data which is written into the stream * @param runLoopMode The run loop mode in which to perform the async write * @param handler The handler to call when the data has been written. It should * return the data for the next write with the same callback or * nil if it should not repeat. */ - (void)asyncWriteData: (OFData *)data runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamDataWrittenHandler)handler; /** * @brief Asynchronously writes a string into the stream. * * @deprecated Use @ref asyncWriteString:handler: instead. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param string The string which is written into the stream * @param block The block to call when the string has been written. It should * return the string for the next write with the same callback or * nil if it should not repeat. */ - (void)asyncWriteString: (OFString *)string block: (OFStreamAsyncWriteStringBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncWriteString:handler:] instead"); /** * @brief Asynchronously writes a string into the stream. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param string The string which is written into the stream * @param handler The handler to call when the string has been written. It * should return the string for the next write with the same * callback or nil if it should not repeat. */ - (void)asyncWriteString: (OFString *)string handler: (OFStreamStringWrittenHandler)handler; /** * @brief Asynchronously writes a string in the specified encoding into the * stream. * * @deprecated Use @ref asyncWriteString:encoding:handler: instead. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param string The string which is written into the stream * @param encoding The encoding in which the string should be written to the * stream * @param block The block to call when the string has been written. It should * return the string for the next write with the same callback or * nil if it should not repeat. */ - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding block: (OFStreamAsyncWriteStringBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncWriteString:encoding:handler:] instead"); /** * @brief Asynchronously writes a string in the specified encoding into the * stream. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param string The string which is written into the stream * @param encoding The encoding in which the string should be written to the * stream * @param handler The handler to call when the string has been written. It * should return the string for the next write with the same * callback or nil if it should not repeat. */ - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding handler: (OFStreamStringWrittenHandler)handler; /** * @brief Asynchronously writes a string in the specified encoding into the * stream. * * @deprecated Use @ref asyncWriteString:encoding:runLoopMode:handler: instead. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param string The string which is written into the stream * @param encoding The encoding in which the string should be written to the * stream * @param runLoopMode The run loop mode in which to perform the async write * @param block The block to call when the string has been written. It should * return the string for the next write with the same callback or * nil if it should not repeat. */ - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncWriteStringBlock)block OF_DEPRECATED(ObjFW, 1, 2, "Use -[asyncWriteString:encoding:runLoopMode:handler:] instead"); /** * @brief Asynchronously writes a string in the specified encoding into the * stream. * * @note The stream must conform to @ref OFReadyForWritingObserving in order * for this to work! * * @param string The string which is written into the stream * @param encoding The encoding in which the string should be written to the * stream * @param runLoopMode The run loop mode in which to perform the async write * @param handler The handler to call when the string has been written. It * should return the string for the next write with the same * callback or nil if it should not repeat. */ - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamStringWrittenHandler)handler; # endif #endif /** * @brief Writes a uint8_t into the stream. * * In non-blocking mode, the behavior is the same as @ref writeBuffer:length:. |
︙ | ︙ |
Modified src/OFStream.m from [8516a05a5a] to [3c615c19ea].
︙ | ︙ | |||
215 216 217 218 219 220 221 | (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadForStream: stream buffer: buffer length: length mode: runLoopMode # ifdef OF_HAVE_BLOCKS | | | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 | (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadForStream: stream buffer: buffer length: length mode: runLoopMode # ifdef OF_HAVE_BLOCKS handler: NULL # endif delegate: _delegate]; } - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length { [self asyncReadIntoBuffer: buffer |
︙ | ︙ | |||
239 240 241 242 243 244 245 | (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadForStream: stream buffer: buffer exactLength: length mode: runLoopMode # ifdef OF_HAVE_BLOCKS | | > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > | | 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 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 | (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadForStream: stream buffer: buffer exactLength: length mode: runLoopMode # ifdef OF_HAVE_BLOCKS handler: NULL # endif delegate: _delegate]; } # ifdef OF_HAVE_BLOCKS - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length block: (OFStreamAsyncReadBlock)block { OFStreamReadHandler handler = ^ (OFStream *stream, void *buffer_, size_t length_, id exception) { return block(length, exception); }; [self asyncReadIntoBuffer: buffer length: length runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length handler: (OFStreamReadHandler)handler { [self asyncReadIntoBuffer: buffer length: length runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncReadBlock)block { OFStreamReadHandler handler = ^ (OFStream *stream, void *buffer_, size_t length_, id exception) { return block(length, exception); }; [self asyncReadIntoBuffer: buffer length: length runLoopMode: runLoopMode handler: handler]; } - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamReadHandler)handler { OFStream <OFReadyForReadingObserving> *stream = (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadForStream: stream buffer: buffer length: length mode: runLoopMode handler: handler delegate: nil]; } - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length block: (OFStreamAsyncReadBlock)block { OFStreamReadHandler handler = ^ (OFStream *stream, void *buffer_, size_t length_, id exception) { return block(length, exception); }; [self asyncReadIntoBuffer: buffer exactLength: length runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length handler: (OFStreamReadHandler)handler { [self asyncReadIntoBuffer: buffer exactLength: length runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncReadBlock)block { OFStreamReadHandler handler = ^ (OFStream *stream, void *buffer_, size_t length_, id exception) { return block(length, exception); }; [self asyncReadIntoBuffer: buffer exactLength: length runLoopMode: runLoopMode handler: handler]; } - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamReadHandler)handler { OFStream <OFReadyForReadingObserving> *stream = (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadForStream: stream buffer: buffer exactLength: length mode: runLoopMode handler: handler delegate: nil]; } # endif #endif - (uint8_t)readInt8 { |
︙ | ︙ | |||
650 651 652 653 654 655 656 | OFStream <OFReadyForReadingObserving> *stream = (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadStringForStream: stream encoding: encoding mode: runLoopMode # ifdef OF_HAVE_BLOCKS | | | 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 | OFStream <OFReadyForReadingObserving> *stream = (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadStringForStream: stream encoding: encoding mode: runLoopMode # ifdef OF_HAVE_BLOCKS handler: NULL # endif delegate: _delegate]; } - (void)asyncReadLine { [self asyncReadLineWithEncoding: OFStringEncodingUTF8 |
︙ | ︙ | |||
677 678 679 680 681 682 683 | OFStream <OFReadyForReadingObserving> *stream = (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadLineForStream: stream encoding: encoding mode: runLoopMode # ifdef OF_HAVE_BLOCKS | | | | | | | | > > > > > > > | > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > | | 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 | OFStream <OFReadyForReadingObserving> *stream = (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadLineForStream: stream encoding: encoding mode: runLoopMode # ifdef OF_HAVE_BLOCKS handler: NULL # endif delegate: _delegate]; } # ifdef OF_HAVE_BLOCKS - (void)asyncReadStringWithHandler: (OFStreamStringReadHandler)handler { [self asyncReadStringWithEncoding: OFStringEncodingUTF8 runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadStringWithEncoding: (OFStringEncoding)encoding handler: (OFStreamStringReadHandler)handler { [self asyncReadStringWithEncoding: encoding runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadStringWithEncoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamStringReadHandler)handler { OFStream <OFReadyForReadingObserving> *stream = (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadStringForStream: stream encoding: encoding mode: runLoopMode handler: handler delegate: nil]; } - (void)asyncReadLineWithBlock: (OFStreamAsyncReadLineBlock)block { OFStreamStringReadHandler handler = ^ (OFStream *stream, OFString *string, id exception) { return block(string, exception); }; [self asyncReadLineWithEncoding: OFStringEncodingUTF8 runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadLineWithHandler: (OFStreamStringReadHandler)handler { [self asyncReadLineWithEncoding: OFStringEncodingUTF8 runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding block: (OFStreamAsyncReadLineBlock)block { OFStreamStringReadHandler handler = ^ (OFStream *stream, OFString *string, id exception) { return block(string, exception); }; [self asyncReadLineWithEncoding: encoding runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding handler: (OFStreamStringReadHandler)handler { [self asyncReadLineWithEncoding: encoding runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncReadLineBlock)block { OFStreamStringReadHandler handler = ^ (OFStream *stream, OFString *string, id exception) { return block(string, exception); }; [self asyncReadLineWithEncoding: encoding runLoopMode: runLoopMode handler: handler]; } - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamStringReadHandler)handler { OFStream <OFReadyForReadingObserving> *stream = (OFStream <OFReadyForReadingObserving> *)self; [OFRunLoop of_addAsyncReadLineForStream: stream encoding: encoding mode: runLoopMode handler: handler delegate: nil]; } # endif #endif - (OFString *)tryReadString { |
︙ | ︙ | |||
1146 1147 1148 1149 1150 1151 1152 | OFStream <OFReadyForWritingObserving> *stream = (OFStream <OFReadyForWritingObserving> *)self; [OFRunLoop of_addAsyncWriteForStream: stream data: data mode: runLoopMode # ifdef OF_HAVE_BLOCKS | | | 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 | OFStream <OFReadyForWritingObserving> *stream = (OFStream <OFReadyForWritingObserving> *)self; [OFRunLoop of_addAsyncWriteForStream: stream data: data mode: runLoopMode # ifdef OF_HAVE_BLOCKS handler: NULL # endif delegate: _delegate]; } - (void)asyncWriteString: (OFString *)string { [self asyncWriteString: string |
︙ | ︙ | |||
1178 1179 1180 1181 1182 1183 1184 | (OFStream <OFReadyForWritingObserving> *)self; [OFRunLoop of_addAsyncWriteForStream: stream string: string encoding: encoding mode: runLoopMode # ifdef OF_HAVE_BLOCKS | | > > > > > > > | > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > | | 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 | (OFStream <OFReadyForWritingObserving> *)self; [OFRunLoop of_addAsyncWriteForStream: stream string: string encoding: encoding mode: runLoopMode # ifdef OF_HAVE_BLOCKS handler: NULL # endif delegate: _delegate]; } # ifdef OF_HAVE_BLOCKS - (void)asyncWriteData: (OFData *)data block: (OFStreamAsyncWriteDataBlock)block { OFStreamDataWrittenHandler handler = ^ (OFStream *stream, OFData *data_, size_t bytesWritten, id exception) { return block(bytesWritten, exception); }; [self asyncWriteData: data runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncWriteData: (OFData *)data handler: (OFStreamDataWrittenHandler)handler { [self asyncWriteData: data runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncWriteData: (OFData *)data runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncWriteDataBlock)block { OFStreamDataWrittenHandler handler = ^ (OFStream *stream, OFData *data_, size_t bytesWritten, id exception) { return block(bytesWritten, exception); }; [self asyncWriteData: data runLoopMode: runLoopMode handler: handler]; } - (void)asyncWriteData: (OFData *)data runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamDataWrittenHandler)handler { OFStream <OFReadyForWritingObserving> *stream = (OFStream <OFReadyForWritingObserving> *)self; [OFRunLoop of_addAsyncWriteForStream: stream data: data mode: runLoopMode handler: handler delegate: nil]; } - (void)asyncWriteString: (OFString *)string block: (OFStreamAsyncWriteStringBlock)block { OFStreamStringWrittenHandler handler = ^ (OFStream *stream, OFString *string_, OFStringEncoding encoding_, size_t bytesWritten, id exception) { return block(bytesWritten, exception); }; [self asyncWriteString: string encoding: OFStringEncodingUTF8 runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncWriteString: (OFString *)string handler: (OFStreamStringWrittenHandler)handler { [self asyncWriteString: string encoding: OFStringEncodingUTF8 runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding block: (OFStreamAsyncWriteStringBlock)block { OFStreamStringWrittenHandler handler = ^ (OFStream *stream, OFString *string_, OFStringEncoding encoding_, size_t bytesWritten, id exception) { return block(bytesWritten, exception); }; [self asyncWriteString: string encoding: encoding runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding handler: (OFStreamStringWrittenHandler)handler { [self asyncWriteString: string encoding: encoding runLoopMode: OFDefaultRunLoopMode handler: handler]; } - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode block: (OFStreamAsyncWriteStringBlock)block { OFStreamStringWrittenHandler handler = ^ (OFStream *stream, OFString *string_, OFStringEncoding encoding_, size_t bytesWritten, id exception) { return block(bytesWritten, exception); }; [self asyncWriteString: string encoding: encoding runLoopMode: runLoopMode handler: handler]; } - (void)asyncWriteString: (OFString *)string encoding: (OFStringEncoding)encoding runLoopMode: (OFRunLoopMode)runLoopMode handler: (OFStreamStringWrittenHandler)handler { OFStream <OFReadyForWritingObserving> *stream = (OFStream <OFReadyForWritingObserving> *)self; [OFRunLoop of_addAsyncWriteForStream: stream string: string encoding: encoding mode: runLoopMode handler: handler delegate: nil]; } # endif #endif - (void)writeInt8: (uint8_t)int8 { |
︙ | ︙ |