Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed crash when an iAP control session is stopped #1592

Merged
merged 2 commits into from Apr 14, 2020
Merged

Fixed crash when an iAP control session is stopped #1592

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c2eac9
Control session streams now started on main thread
NicoleYarroch Mar 19, 2020
572b42b
Apply suggestions from code review
NicoleYarroch Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 28 additions & 16 deletions SmartDeviceLink/SDLIAPControlSession.m
View file
Open in desktop
Expand Up @@ -54,27 +54,39 @@ - (void)startSession {
} else {
SDLLogD(@"Starting a control session with accessory (%@)", self.accessory.name);

if (![self sdl_startStreams]) {
SDLLogW(@"Control session failed to setup with accessory: %@. Attempting to create a new control session", self.accessory);
[self destroySession];
if (self.delegate == nil) { return; }
[self.delegate controlSessionShouldRetry];
} else {
SDLLogD(@"Waiting for the protocol string from Core, setting timer for %d seconds", ProtocolIndexTimeoutSeconds);
self.protocolIndexTimer = [self sdl_createControlSessionProtocolIndexStringDataTimeoutTimer];
}
__weak typeof(self) weakSelf = self;
[self sdl_startStreamsWithCompletionHandler:^(BOOL success) {
__strong typeof(weakSelf) strongSelf = weakSelf;
if (!success) {
SDLLogW(@"Control session failed to setup with accessory: %@. Attempting to create a new control session", strongSelf.accessory);
[strongSelf destroySession];
if (strongSelf.delegate == nil) { return; }
[strongSelf.delegate controlSessionShouldRetry];
} else {
SDLLogD(@"Waiting for the protocol string from Core, setting timer for %d seconds", ProtocolIndexTimeoutSeconds);
NicoleYarroch marked this conversation as resolved.
Show resolved Hide resolved
strongSelf.protocolIndexTimer = [strongSelf sdl_createControlSessionProtocolIndexStringDataTimeoutTimer];
}
}];
}
}

- (BOOL)sdl_startStreams {
if (![super createSession]) { return NO; }
/// Opens the input and output streams for the session on the main thread.
/// @discussion We must close the input/output streams from the same thread that owns the streams' run loop, otherwise if the streams are closed from another thread a random crash may occur. Since only a small amount of data will be transmitted on this stream before it is closed, we will open and close the streams on the main thread instead of creating a separate thread.
- (void)sdl_startStreamsWithCompletionHandler:(void (^)(BOOL success))completionHandler {
if (![super createSession]) {
return completionHandler(NO);
}

__weak typeof(self) weakSelf = self;
dispatch_async(dispatch_get_main_queue(), ^{
__strong typeof(weakSelf) strongSelf = weakSelf;

// No need for its own thread as only a small amount of data will be transmitted before control session is destroyed
SDLLogD(@"Created the control session successfully");
[super startStream:self.eaSession.outputStream];
[super startStream:self.eaSession.inputStream];
SDLLogD(@"Created the control session successfully");
[super startStream:strongSelf.eaSession.outputStream];
[super startStream:strongSelf.eaSession.inputStream];

return YES;
return completionHandler(YES);
});
}

#pragma mark Stop
Expand Down