gnustep/libs-ec
0
0
Fork 0
mirror of https://github.com/gnustep/libs-ec.git synced 2025-02-20 18:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

thread safety improvements

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@38496 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-05-14 13:47:30 +00:00
parent 865511899f
commit 2a76c0079e
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
EcProcess.m
View file

@ -1399,6 +1399,8 @@ static NSString *noFiles = @"No log files to archive";
return; return;
} }
name = [name lastPathComponent]; name = [name lastPathComponent];
[self ecDoLock];
hdl = [cmdLogMap objectForKey: name]; hdl = [cmdLogMap objectForKey: name];
if (hdl != nil) if (hdl != nil)
{ {
@ -1413,7 +1415,7 @@ static NSString *noFiles = @"No log files to archive";
NS_DURING NS_DURING
[hdl closeFile]; [hdl closeFile];
NS_HANDLER NS_HANDLER
NS_HANDLER NS_ENDHANDLER
/* /*
* If the file is empty, remove it, otherwise move to archive directory. * If the file is empty, remove it, otherwise move to archive directory.
@ -1444,6 +1446,7 @@ static NSString *noFiles = @"No log files to archive";
*/ */
[cmdLogMap removeObjectForKey: name]; [cmdLogMap removeObjectForKey: name];
} }
[self ecUnLock];
} }
- (NSFileHandle*) cmdLogFile: (NSString*)name - (NSFileHandle*) cmdLogFile: (NSString*)name
@ -1457,6 +1460,7 @@ static NSString *noFiles = @"No log files to archive";
return nil; return nil;
} }
name = [name lastPathComponent]; name = [name lastPathComponent];
[self ecDoLock];
hdl = [cmdLogMap objectForKey: name]; hdl = [cmdLogMap objectForKey: name];
if (hdl == nil) if (hdl == nil)
{ {
@ -1507,6 +1511,7 @@ static NSString *noFiles = @"No log files to archive";
} }
if (hdl == nil) if (hdl == nil)
{ {
[self ecUnLock];
return nil; return nil;
} }
/* /*
@ -1524,7 +1529,7 @@ static NSString *noFiles = @"No log files to archive";
NS_DURING NS_DURING
[hdl closeFile]; [hdl closeFile];
NS_HANDLER NS_HANDLER
NS_HANDLER NS_ENDHANDLER
hdl = [NSFileHandle fileHandleWithStandardError]; hdl = [NSFileHandle fileHandleWithStandardError];
} }
} }
@ -1537,7 +1542,9 @@ static NSString *noFiles = @"No log files to archive";
NSLog(@"%@", status); NSLog(@"%@", status);
} }
} }
return hdl; [hdl retain];
[self ecUnLock];
return [hdl autorelease];
} }
- (void) cmdLostConnectionToServer: (NSString*)name - (void) cmdLostConnectionToServer: (NSString*)name
@ -1794,16 +1801,7 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
* Cause timeout to go off really soon so we will try to * Cause timeout to go off really soon so we will try to
* re-establish the link to the server. * re-establish the link to the server.
*/ */
if (cmdPTimer != nil) [self triggerCmdTimeout];
{
[cmdPTimer invalidate];
cmdPTimer = nil;
}
cmdPTimer = [NSTimer scheduledTimerWithTimeInterval: 0.1
target: self
selector: @selector(_timedOut:)
userInfo: nil
repeats: NO];
} }
else else
{ {
@ -1840,9 +1838,12 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
} }
else else
{ {
NSEnumerator *enumerator = [[cmdLogMap allKeys] objectEnumerator]; NSEnumerator *enumerator;
NSString *name; NSString *name;
[self ecDoLock];
enumerator = [[cmdLogMap allKeys] objectEnumerator];
[self ecUnLock];
if (subdir == nil) if (subdir == nil)
{ {
NSCalendarDate *when = [NSCalendarDate date]; NSCalendarDate *when = [NSCalendarDate date];
@ -2607,6 +2608,13 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
- (void) triggerCmdTimeout - (void) triggerCmdTimeout
{ {
if (NO == [NSThread isMainThread])
{
[self performSelectorOnMainThread: _cmd
withObject: nil
waitUntilDone: NO];
return;
}
if (cmdPTimer != nil) if (cmdPTimer != nil)
{ {
/* /*
@ -4448,7 +4456,8 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
} }
NS_HANDLER NS_HANDLER
{ {
NSLog(@"Exception performing regular timeout: %@", localException); NSLog(@"Exception performing regular timeout: %@",
localException);
delay = YES; // Avoid runaway logging. delay = YES; // Avoid runaway logging.
} }
NS_ENDHANDLER NS_ENDHANDLER