github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock related to aborting command with HTML output

Browse Source 
This would happen for a command that is set to re-use previous output window (when busy). We would kill the running command and wait (in the main dispatch queue) for it to stop, but since the runner is (now) using GCD as well, and updating the “did exit” status in the main queue, we would wait forever.
This commit is contained in:
Allan Odgaard
2014-03-30 14:49:43 +07:00
parent 91e8064439
commit 1377e34bb5
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Frameworks/DocumentWindow/src/DocumentController.mm
View File

@@ -1064,30 +1064,33 @@ namespace
if([windows count] && [windows indexOfObjectPassingTest:^(id obj, NSUInteger idx, BOOL* stop){ return (BOOL)!((HTMLOutputWindowController*)obj).running; }] == NSNotFound)
{
HTMLOutputWindowController* candidate = [windows firstObject];
switch(aCommand.output_reuse)
{
case output_reuse::reuse_busy:
{
NSAlert* alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:@"Stop “%@”?", [NSString stringWithCxxString:aCommand.name]] defaultButton:@"Stop" alternateButton:@"Cancel" otherButton:nil informativeTextWithFormat:@"The job that the task is performing will not be completed."];
OakShowAlertForWindow(alert, candidate.window, ^(NSInteger returnCode){
if(returnCode == NSAlertDefaultReturn) /* "Stop" */
{
oak::kill_process_group_in_background(candidate.commandRunner->process_id());
candidate.commandRunner->wait_for_command();
}
callback(returnCode == NSAlertDefaultReturn);
});
return;
}
break;
case output_reuse::abort_and_reuse_busy:
auto sheetResponseHandler = ^(NSInteger returnCode){
if(returnCode == NSAlertDefaultReturn) /* "Stop" */
{
oak::kill_process_group_in_background(candidate.commandRunner->process_id());
candidate.commandRunner->wait_for_command();
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
candidate.commandRunner->wait_for_command(); // Must not be called in main queue
dispatch_async(dispatch_get_main_queue(), ^{
callback(YES);
});
});
}
break;
else
{
callback(NO);
}
};
if(aCommand.output_reuse == output_reuse::reuse_busy)
{
NSAlert* alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:@"Stop “%@”?", [NSString stringWithCxxString:aCommand.name]] defaultButton:@"Stop" alternateButton:@"Cancel" otherButton:nil informativeTextWithFormat:@"The job that the task is performing will not be completed."];
OakShowAlertForWindow(alert, candidate.window, sheetResponseHandler);
}
else // output_reuse::abort_and_reuse_busy
{
sheetResponseHandler(NSAlertDefaultReturn);
}
return;
}
}
callback(YES);