|
@@ -158,6 +158,7 @@ class LogParser:
|
|
|
self.startre = re.compile('Starting simulation .*?\/([A-Z]+)_([A-Z]+)_([\d\.]+)_')
|
|
|
self.statperbwre = re.compile('(Relays\(N?F?B\)).*bytes=([\d\.]+)( .pm ([\d\.]+))?.*bytesperbw=([\d\.]+)( .pm ([\d\.]+))?.*N=(\d+)')
|
|
|
self.statre = re.compile('(Dirauths|Relays|Clients(\(N?B\))?).*bytes=([\d\.]+)( .pm ([\d\.]+))?.*N=(\d+)')
|
|
|
+ self.mibre = re.compile('MiB used')
|
|
|
|
|
|
def parse_line(self, line):
|
|
|
m = self.startre.search(line)
|
|
@@ -184,6 +185,10 @@ class LogParser:
|
|
|
m.group(1,3,5,6)
|
|
|
meanperbws, stddevperbws = None, None
|
|
|
else:
|
|
|
+ m = self.mibre.search(line)
|
|
|
+ if m:
|
|
|
+ # We've reached steady state
|
|
|
+ self.steadystate = True
|
|
|
return
|
|
|
|
|
|
mean = float(means)
|
|
@@ -229,8 +234,6 @@ class LogParser:
|
|
|
self.curbundle.client_boot(mean, stddev, N)
|
|
|
elif enttype == 'Clients(NB)':
|
|
|
self.curbundle.client_nboot(mean, stddev, N)
|
|
|
- # Now we've reached steady state
|
|
|
- self.steadystate = True
|
|
|
else:
|
|
|
raise ValueError('Unknown entity type "%s"' % enttype)
|
|
|
|