Skip to content
Snippets Groups Projects
Commit 033db460 authored by Muxi Yan's avatar Muxi Yan
Browse files

Fix pipeline finishing bug

parent a8d40b56
No related branches found
No related tags found
No related merge requests found
...@@ -70,48 +70,66 @@ ...@@ -70,48 +70,66 @@
__weak GRXBufferedPipe *weakSelf = self; __weak GRXBufferedPipe *weakSelf = self;
dispatch_async(_writeQueue, ^(void) { dispatch_async(_writeQueue, ^(void) {
GRXBufferedPipe *strongSelf = weakSelf; GRXBufferedPipe *strongSelf = weakSelf;
if (strongSelf) { if (strongSelf && !strongSelf->_errorOrNil) {
[strongSelf->_writeable writeValue:value]; [strongSelf->_writeable writeValue:value];
} }
}); });
} }
- (void)writesFinishedWithError:(NSError *)errorOrNil { - (void)writesFinishedWithError:(NSError *)errorOrNil {
if (_inputIsFinished) {
return;
}
_inputIsFinished = YES; _inputIsFinished = YES;
_errorOrNil = errorOrNil; _errorOrNil = errorOrNil;
if (errorOrNil) { if (errorOrNil) {
// No need to write pending values. // No need to write pending values.
[self finishWithError:_errorOrNil]; [self finishWithError:_errorOrNil];
} else {
__weak GRXBufferedPipe *weakSelf = self;
dispatch_async(_writeQueue, ^{
GRXBufferedPipe *strongSelf = weakSelf;
if (strongSelf) {
[strongSelf finishWithError:_errorOrNil];
}
});
} }
} }
#pragma mark GRXWriter implementation #pragma mark GRXWriter implementation
- (void)setState:(GRXWriterState)newState { - (void)setState:(GRXWriterState)newState {
// Manual transitions are only allowed from the started or paused states. @synchronized (self) {
if (_state == GRXWriterStateNotStarted || _state == GRXWriterStateFinished) { // Manual transitions are only allowed from the started or paused states.
return; if (_state == GRXWriterStateNotStarted || _state == GRXWriterStateFinished) {
}
switch (newState) {
case GRXWriterStateFinished:
_state = newState;
// Per GRXWriter's contract, setting the state to Finished manually means one doesn't wish the
// writeable to be messaged anymore.
_writeable = nil;
return;
case GRXWriterStatePaused:
_state = newState;
dispatch_suspend(_writeQueue);
return; return;
case GRXWriterStateStarted: }
if (_state == GRXWriterStatePaused) {
switch (newState) {
case GRXWriterStateFinished:
if (_state == GRXWriterStatePaused) {
dispatch_resume(_writeQueue);
}
_state = newState; _state = newState;
dispatch_resume(_writeQueue); // Per GRXWriter's contract, setting the state to Finished manually means one doesn't wish the
} // writeable to be messaged anymore.
return; _writeable = nil;
case GRXWriterStateNotStarted: return;
return; case GRXWriterStatePaused:
if (_state == GRXWriterStateStarted) {
_state = newState;
dispatch_suspend(_writeQueue);
}
return;
case GRXWriterStateStarted:
if (_state == GRXWriterStatePaused) {
_state = newState;
dispatch_resume(_writeQueue);
}
return;
case GRXWriterStateNotStarted:
return;
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment