ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-03-18 21:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

More strict disposables

Browse Source
This commit is contained in:
Peter
2015-03-01 18:29:25 +01:00
parent 00ca6f5e0d
commit 5fa95f6145
11 changed files with 246 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SSignalKit.xcodeproj/project.pbxproj
View File

@@ -29,8 +29,6 @@
D0445E351A7C2D7300267924 /* SSignal+Catch.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E091A7C2D7300267924 /* SSignal+Catch.m */; };
D0445E361A7C2D7300267924 /* SSignal+Combine.h in Headers */ = {isa = PBXBuildFile; fileRef = D0445E0A1A7C2D7300267924 /* SSignal+Combine.h */; settings = {ATTRIBUTES = (Public, ); }; };
D0445E371A7C2D7300267924 /* SSignal+Combine.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E0B1A7C2D7300267924 /* SSignal+Combine.m */; };
D0445E381A7C2D7300267924 /* SSignal+Concat.h in Headers */ = {isa = PBXBuildFile; fileRef = D0445E0C1A7C2D7300267924 /* SSignal+Concat.h */; settings = {ATTRIBUTES = (Public, ); }; };
D0445E391A7C2D7300267924 /* SSignal+Concat.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E0D1A7C2D7300267924 /* SSignal+Concat.m */; };
D0445E3A1A7C2D7300267924 /* SSignal+Dispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = D0445E0E1A7C2D7300267924 /* SSignal+Dispatch.h */; settings = {ATTRIBUTES = (Public, ); }; };
D0445E3B1A7C2D7300267924 /* SSignal+Dispatch.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E0F1A7C2D7300267924 /* SSignal+Dispatch.m */; };
D0445E3C1A7C2D7300267924 /* SSignal+Mapping.h in Headers */ = {isa = PBXBuildFile; fileRef = D0445E101A7C2D7300267924 /* SSignal+Mapping.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -65,7 +63,6 @@
D0445E7B1A7C447D00267924 /* SSignal+Accumulate.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E071A7C2D7300267924 /* SSignal+Accumulate.m */; };
D0445E7C1A7C447D00267924 /* SSignal+Catch.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E091A7C2D7300267924 /* SSignal+Catch.m */; };
D0445E7D1A7C447D00267924 /* SSignal+Combine.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E0B1A7C2D7300267924 /* SSignal+Combine.m */; };
D0445E7E1A7C447D00267924 /* SSignal+Concat.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E0D1A7C2D7300267924 /* SSignal+Concat.m */; };
D0445E7F1A7C447D00267924 /* SSignal+Dispatch.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E0F1A7C2D7300267924 /* SSignal+Dispatch.m */; };
D0445E801A7C447D00267924 /* SSignal+Mapping.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E111A7C2D7300267924 /* SSignal+Mapping.m */; };
D0445E811A7C447D00267924 /* SSignal+Meta.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E131A7C2D7300267924 /* SSignal+Meta.m */; };
@@ -133,8 +130,6 @@
D0445E091A7C2D7300267924 /* SSignal+Catch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SSignal+Catch.m"; sourceTree = "<group>"; };
D0445E0A1A7C2D7300267924 /* SSignal+Combine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SSignal+Combine.h"; sourceTree = "<group>"; };
D0445E0B1A7C2D7300267924 /* SSignal+Combine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SSignal+Combine.m"; sourceTree = "<group>"; };
D0445E0C1A7C2D7300267924 /* SSignal+Concat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SSignal+Concat.h"; sourceTree = "<group>"; };
D0445E0D1A7C2D7300267924 /* SSignal+Concat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SSignal+Concat.m"; sourceTree = "<group>"; };
D0445E0E1A7C2D7300267924 /* SSignal+Dispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SSignal+Dispatch.h"; sourceTree = "<group>"; };
D0445E0F1A7C2D7300267924 /* SSignal+Dispatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SSignal+Dispatch.m"; sourceTree = "<group>"; };
D0445E101A7C2D7300267924 /* SSignal+Mapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SSignal+Mapping.h"; sourceTree = "<group>"; };
@@ -239,8 +234,6 @@
D0445E091A7C2D7300267924 /* SSignal+Catch.m */,
D0445E0A1A7C2D7300267924 /* SSignal+Combine.h */,
D0445E0B1A7C2D7300267924 /* SSignal+Combine.m */,
D0445E0C1A7C2D7300267924 /* SSignal+Concat.h */,
D0445E0D1A7C2D7300267924 /* SSignal+Concat.m */,
D0445E0E1A7C2D7300267924 /* SSignal+Dispatch.h */,
D0445E0F1A7C2D7300267924 /* SSignal+Dispatch.m */,
D0445E101A7C2D7300267924 /* SSignal+Mapping.h */,
@@ -327,7 +320,6 @@
D0445E231A7C2D7300267924 /* SAtomic.h in Headers */,
D087632A1A839EDC00632240 /* SDisposableSet.h in Headers */,
D0445E461A7C2D7300267924 /* SSignal+Timing.h in Headers */,
D0445E381A7C2D7300267924 /* SSignal+Concat.h in Headers */,
D0445DDE1A7C2CA500267924 /* SSignalKit.h in Headers */,
D0445E3C1A7C2D7300267924 /* SSignal+Mapping.h in Headers */,
);
@@ -467,7 +459,6 @@
D0445E311A7C2D7300267924 /* SSignal.m in Sources */,
D087632B1A839EDC00632240 /* SDisposableSet.m in Sources */,
D0445E491A7C2D7300267924 /* SSubscriber.m in Sources */,
D0445E391A7C2D7300267924 /* SSignal+Concat.m in Sources */,
D0445E431A7C2D7300267924 /* SSignal+SideEffects.m in Sources */,
D0445E3F1A7C2D7300267924 /* SSignal+Meta.m in Sources */,
D0445E371A7C2D7300267924 /* SSignal+Combine.m in Sources */,
@@ -508,7 +499,6 @@
D0445E7A1A7C447D00267924 /* SSignal.m in Sources */,
D087632C1A839EE800632240 /* SDisposableSet.m in Sources */,
D0445E861A7C447D00267924 /* SSubscriber.m in Sources */,
D0445E7E1A7C447D00267924 /* SSignal+Concat.m in Sources */,
D0445E831A7C447D00267924 /* SSignal+SideEffects.m in Sources */,
D0445E811A7C447D00267924 /* SSignal+Meta.m in Sources */,
D0445E7D1A7C447D00267924 /* SSignal+Combine.m in Sources */,

50
SSignalKit/SDisposableSet.m
View File

@@ -5,6 +5,7 @@
@interface SDisposableSet ()
{
OSSpinLock _lock;
bool _disposed;
id<SDisposable> _singleDisposable;
NSArray *_multipleDisposables;
}
@@ -18,24 +19,33 @@
if (disposable == nil)
return;
bool dispose = false;
OSSpinLockLock(&_lock);
if (_multipleDisposables != nil)
dispose = _disposed;
if (!dispose)
{
NSMutableArray *multipleDisposables = [[NSMutableArray alloc] initWithArray:_multipleDisposables];
[multipleDisposables addObject:disposable];
_multipleDisposables = multipleDisposables;
}
else if (_singleDisposable != nil)
{
NSMutableArray *multipleDisposables = [[NSMutableArray alloc] initWithObjects:_singleDisposable, disposable, nil];
_multipleDisposables = multipleDisposables;
_singleDisposable = nil;
}
else
{
_singleDisposable = disposable;
if (_multipleDisposables != nil)
{
NSMutableArray *multipleDisposables = [[NSMutableArray alloc] initWithArray:_multipleDisposables];
[multipleDisposables addObject:disposable];
_multipleDisposables = multipleDisposables;
}
else if (_singleDisposable != nil)
{
NSMutableArray *multipleDisposables = [[NSMutableArray alloc] initWithObjects:_singleDisposable, disposable, nil];
_multipleDisposables = multipleDisposables;
_singleDisposable = nil;
}
else
{
_singleDisposable = disposable;
}
}
OSSpinLockUnlock(&_lock);
if (dispose)
[disposable dispose];
}
- (void)dispose
@@ -44,10 +54,14 @@
NSArray *multipleDisposables = nil;
OSSpinLockLock(&_lock);
singleDisposable = _singleDisposable;
multipleDisposables = _multipleDisposables;
_singleDisposable = nil;
_multipleDisposables = nil;
if (!_disposed)
{
_disposed = true;
singleDisposable = _singleDisposable;
multipleDisposables = _multipleDisposables;
_singleDisposable = nil;
_multipleDisposables = nil;
}
OSSpinLockUnlock(&_lock);
if (singleDisposable != nil)

64
SSignalKit/SMetaDisposable.m
View File

@@ -4,54 +4,50 @@
@interface SMetaDisposable ()
{
void *_disposable;
OSSpinLock _lock;
bool _disposed;
id<SDisposable> _disposable;
}
@end
@implementation SMetaDisposable
- (void)dealloc
{
while (true)
{
void *previousDisposable = _disposable;
if (OSAtomicCompareAndSwapPtr(previousDisposable, NULL, &_disposable))
{
if (previousDisposable != NULL)
{
__strong id<SDisposable> strongPreviousDisposable = (__bridge_transfer id<SDisposable>)previousDisposable;
strongPreviousDisposable = nil;
}
break;
}
}
}
- (void)setDisposable:(id<SDisposable>)disposable
{
void *newDisposable = (__bridge_retained void *)disposable;
while (true)
id<SDisposable> previousDisposable = nil;
bool dispose = false;
OSSpinLockLock(&_lock);
dispose = _disposed;
if (!dispose)
{
void *previousDisposable = _disposable;
if (OSAtomicCompareAndSwapPtr(previousDisposable, newDisposable, &_disposable))
{
if (previousDisposable != NULL)
{
__strong id<SDisposable> strongPreviousDisposable = (__bridge_transfer id<SDisposable>)previousDisposable;
[strongPreviousDisposable dispose];
strongPreviousDisposable = nil;
}
break;
}
previousDisposable = _disposable;
_disposable = disposable;
}
OSSpinLockUnlock(&_lock);
if (previousDisposable != nil)
[previousDisposable dispose];
if (dispose)
[disposable dispose];
}
- (void)dispose
{
[self setDisposable:nil];
id<SDisposable> disposable = nil;
OSSpinLockLock(&_lock);
if (!_disposed)
{
disposable = _disposable;
_disposed = true;
}
OSSpinLockUnlock(&_lock);
if (disposable != nil)
[disposable dispose];
}
@end

5
SSignalKit/SSignal+Concat.h
View File

@@ -1,5 +0,0 @@
#import "SSignal.h"
@interface SSignal (Concat)
@end

14
SSignalKit/SSignal+Concat.m
View File

@@ -1,14 +0,0 @@
#import "SSignal+Concat.h"
#import "SAtomic.h"
@implementation SSignal (Concat)
- (SSignal *)concat:(SSignal *)another
{
NSAssert(false, @"123");
return nil;
}
@end

13
SSignalKit/SSignal+Multicast.m
View File

@@ -91,7 +91,18 @@ typedef enum {
for (SSubscriber *subscriber in currentSubscribers)
{
[subscriber putEvent:event];
switch (event.type)
{
case SEventTypeNext:
[subscriber putNext:event.data];
break;
case SEventTypeError:
[subscriber putError:event.data];
break;
case SEventTypeCompleted:
[subscriber putCompletion];
break;
}
}
}

12
SSignalKit/SSignal.m
View File

@@ -1,5 +1,7 @@
#import "SSignal.h"
#import "SBlockDisposable.h"
@interface SSignal ()
{
}
@@ -23,7 +25,11 @@
SSubscriber *subscriber = [[SSubscriber alloc] initWithNext:next error:error completed:completed];
id<SDisposable> disposable = _generator(subscriber);
[subscriber _assignDisposable:disposable];
return disposable;
return [[SBlockDisposable alloc] initWithBlock:^
{
[subscriber _markTerminatedWithoutDisposal];
[disposable dispose];
}];
}
- (id<SDisposable>)startWithNext:(void (^)(id next))next
@@ -31,7 +37,7 @@
SSubscriber *subscriber = [[SSubscriber alloc] initWithNext:next error:nil completed:nil];
id<SDisposable> disposable = _generator(subscriber);
[subscriber _assignDisposable:disposable];
return disposable;
return subscriber;
}
- (id<SDisposable>)startWithNext:(void (^)(id next))next completed:(void (^)())completed
@@ -39,7 +45,7 @@
SSubscriber *subscriber = [[SSubscriber alloc] initWithNext:next error:nil completed:completed];
id<SDisposable> disposable = _generator(subscriber);
[subscriber _assignDisposable:disposable];
return disposable;
return subscriber;
}
@end

2
SSignalKit/SSubscriber.h
View File

@@ -12,8 +12,8 @@
- (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error completed:(void (^)())completed;
- (void)_assignDisposable:(id<SDisposable>)disposable;
- (void)_markTerminatedWithoutDisposal;
- (void)putEvent:(SEvent *)event;
- (void)putNext:(id)next;
- (void)putError:(id)error;
- (void)putCompletion;

98
SSignalKit/SSubscriber.m
View File

@@ -1,16 +1,11 @@
#import "SSubscriber.h"
#import <pthread.h>
#import "SEvent.h"
#define lockSelf(x) pthread_mutex_lock(&x->_mutex)
#define unlockSelf(x) pthread_mutex_unlock(&x->_mutex)
#import <libkern/OSAtomic.h>
@interface SSubscriber ()
{
pthread_mutex_t _mutex;
OSSpinLock _lock;
bool _terminated;
id<SDisposable> _disposable;
}
@@ -23,7 +18,6 @@
self = [super init];
if (self != nil)
{
pthread_mutex_init(&_mutex, NULL);
_next = [next copy];
_error = [error copy];
_completed = [completed copy];
@@ -36,53 +30,27 @@
_disposable = disposable;
}
- (void)putEvent:(SEvent *)event
- (void)_markTerminatedWithoutDisposal
{
bool shouldDispose = false;
void (^next)(id) = nil;
void (^error)(id) = nil;
void (^completed)(id) = nil;
lockSelf(self);
next = self->_next;
error = self->_error;
completed = self->_completed;
if (event.type != SEventTypeNext)
OSSpinLockLock(&_lock);
if (!_terminated)
{
shouldDispose = true;
self->_next = nil;
self->_error = nil;
self->_completed = nil;
_terminated = true;
_next = nil;
_error = nil;
_completed = nil;
}
unlockSelf(self);
switch (event.type)
{
case SEventTypeNext:
if (next)
next(event.data);
break;
case SEventTypeError:
if (error)
error(event.data);
break;
case SEventTypeCompleted:
if (completed)
completed(event.data);
break;
}
if (shouldDispose)
[self->_disposable dispose];
OSSpinLockUnlock(&_lock);
}
- (void)putNext:(id)next
{
void (^fnext)(id) = nil;
lockSelf(self);
fnext = self->_next;
unlockSelf(self);
OSSpinLockLock(&_lock);
if (!_terminated)
fnext = self->_next;
OSSpinLockUnlock(&_lock);
if (fnext)
fnext(next);
@@ -93,13 +61,17 @@
bool shouldDispose = false;
void (^ferror)(id) = nil;
lockSelf(self);
ferror = self->_error;
shouldDispose = true;
self->_next = nil;
self->_error = nil;
self->_completed = nil;
unlockSelf(self);
OSSpinLockLock(&_lock);
if (!_terminated)
{
ferror = self->_error;
shouldDispose = true;
self->_next = nil;
self->_error = nil;
self->_completed = nil;
_terminated = true;
}
OSSpinLockUnlock(&_lock);
if (ferror)
ferror(error);
@@ -113,13 +85,17 @@
bool shouldDispose = false;
void (^completed)() = nil;
lockSelf(self);
completed = self->_completed;
shouldDispose = true;
self->_next = nil;
self->_error = nil;
self->_completed = nil;
unlockSelf(self);
OSSpinLockLock(&_lock);
if (!_terminated)
{
completed = self->_completed;
shouldDispose = true;
self->_next = nil;
self->_error = nil;
self->_completed = nil;
_terminated = true;
}
OSSpinLockUnlock(&_lock);
if (completed)
completed();

70
SSignalKitTests/SDisposableTests.m
View File

@@ -241,4 +241,74 @@
XCTAssertFalse(disposed2);
}
- (void)testMetaDisposableAlreadyDisposed
{
bool deallocated1 = false;
__block bool disposed1 = false;
bool deallocated2 = false;
__block bool disposed2 = false;
@autoreleasepool
{
DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1];
dispatch_block_t block1 = ^{
[object1 description];
disposed1 = true;
};
SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]];
DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2];
dispatch_block_t block2 = ^{
[object2 description];
disposed2 = true;
};
SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]];
SMetaDisposable *metaDisposable = [[SMetaDisposable alloc] init];
[metaDisposable setDisposable:blockDisposable1];
[metaDisposable dispose];
[metaDisposable setDisposable:blockDisposable2];
}
XCTAssertTrue(deallocated1);
XCTAssertTrue(disposed1);
XCTAssertTrue(deallocated2);
XCTAssertTrue(disposed2);
}
- (void)testDisposableSetAlreadyDisposed
{
bool deallocated1 = false;
__block bool disposed1 = false;
bool deallocated2 = false;
__block bool disposed2 = false;
@autoreleasepool
{
DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1];
dispatch_block_t block1 = ^{
[object1 description];
disposed1 = true;
};
SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]];
DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2];
dispatch_block_t block2 = ^{
[object2 description];
disposed2 = true;
};
SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]];
SMetaDisposable *metaDisposable = [[SMetaDisposable alloc] init];
[metaDisposable setDisposable:blockDisposable1];
[metaDisposable dispose];
[metaDisposable setDisposable:blockDisposable2];
}
XCTAssertTrue(deallocated1);
XCTAssertTrue(disposed1);
XCTAssertTrue(deallocated2);
XCTAssertTrue(disposed2);
}
@end

75
SSignalKitTests/SSignalBasicTests.m
View File

@@ -173,31 +173,29 @@
__block bool disposed = false;
__block bool generated = false;
@autoreleasepool
{
@autoreleasepool
DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
SSignal *signal = [[[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
{
DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
SSignal *signal = [[[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
{
[subscriber putNext:@1];
[object description];
return [[SBlockDisposable alloc] initWithBlock:^
{
[object description];
disposed = true;
}];
}] _mapInplace:^id(id value)
[subscriber putNext:@1];
[object description];
return [[SBlockDisposable alloc] initWithBlock:^
{
[object description];
return @([value intValue] * 2);
disposed = true;
}];
id<SDisposable> disposable = [signal startWithNext:^(id value)
{
generated = [value isEqual:@2];
} error:nil completed:nil];
[disposable dispose];
}
}] _mapInplace:^id(id value)
{
[object description];
return @([value intValue] * 2);
}];
id<SDisposable> disposable = [signal startWithNext:^(id value)
{
generated = [value isEqual:@2];
} error:nil completed:nil];
[disposable dispose];
}
XCTAssertTrue(deallocated);
@@ -205,4 +203,41 @@
XCTAssertTrue(generated);
}
- (void)testSubscriberDisposal
{
__block bool disposed = false;
__block bool generated = false;
dispatch_queue_t queue = dispatch_queue_create(NULL, 0);
@autoreleasepool
{
SSignal *signal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
{
dispatch_async(queue, ^
{
[subscriber putNext:@1];
});
return [[SBlockDisposable alloc] initWithBlock:^
{
disposed = true;
}];
}];
id<SDisposable> disposable = [signal startWithNext:^(id value)
{
generated = true;
} error:nil completed:nil];
[disposable dispose];
}
dispatch_barrier_sync(queue, ^
{
});
XCTAssertTrue(disposed);
XCTAssertFalse(generated);
}
@end