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

thread-safety tweak

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@38202 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-11-26 08:59:50 +00:00
parent ed1effdcdc
commit 897608cdb0
2 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-11-26 Richard Frith-Macdonald <rfm@gnu.org>
* EcProcess.m: Make -cmdLastIP, -cmdLastOP (and their setters)
thread-safe.
2014-11-02 Richard Frith-Macdonald <rfm@gnu.org>
* EcProcess.h:

42
EcProcess.m
View file

@ -131,9 +131,9 @@ static NSUserDefaults *cmdDefs = nil;
static NSString *cmdDebugName = nil;
static NSMutableDictionary *cmdLogMap = nil;
static NSDate *started = nil; /* Time object was created. */
static NSDate *lastIP = nil; /* Time of last input to object. */
static NSDate *lastOP = nil; /* Time of last output by object. */
static NSDate *started = nil; /* Time object was created. */
static NSTimeInterval lastIP = 0.0; /* Time of last input to object. */
static NSTimeInterval lastOP = 0.0; /* Time of last output by object. */
static Class cDateClass = 0;
static Class dateClass = 0;
@ -1021,8 +1021,6 @@ findMode(NSDictionary* d, NSString* s)
DESTROY(errorLogger);
DESTROY(homeDir);
DESTROY(hostName);
DESTROY(lastIP);
DESTROY(lastOP);
DESTROY(noNetConfig);
DESTROY(replyBuffer);
DESTROY(servers);
@ -1363,12 +1361,20 @@ static NSString *noFiles = @"No log files to archive";
- (NSDate*) cmdLastIP
{
return lastIP;
if (0.0 == lastIP)
{
return nil;
}
return [dateClass dateWithTimeIntervalSinceReferenceDate: lastIP];
}
- (NSDate*) cmdLastOP
{
return lastOP;
if (0.0 == lastOP)
{
return nil;
}
return [dateClass dateWithTimeIntervalSinceReferenceDate: lastOP];
}
- (void) cmdLogEnd: (NSString*)name
@ -2396,20 +2402,26 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
- (void) ecHadIP: (NSDate*)when
{
if (when == nil)
if (nil == when)
{
when = [dateClass date];
lastIP = [dateClass timeIntervalSinceReferenceDate];
}
else
{
lastIP = [when timeIntervalSinceReferenceDate];
}
ASSIGN(lastIP, when);
}
- (void) ecHadOP: (NSDate*)when
{
if (when == nil)
if (nil == when)
{
when = [dateClass date];
lastOP = [dateClass timeIntervalSinceReferenceDate];
}
else
{
lastOP = [when timeIntervalSinceReferenceDate];
}
ASSIGN(lastOP, when);
}
- (NSUInteger) ecNotLeaked
@ -3340,11 +3352,11 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
{
[self cmdPrintf: @"\n%@ on %@ running since %@\n",
cmdLogName(), ecHostName(), [self ecStarted]];
if ([self cmdLastIP] != nil)
if (lastIP > 0.0)
{
[self cmdPrintf: @"Last IP at %@\n", [self cmdLastIP]];
}
if ([self cmdLastOP] != nil)
if (lastOP > 0.0)
{
[self cmdPrintf: @"Last OP at %@\n", [self cmdLastOP]];
}