gnustep/libs-ec
0
0
Fork 0
mirror of https://github.com/gnustep/libs-ec.git synced 2025-02-22 19:31:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweak

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@37889 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-05-16 22:13:43 +00:00
parent 3f204d7a83
commit f45c83caed
2 changed files with 90 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -6,6 +6,9 @@
* EcLogger.m: Use floating point flush interval for modern * EcLogger.m: Use floating point flush interval for modern
systems which run faster and might want to flush more than systems which run faster and might want to flush more than
once per second. once per second.
* EcProcess.m: Don't start handling timeouts until the
process is actually running (so we don't get any during
initialisation of the class).
* GNUmakefile: bump subminor version number for release * GNUmakefile: bump subminor version number for release
Version 1.1.3 release Version 1.1.3 release

19
EcProcess.m
View file

@ -105,6 +105,7 @@ static NSRecursiveLock *ecLock = nil;
static BOOL cmdFlagDaemon = NO; static BOOL cmdFlagDaemon = NO;
static BOOL cmdFlagTesting = NO; static BOOL cmdFlagTesting = NO;
static BOOL cmdIsQuitting = NO; static BOOL cmdIsQuitting = NO;
static BOOL cmdIsRunning = NO;
static NSInteger cmdQuitStatus = 0; static NSInteger cmdQuitStatus = 0;
static NSString *cmdInst = nil; static NSString *cmdInst = nil;
static NSString *cmdName = nil; static NSString *cmdName = nil;
@ -2347,6 +2348,7 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
[self cmdAudit: @"Started `%@'", [self cmdName]]; [self cmdAudit: @"Started `%@'", [self cmdName]];
[self cmdFlushLogs]; [self cmdFlushLogs];
cmdIsRunning = YES;
loop = [NSRunLoop currentRunLoop]; loop = [NSRunLoop currentRunLoop];
while (YES == [EcProcConnection isValid]) while (YES == [EcProcConnection isValid])
@ -2379,9 +2381,9 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
[arp release]; [arp release];
/* finish server */ /* finish server */
cmdIsQuitting = YES; cmdIsQuitting = YES;
[self cmdQuit: 0]; [self cmdQuit: 0];
cmdIsRunning = NO;
DESTROY(EcProcConnection); DESTROY(EcProcConnection);
return 0; return 0;
} }
@ -4119,7 +4121,11 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
cmdIsQuitting = YES; cmdIsQuitting = YES;
[self cmdQuit: sig]; [self cmdQuit: sig];
} }
if (YES == inProgress) if (YES == cmdIsQuitting)
{
NSLog(@"_timedOut: ignored because process is quitting");
}
else if (YES == inProgress)
{ {
NSLog(@"_timedOut: ignored because timeout already in progress"); NSLog(@"_timedOut: ignored because timeout already in progress");
} }
@ -4128,6 +4134,14 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
BOOL delay = NO; BOOL delay = NO;
inProgress = YES; inProgress = YES;
/* We only perform timeouts if the process is actually
* running (don't want them during startup before the
* thing is fully initialised.
* So if not running, skip to scheduling next timeout.
*/
if (YES == cmdIsRunning)
{
NS_DURING NS_DURING
{ {
NSCalendarDate *now = [NSCalendarDate date]; NSCalendarDate *now = [NSCalendarDate date];
@ -4198,6 +4212,7 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
delay = YES; // Avoid runaway logging. delay = YES; // Avoid runaway logging.
} }
NS_ENDHANDLER NS_ENDHANDLER
}
if (cmdPTimer == nil) if (cmdPTimer == nil)
{ {