4 files changed, 20 insertions, 14 deletions

diff --git a/include/pm_common.h b/include/pm_common.h
index ac11345..f2fcb87 100644
--- a/include/pm_common.h
+++ b/include/pm_common.h
@@ -121,7 +121,8 @@ int serialize_data_entry(char *filename, struct data_entry *samples, int num);
 int read_sdata_entry(const char *filename, struct saved_data_entry **samples);
 
 /* get valid overhead from trace file */
-int get_valid_ovd(const char *filename, struct full_ovd_plen **full_costs);
+int get_valid_ovd(const char *filename, struct full_ovd_plen **full_costs,
+                int wss, int tss);
 
 /* get ovd and pm length for different cores configurations (on uma xeon) */
 void get_ovd_plen_umaxeon(struct full_ovd_plen *full_costs, int num_samples,
diff --git a/pm_data_analysis/pm_data_analyzer.py b/pm_data_analysis/pm_data_analyzer.py
index 02c5098..f6730de 100755
--- a/pm_data_analysis/pm_data_analyzer.py
+++ b/pm_data_analysis/pm_data_analyzer.py
@@ -133,11 +133,11 @@ class Analyzer(defapp.App):
                 print "Reading '%s'" % nf
             self.valid_ovds.add(pms.unpickl_it(nf), 'l2cache')
 
-    def process_raw_data(self, datafile):
+    def process_raw_data(self, datafile, conf):
         coresL2 = self.options.coresL2
         pcpu = self.options.pcpu
         # initialize pmmodule
-        pm.load(datafile, coresL2, pcpu)
+        pm.load(datafile, coresL2, pcpu, int(conf['wss']), int(conf['tss']))
         ovds = Overhead()
         # get overheads
         ovds.add(pm.getPreemption(), 'preemption')
@@ -273,7 +273,7 @@ class Analyzer(defapp.App):
             readf = dname + '/' + fname
             self.read_valid_data(readf)
         else:
-            self.process_raw_data(datafile)
+            self.process_raw_data(datafile, conf)
 
         self.analyze_data(dname, conf)
         del self.valid_ovds
diff --git a/pm_test/pm_common.c b/pm_test/pm_common.c
index a612b20..04bb756 100644
--- a/pm_test/pm_common.c
+++ b/pm_test/pm_common.c
@@ -179,7 +179,8 @@ int read_sdata_entry(const char *filename, struct saved_data_entry **samples)
  * samples is the size of the population
  * cpufreq is in MHz
  */
-void print_rough_stats(unsigned long long *vector, int samples, double cpufreq)
+void print_rough_stats(unsigned long long *vector, int samples, double cpufreq,
+                int wss, int tss)
 {
         unsigned long long min, max;
         long double mi, qi, num_diff;
@@ -211,8 +212,9 @@ void print_rough_stats(unsigned long long *vector, int samples, double cpufreq)
         fprintf(stderr, "max = %llu\nmin = %llu\nmean = %Lf\nstddev = %Lf\n",
                 max, min, mi, sqrtl(qi / (samples - 2)));
         */
-         fprintf(stderr, "# max, min, avg, stddev\n");
-         fprintf(stderr, "%.5f, %.5f,  %.5Lf,  %.5Lf\n",
+         fprintf(stderr, "# wss, tss, max, min, avg, stddev\n");
+         fprintf(stderr, "%d, %d, %.5f, %.5f,  %.5Lf,  %.5Lf\n",
+                wss, tss,
                 max / cpufreq, min / cpufreq, mi / cpufreq,
                 sqrtl(qi / (samples - 2)) / cpufreq);
 }
@@ -235,7 +237,8 @@ void print_rough_stats(unsigned long long *vector, int samples, double cpufreq)
  *              output array.)
  *              If error return < 0
  */
-int get_valid_ovd(const char *filename, struct full_ovd_plen **full_costs)
+int get_valid_ovd(const char *filename, struct full_ovd_plen **full_costs,
+                int wss, int tss)
 {
         struct saved_data_entry *samples;
         /* total number of samples */
@@ -411,11 +414,11 @@ int get_valid_ovd(const char *filename, struct full_ovd_plen **full_costs)
         dprintf("End of valid entries\n");
 #ifdef WANT_STATISTICS
         fprintf(stderr, "# Cold cache\n");
-        print_rough_stats(valid_c_samples, c_count, CFREQ);
+        print_rough_stats(valid_c_samples, c_count, CFREQ, wss, tss);
         fprintf(stderr, "# Hot cache\n");
-        print_rough_stats(valid_h_samples, h_count, CFREQ);
+        print_rough_stats(valid_h_samples, h_count, CFREQ, wss, tss);
         fprintf(stderr, "# After preemption\n");
-        print_rough_stats(valid_p_samples, p_count, CFREQ);
+        print_rough_stats(valid_p_samples, p_count, CFREQ, wss, tss);
 
         free(valid_p_samples);
         free(valid_h_samples);
diff --git a/pm_test/pmmodule.c b/pm_test/pmmodule.c
index 12c42c7..82aecb9 100644
--- a/pm_test/pmmodule.c
+++ b/pm_test/pmmodule.c
@@ -59,16 +59,18 @@ static PyObject* pm_load(PyObject *self, PyObject *args)
         const char *filename;
         unsigned int cores_per_l2;
         unsigned int num_phys_cpu;
+        int wss;
+        int tss;
 
         struct full_ovd_plen *full_costs = NULL;
         int num_samples;
 
-        if (!PyArg_ParseTuple(args, "sII", &filename, &cores_per_l2,
-                                &num_phys_cpu))
+        if (!PyArg_ParseTuple(args, "sIIii", &filename, &cores_per_l2,
+                                &num_phys_cpu, &wss, &tss))
                 return NULL;
 
         /* get valid overheads from raw file */
-        if ((num_samples = get_valid_ovd(filename, &full_costs)) < 0)
+        if ((num_samples = get_valid_ovd(filename, &full_costs, wss, tss)) < 0)
                 goto err;
 
         if ((preempt = malloc(num_samples * sizeof(struct ovd_plen))) < 0)