diff options
Diffstat (limited to 'pm_data_analysis/pm_data_analyzer.py')
-rwxr-xr-x | pm_data_analysis/pm_data_analyzer.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pm_data_analysis/pm_data_analyzer.py b/pm_data_analysis/pm_data_analyzer.py index aeab5b6..e730383 100755 --- a/pm_data_analysis/pm_data_analyzer.py +++ b/pm_data_analysis/pm_data_analyzer.py | |||
@@ -227,10 +227,6 @@ class Analyzer(defapp.App): | |||
227 | csvbname = dname + '/pm_wss=' + conf['wss'] | 227 | csvbname = dname + '/pm_wss=' + conf['wss'] |
228 | 228 | ||
229 | for tss in sorted(self.valid_ovds_list.keys(), key=int): | 229 | for tss in sorted(self.valid_ovds_list.keys(), key=int): |
230 | if tss == 'min': | ||
231 | # do not analyze fake 'min' tss | ||
232 | continue | ||
233 | |||
234 | vohs = self.valid_ovds_list[tss] | 230 | vohs = self.valid_ovds_list[tss] |
235 | 231 | ||
236 | if self.options.verbose: | 232 | if self.options.verbose: |
@@ -310,6 +306,9 @@ class Analyzer(defapp.App): | |||
310 | print "Avg = %5.5f" % (avg_vec / self.options.cpufreq) | 306 | print "Avg = %5.5f" % (avg_vec / self.options.cpufreq) |
311 | print "Std = %5.5f" % (std_vec / self.options.cpufreq) | 307 | print "Std = %5.5f" % (std_vec / self.options.cpufreq) |
312 | 308 | ||
309 | del vector | ||
310 | del vohs | ||
311 | |||
313 | def process_datafile(self, datafile, dname, fname, conf): | 312 | def process_datafile(self, datafile, dname, fname, conf): |
314 | if self.options.verbose: | 313 | if self.options.verbose: |
315 | print "\nProcessing: " + fname | 314 | print "\nProcessing: " + fname |
@@ -347,12 +346,15 @@ class Analyzer(defapp.App): | |||
347 | # and it is also the last file of the list | 346 | # and it is also the last file of the list |
348 | self.analyze_data(dname, self.last_conf) | 347 | self.analyze_data(dname, self.last_conf) |
349 | # reinit dictionaries | 348 | # reinit dictionaries |
349 | del self.valid_ovds_list | ||
350 | del self.min_sample_tss | ||
350 | self.valid_ovds_list = {} | 351 | self.valid_ovds_list = {} |
351 | self.min_sample_tss = {} | 352 | self.min_sample_tss = {} |
352 | # analyze this file | 353 | # analyze this file |
353 | self.process_datafile(datafile, dname, fname, conf) | 354 | self.process_datafile(datafile, dname, fname, conf) |
354 | self.analyze_data(dname, conf) | 355 | self.analyze_data(dname, conf) |
355 | del self.valid_ovds_list | 356 | del self.valid_ovds_list |
357 | del self.min_sample_tss | ||
356 | else: | 358 | else: |
357 | # just the end of a list of wss files or 1 single file | 359 | # just the end of a list of wss files or 1 single file |
358 | self.process_datafile(datafile, dname, fname, conf) | 360 | self.process_datafile(datafile, dname, fname, conf) |
@@ -370,6 +372,8 @@ class Analyzer(defapp.App): | |||
370 | # analyze tss for previous wss | 372 | # analyze tss for previous wss |
371 | self.analyze_data(dname, self.last_conf) | 373 | self.analyze_data(dname, self.last_conf) |
372 | # reinit dictionary | 374 | # reinit dictionary |
375 | del self.valid_ovds_list | ||
376 | del self.min_sample_tss | ||
373 | self.valid_ovds_list = {} | 377 | self.valid_ovds_list = {} |
374 | self.min_sample_tss = {} | 378 | self.min_sample_tss = {} |
375 | 379 | ||