Minor changes in autocomputation of cap

1 files changed, 18 insertions, 17 deletions

diff --git a/pm_data_analysis/pm_data_analyzer.py b/pm_data_analysis/pm_data_analyzer.py
index cc6e0a5..ca4267a 100755
--- a/pm_data_analysis/pm_data_analyzer.py
+++ b/pm_data_analysis/pm_data_analyzer.py
@@ -67,7 +67,7 @@ defaults = {
         'read_valid': False,
         'verbose'   : False,
         'debug'     : False,
-        'cpufrequ'  : 0,
+        'cpufreq'   : 0,
         }
 
 # from Bjoern's simple-gnuplot-wrapper
@@ -104,6 +104,7 @@ class Analyzer(defapp.App):
         defapp.App.__init__(self, options, defaults, no_std_opts=True)
         self.last_conf = {}
         self.valid_ovds_list = {}
+        self.min_sample_tss = {}
         self.lsamples = {}
         if self.options.npreempt:
             self.lsamples['preemption'] = self.options.npreempt
@@ -189,18 +190,18 @@ class Analyzer(defapp.App):
                 count_sample[i[1]] = len(i[0])
 
             if self.options.autocap:
-                if 'min' in self.valid_ovds_list:
+                if self.min_sample_tss == {}:
+                    self.min_sample_tss = {
+                            'preemption':count_sample['preemption'],
+                            'onchip':count_sample['onchip'],
+                            'offchip':count_sample['offchip'],
+                            'l2cache':count_sample['l2cache']}
+                else:
                     # it is normally sufficient to check num samples for
                     # preemptions to get tss with min num samples in wss
-                    if self.valid_ovds_list['min']['preemption'] > \
+                    if self.min_sample_tss['preemption'] > \
                             count_sample['preemption']:
-                        self.valid_ovds_list['min'] = {
-                                'preemption':count_sample['preemption'],
-                                'onchip':count_sample['onchip'],
-                                'offchip':count_sample['offchip'],
-                                'l2cache':count_sample['l2cache']}
-                else:
-                    self.valid_ovds_list['min'] = {
+                        self.min_sample_tss = {
                             'preemption':count_sample['preemption'],
                             'onchip':count_sample['onchip'],
                             'offchip':count_sample['offchip'],
@@ -226,11 +227,13 @@ class Analyzer(defapp.App):
         csvbname = dname + '/pm_plugin=' + conf['plugin'] + \
                 '_dist=uni_light_wss=' + conf['wss']
 
-        for tss,vohs in self.valid_ovds_list.iteritems():
+        for tss in sorted(self.valid_ovds_list.keys(), key=int):
             if tss == 'min':
                 # do not analyze fake 'min' tss
                 continue
 
+            vohs = self.valid_ovds_list[tss]
+
             if self.options.verbose:
                 print "\n(WSS = %(0)s, TSS = %(1)s)" % {"0":conf['wss'], \
                     "1":tss}
@@ -258,7 +261,7 @@ class Analyzer(defapp.App):
                                 "1":nsamples}
                         vector = i[0][0:nsamples]
                 elif self.options.autocap: # we can also autocompute the cap
-                    nsamples = self.valid_ovds_list['min'][i[1]]
+                    nsamples = self.min_sample_tss[i[1]]
                     if self.options.verbose:
                         print "Computing %(0)s stat only on %(1)d samples" % \
                             {"0":i[1], "1":nsamples}
@@ -333,10 +336,9 @@ class Analyzer(defapp.App):
                     # this is the first file of a new set of WSS,
                     # and it is also the last file of the list
                     self.analyze_data(dname, self.last_conf)
-                    # delete previously used dictionary
-                    del self.valid_ovds_list
-                    # reinit dictionary
+                    # reinit dictionaries
                     self.valid_ovds_list = {}
+                    self.min_sample_tss = {}
                     # analyze this file
                     self.process_datafile(datafile, dname, fname, conf)
                     self.analyze_data(dname, conf)
@@ -357,10 +359,9 @@ class Analyzer(defapp.App):
                     # this is the first file of a new set of WSS,
                     # analyze tss for previous wss
                     self.analyze_data(dname, self.last_conf)
-                    # delete previously used dictionary
-                    del self.valid_ovds_list
                     # reinit dictionary
                     self.valid_ovds_list = {}
+                    self.min_sample_tss = {}
 
                 # add tss to valid ovds list for this wss
                 self.process_datafile(datafile, dname, fname, conf)