gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 20:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't check for hung apps ... MacOS-X doesn't.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25376 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-08-03 07:54:33 +00:00
parent 7ff31b1e24
commit 3a6d0536cb
2 changed files with 26 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -2,6 +2,8 @@
* Source/NSWorkspace.m: ([-launchedApplications]) complete and tidy
code to check existence of launched apps.
Revert code to check for apps that are not responding ... MacOS-X
reports hung apps, so we should do the same.
2007-08-02 Richard Frith-Macdonald <rfm@gnu.org>

88
Source/NSWorkspace.m
View file

@ -394,7 +394,7 @@ static id GSLaunched(NSNotification *notification, BOOL active)
// application communication
- (BOOL) _launchApplication: (NSString*)appName
arguments: (NSArray*)args;
- (id) _connectApplication: (NSString*)appName alert: (BOOL)alert;
- (id) _connectApplication: (NSString*)appName;
- (id) _workspaceApplication;
@end
@ -704,7 +704,7 @@ static NSString *_rootPath = @"/";
}
}
app = [self _connectApplication: appName alert: YES];
app = [self _connectApplication: appName];
if (app == nil)
{
NSArray *args;
@ -766,7 +766,7 @@ static NSString *_rootPath = @"/";
return NO;
}
app = [self _connectApplication: appName alert: YES];
app = [self _connectApplication: appName];
if (app == nil)
{
NSArray *args;
@ -1366,7 +1366,7 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
// workspace manager problem ... fall through to default code
NS_ENDHANDLER
app = [self _connectApplication: appName alert: YES];
app = [self _connectApplication: appName];
if (app == nil)
{
NSArray *args = nil;
@ -1439,7 +1439,6 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
if (apps == nil)
{
static NSDate *lastCheck = nil;
NSMutableArray *m;
unsigned count;
@ -1475,40 +1474,6 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
}
}
}
if ((count = [apps count]) > 0)
{
/* If it's over 30 seconds since the last check ... try to contact
* all launched applications to ensure that none have crashed.
*/
if (lastCheck == nil || [lastCheck timeIntervalSinceNow] < -30.0)
{
ASSIGN(lastCheck, [NSDate date]);
count = [apps count];
while (count-- > 0)
{
NSString *name;
name = [[apps objectAtIndex: count]
objectForKey: @"NSApplicationName"];
if (name != nil)
{
CREATE_AUTORELEASE_POOL(arp);
BOOL found = NO;
if ([self _connectApplication: name alert: NO] != nil)
{
found = YES;
}
RELEASE(arp);
if (found == NO)
{
[m removeObjectAtIndex: count];
}
}
}
}
}
}
return apps;
}
@ -2485,11 +2450,14 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
return YES;
}
- (id) _connectApplication: (NSString*)appName alert: (BOOL)alert
- (id) _connectApplication: (NSString*)appName
{
NSTimeInterval replyTimeout;
NSTimeInterval requestTimeout;
NSString *host;
NSString *port;
NSDate *when = nil;
NSConnection *conn = nil;
id app = nil;
while (app == nil)
@ -2515,12 +2483,17 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
*/
NS_DURING
{
app = [NSConnection rootProxyForConnectionWithRegisteredName: port
host: host];
conn = [NSConnection connectionWithRegisteredName: port host: host];
requestTimeout = [conn requestTimeout];
[conn setRequestTimeout: 5.0];
replyTimeout = [conn replyTimeout];
[conn setReplyTimeout: 5.0];
app = [conn rootProxy];
}
NS_HANDLER
{
/* Fatal error in DO */
conn = nil;
app = nil;
}
NS_ENDHANDLER
@ -2548,16 +2521,9 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
int result;
DESTROY(when);
if (alert == YES)
{
result = NSRunAlertPanel(appName,
@"Application seems to have hung",
@"Continue", @"Terminate", @"Wait");
}
else
{
result = NSAlertAlternateReturn;
}
result = NSRunAlertPanel(appName,
@"Application seems to have hung",
@"Continue", @"Terminate", @"Wait");
if (result == NSAlertDefaultReturn)
{
@ -2581,18 +2547,12 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
RELEASE(limit);
}
}
if (app == nil && port != nil && [host isEqual: @""] == YES)
if (conn != nil)
{
/*
* The application is not running on this host ... fake a termination
* notification for it and use that to remove it from the on-disk
* list of launched applications.
/* Use original timeouts
*/
GSLaunched([NSNotification
notificationWithName: NSWorkspaceDidTerminateApplicationNotification
object: self
userInfo: [NSDictionary dictionaryWithObject: port
forKey: @"NSApplicationName"]], NO);
[conn setRequestTimeout: requestTimeout];
[conn setReplyTimeout: replyTimeout];
}
TEST_RELEASE(when);
return app;
@ -2630,7 +2590,7 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
return nil;
}
app = [self _connectApplication: appName alert: YES];
app = [self _connectApplication: appName];
if (app == nil)
{
NSString *host;
@ -2660,7 +2620,7 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
if ([self _launchApplication: appName
arguments: nil] == YES)
{
app = [self _connectApplication: appName alert: YES];
app = [self _connectApplication: appName];
}
}
}