Comment: | Split -[OFStream fileDescriptor].
It is now -[fileDescriptorForReading] and -[fileDescriptorForWriting]. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
440e95fd4ab482f427647d62c096fb56 |
User & Date: | js on 2012-09-12 17:27:53 |
Other Links: | manifest | tags |
2012-09-14
| ||
05:20 | Implement async reading (into buffers and lines). check-in: a2b309b38a user: js tags: trunk | |
2012-09-12
| ||
17:27 | Split -[OFStream fileDescriptor]. check-in: 440e95fd4a user: js tags: trunk | |
08:03 | OFTimer: Add support for invoking blocks. check-in: dde45db1ef user: js tags: trunk | |
Modified src/OFFile.h from [33109fbbdb] to [32d36c992f].
︙ | ︙ | |||
37 38 39 40 41 42 43 | #endif /** * \brief A class which provides functions to read, write and manipulate files. */ @interface OFFile: OFSeekableStream { | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | #endif /** * \brief A class which provides functions to read, write and manipulate files. */ @interface OFFile: OFSeekableStream { int fd; BOOL closable; BOOL atEndOfStream; } /** * \brief Creates a new OFFile with the specified path and mode. * |
︙ | ︙ |
Modified src/OFFile.m from [9e887a707d] to [f9e4a0a447].
︙ | ︙ | |||
529 530 531 532 533 534 535 | length: length]; } #if !defined(_WIN32) && !defined(_PSP) if (!override) { struct stat s; | | | < | 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 | length: length]; } #if !defined(_WIN32) && !defined(_PSP) if (!override) { struct stat s; if (fstat(sourceFile->fd, &s) == 0) fchmod(destinationFile->fd, s.st_mode); } #else (void)override; #endif } @finally { [sourceFile close]; [destinationFile close]; |
︙ | ︙ | |||
657 658 659 660 661 662 663 | if ((flags = parse_mode([mode cStringWithEncoding: OF_STRING_ENCODING_NATIVE])) == -1) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; | | | | | | < < | | | | | | > > > > > | | | | | | 656 657 658 659 660 661 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 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 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 | if ((flags = parse_mode([mode cStringWithEncoding: OF_STRING_ENCODING_NATIVE])) == -1) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; if ((fd = open([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE], flags, DEFAULT_MODE)) == -1) @throw [OFOpenFileFailedException exceptionWithClass: [self class] path: path mode: mode]; closable = YES; } @catch (id e) { [self release]; @throw e; } return self; } - initWithFileDescriptor: (int)fileDescriptor { self = [super init]; fd = fileDescriptor; return self; } - (BOOL)_isAtEndOfStream { if (fd == -1) return YES; return atEndOfStream; } - (size_t)_readIntoBuffer: (void*)buffer length: (size_t)length { ssize_t ret; if (fd == -1 || atEndOfStream || (ret = read(fd, buffer, length)) < 0) @throw [OFReadFailedException exceptionWithClass: [self class] stream: self requestedLength: length]; if (ret == 0) atEndOfStream = YES; return ret; } - (void)_writeBuffer: (const void*)buffer length: (size_t)length { if (fd == -1 || atEndOfStream || write(fd, buffer, length) < length) @throw [OFWriteFailedException exceptionWithClass: [self class] stream: self requestedLength: length]; } - (void)_seekToOffset: (off_t)offset { if (lseek(fd, offset, SEEK_SET) == -1) @throw [OFSeekFailedException exceptionWithClass: [self class] stream: self offset: offset whence: SEEK_SET]; } - (off_t)_seekForwardWithOffset: (off_t)offset { off_t ret; if ((ret = lseek(fd, offset, SEEK_CUR)) == -1) @throw [OFSeekFailedException exceptionWithClass: [self class] stream: self offset: offset whence: SEEK_CUR]; return ret; } - (off_t)_seekToOffsetRelativeToEnd: (off_t)offset { off_t ret; if ((ret = lseek(fd, offset, SEEK_END)) == -1) @throw [OFSeekFailedException exceptionWithClass: [self class] stream: self offset: offset whence: SEEK_END]; return ret; } - (int)fileDescriptorForReading { return fd; } - (int)fileDescriptorForWriting { return fd; } - (void)close { if (fd != -1) close(fd); fd = -1; } - (void)dealloc { if (closable && fd != -1) close(fd); [super dealloc]; } @end @implementation OFFileSingleton + (void)load |
︙ | ︙ |
Modified src/OFProcess.m from [769871dec1] to [fe517b8418].
︙ | ︙ | |||
290 291 292 293 294 295 296 | - (void)dealloc { [self close]; [super dealloc]; } | < | > | | > > > > > | > > > > > > > > > | 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 | - (void)dealloc { [self close]; [super dealloc]; } - (int)fileDescriptorForReading { #ifndef _WIN32 return readPipe[0]; #else @throw [OFNotImplementedException exceptionWithClass: [self class] selector: _cmd]; #endif } - (int)fileDescriptorForWRiting { #ifndef _WIN32 return writePipe[1]; #else @throw [OFNotImplementedException exceptionWithClass: [self class] selector: _cmd]; #endif } - (void)closeForWriting { #ifndef _WIN32 if (writePipe[1] != -1) close(writePipe[1]); |
︙ | ︙ |
Modified src/OFStream.h from [aea1f2dd6e] to [fb448f8379].
︙ | ︙ | |||
806 807 808 809 810 811 812 | * On Win32, this currently only works for sockets! * * \param enable Whether the stream should be blocking */ - (void)setBlocking: (BOOL)enable; /** | | | | > > > > > > > | 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 | * On Win32, this currently only works for sockets! * * \param enable Whether the stream should be blocking */ - (void)setBlocking: (BOOL)enable; /** * \brief Returns the file descriptor for the read end of the stream. * * \return The file descriptor for the read end of the stream */ - (int)fileDescriptorForReading; /** * \brief Returns the file descriptor for the write end of the stream. * * \return The file descriptor for the write end of the stream */ - (int)fileDescriptorForWriting; /** * \brief Closes the stream. */ - (void)close; - (size_t)_readIntoBuffer: (void*)buffer length: (size_t)length; - (void)_writeBuffer: (const void*)buffer length: (size_t)length; - (BOOL)_isWaitingForDelimiter; @end |
Modified src/OFStream.m from [996f83c1ba] to [6992f1ccb5].
︙ | ︙ | |||
1360 1361 1362 1363 1364 1365 1366 | { return blocking; } - (void)setBlocking: (BOOL)enable { #ifndef _WIN32 | | | > | | | > | | > | > | > | > > > > > > | 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 | { return blocking; } - (void)setBlocking: (BOOL)enable { #ifndef _WIN32 int readFlags, writeFlags; readFlags = fcntl([self fileDescriptorForReading], F_GETFL); writeFlags = fcntl([self fileDescriptorForWriting], F_GETFL); if (readFlags == -1 || writeFlags == -1) @throw [OFSetOptionFailedException exceptionWithClass: [self class] stream: self]; if (enable) { readFlags &= ~O_NONBLOCK; writeFlags &= ~O_NONBLOCK; } else { readFlags |= O_NONBLOCK; writeFlags |= O_NONBLOCK; } if (fcntl([self fileDescriptorForReading], F_SETFL, readFlags) == -1 || fcntl([self fileDescriptorForWriting], F_SETFL, writeFlags) == -1) @throw [OFSetOptionFailedException exceptionWithClass: [self class] stream: self]; #else @throw [OFNotImplementedException exceptionWithClass: [self class] selector: _cmd]; #endif } - (int)fileDescriptorForReading { @throw [OFNotImplementedException exceptionWithClass: [self class] selector: _cmd]; } - (int)fileDescriptorForWriting { @throw [OFNotImplementedException exceptionWithClass: [self class] selector: _cmd]; } - (void)close { |
︙ | ︙ |
Modified src/OFStreamObserver.m from [2620dc6f33] to [41b087a39c].
︙ | ︙ | |||
185 186 187 188 189 190 191 | } - (void)addStreamForReading: (OFStream*)stream { [mutex lock]; @try { int qi = QUEUE_ADD | QUEUE_READ; | | | | | 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 | } - (void)addStreamForReading: (OFStream*)stream { [mutex lock]; @try { int qi = QUEUE_ADD | QUEUE_READ; int fd = [stream fileDescriptorForReading]; [queue addObject: stream]; [queueInfo addItem: &qi]; [queueFDs addItem: &fd]; } @finally { [mutex unlock]; } [self cancel]; } - (void)addStreamForWriting: (OFStream*)stream { [mutex lock]; @try { int qi = QUEUE_ADD | QUEUE_WRITE; int fd = [stream fileDescriptorForWriting]; [queue addObject: stream]; [queueInfo addItem: &qi]; [queueFDs addItem: &fd]; } @finally { [mutex unlock]; } [self cancel]; } - (void)removeStreamForReading: (OFStream*)stream { [mutex lock]; @try { int qi = QUEUE_REMOVE | QUEUE_READ; int fd = [stream fileDescriptorForReading]; [queue addObject: stream]; [queueInfo addItem: &qi]; [queueFDs addItem: &fd]; } @finally { [mutex unlock]; } |
︙ | ︙ | |||
241 242 243 244 245 246 247 | } - (void)removeStreamForWriting: (OFStream*)stream { [mutex lock]; @try { int qi = QUEUE_REMOVE | QUEUE_WRITE; | | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | } - (void)removeStreamForWriting: (OFStream*)stream { [mutex lock]; @try { int qi = QUEUE_REMOVE | QUEUE_WRITE; int fd = [stream fileDescriptorForWriting]; [queue addObject: stream]; [queueInfo addItem: &qi]; [queueFDs addItem: &fd]; } @finally { [mutex unlock]; } |
︙ | ︙ |
Modified src/OFStreamObserver_select.m from [eb397d13f9] to [9b40b1e63a].
︙ | ︙ | |||
114 115 116 117 118 119 120 | #endif } objects = [readStreams objects]; count = [readStreams count]; for (i = 0; i < count; i++) { | | | | | | | | | 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 | #endif } objects = [readStreams objects]; count = [readStreams count]; for (i = 0; i < count; i++) { int fd = [objects[i] fileDescriptorForReading]; pool = objc_autoreleasePoolPush(); if (FD_ISSET(fd, &readFDs_)) { realEvents++; [delegate streamIsReadyForReading: objects[i]]; } if (FD_ISSET(fd, &exceptFDs_)) { realEvents++; [delegate streamDidReceiveException: objects[i]]; /* * Prevent calling it twice in case the FD is in both * sets. */ FD_CLR(fd, &exceptFDs_); } objc_autoreleasePoolPop(pool); } objects = [writeStreams objects]; count = [writeStreams count]; for (i = 0; i < count; i++) { int fd = [objects[i] fileDescriptorForWriting]; pool = objc_autoreleasePoolPush(); if (FD_ISSET(fd, &writeFDs_)) { realEvents++; [delegate streamIsReadyForWriting: objects[i]]; } if (FD_ISSET(fd, &exceptFDs_)) { realEvents++; [delegate streamDidReceiveException: objects[i]]; } objc_autoreleasePoolPop(pool); } if (realEvents == 0) return NO; return YES; } @end |
Modified src/OFStreamSocket.m from [987460de9d] to [fbc78fae5c].
︙ | ︙ | |||
142 143 144 145 146 147 148 | if (ioctlsocket(sock, FIONBIO, &v) == SOCKET_ERROR) @throw [OFSetOptionFailedException exceptionWithClass: [self class] stream: self]; } #endif | | > > > > > | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | if (ioctlsocket(sock, FIONBIO, &v) == SOCKET_ERROR) @throw [OFSetOptionFailedException exceptionWithClass: [self class] stream: self]; } #endif - (int)fileDescriptorForReading { return sock; } - (int)fileDescriptorForWriting { return sock; } - (void)close { if (sock == INVALID_SOCKET) |
︙ | ︙ |