X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/c1dc61cc189c0eb83fe8027c70949b9c4dcdbd24..f53b25adbb0e87abd41713a586d3c723ebeb8ff0:/ITByteStream.m diff --git a/ITByteStream.m b/ITByteStream.m index 301d851..3a878f3 100755 --- a/ITByteStream.m +++ b/ITByteStream.m @@ -8,7 +8,7 @@ #import "ITByteStream.h" -// TODO: Add NSCopying/NSCoding support +// TODO: Add NSCopying/NSCoding support. Blocking reads (how would this work? NSConditionLock?) @implementation ITByteStream -(id) init @@ -16,47 +16,108 @@ if (self == [super init]) { data = [[NSMutableData alloc] init]; + lock = [[NSLock alloc] init]; + delegate = nil; } return self; } --(id) initWithStream:(ITByteStream*)stream +-(id) initWithDelegate:(id)d +{ + if (self == [super init]) + { + data = [[NSMutableData alloc] init]; + lock = [[NSLock alloc] init]; + delegate = [d retain]; + } + return self; +} + +-(id) initWithStream:(ITByteStream*)stream delegate:(id)d { if (self == [super init]) { data = [stream->data copy]; + lock = [[NSLock alloc] init]; + delegate = [d retain]; } return 0; } --(void) dealloc +-(oneway void) dealloc { + [lock lock]; [data release]; + [lock unlock]; + [lock release]; [super dealloc]; } +-(void) setDelegate:(id )d +{ + [delegate release]; + delegate = [d retain]; +} + -(int) availableDataLength { - return [data length]; + int len; + [lock lock]; + len = [data length]; + [lock unlock]; + return len; } -(NSData*) readDataOfLength:(int)length { - NSData *ret, *tmp; + NSData *ret; NSRange range = {0, length}; + [lock lock]; ret = [data subdataWithRange:range]; -#if MAC_OS_X_VERSION_10_2 <= MAC_OS_X_VERSION_MAX_ALLOWED - [data replaceBytesInRange:range withBytes:nil length:0]; // this should delete off the end. should test. -#else - range = {length, [data length]}; - tmp = [data subdataWithRange:range]; - [data setData:tmp]; // maybe i should add a lock to this? it would be bad if someone was writing when it was reading... -#endif + [data replaceBytesInRange:range withBytes:nil length:0]; + [lock unlock]; + return ret; +} + +-(NSData*) readAllData +{ + NSData *ret; + [lock lock]; + ret = [data autorelease]; + data = [[NSMutableData alloc] init]; + [lock unlock]; return ret; } --(void) writeData:(NSData*)_data +-(void) writeData:(in NSData*)_data { + [lock lock]; [data appendData:_data]; + [lock unlock]; + [delegate newDataAdded:self]; +} + +-(void) writeBytes:(in char *)b len:(long)length +{ + [lock lock]; + [data appendBytes:b length:length]; + [lock unlock]; + [delegate newDataAdded:self]; +} + +-(void) lockStream +{ + [lock lock]; +} + +-(void) unlockStream +{ + [lock unlock]; +} + +-(void) shortenData:(long)length +{ + NSRange range = {0, length}; + [data replaceBytesInRange:range withBytes:nil length:0]; } @end