Merge branch 'master' of github.com:hermanjl/experiment-scripts

4 files changed, 42 insertions, 31 deletions

diff --git a/parse/sched.py b/parse/sched.py
index 1213f0d..a38c61b 100644
--- a/parse/sched.py
+++ b/parse/sched.py
@@ -2,7 +2,6 @@ import config.config as conf
 import os
 import re
 import struct
-import sys
 import subprocess
 
 from collections import defaultdict,namedtuple
@@ -27,10 +26,13 @@ class TimeTracker:
             self.begin = 0
             self.job   = 0
 
-    def start_time(self, record):
+    def start_time(self, record, time = None):
         '''Start duration of time.'''
-        self.begin = record.when
-        self.job   = record.job
+        if not time:
+            self.begin = record.when
+        else:
+            self.begin = time
+        self.job = record.job
 
 # Data stored for each task
 TaskParams = namedtuple('TaskParams',  ['wcet', 'period', 'cpu'])
@@ -92,7 +94,12 @@ def make_iterator(fname):
             continue
 
         obj = rdata.clazz(*values)
-        yield (obj, rdata.method)
+
+        if obj.job != 1:
+            yield (obj, rdata.method)
+        else:
+            # Results from the first job are nonsense
+            pass
 
 def read_data(task_dict, fnames):
     '''Read records from @fnames and store per-pid stats in @task_dict.'''
@@ -128,7 +135,8 @@ def process_completion(task_dict, record):
 def process_release(task_dict, record):
     data = task_dict[record.pid]
     data.jobs += 1
-    data.misses.start_time(record)
+    if data.params:
+        data.misses.start_time(record, record.when + data.params.period)
 
 def process_param(task_dict, record):
     params = TaskParams(record.wcet, record.period, record.partition)
@@ -143,36 +151,39 @@ def process_resume(task_dict, record):
 register_record('ResumeRecord', 9, process_resume, 'Q8x', ['when'])
 register_record('BlockRecord', 8, process_block, 'Q8x', ['when'])
 register_record('CompletionRecord', 7, process_completion, 'Q8x', ['when'])
-register_record('ReleaseRecord', 3, process_release, 'QQ', ['release', 'when'])
+register_record('ReleaseRecord', 3, process_release, 'QQ', ['when', 'release'])
 register_record('ParamRecord', 2, process_param, 'IIIcc2x',
                           ['wcet','period','phase','partition', 'task_class'])
 
-def extract_sched_data(result, data_dir, work_dir):
+def create_task_dict(data_dir, work_dir = None):
+    '''Parse sched trace files'''
     bin_files   = conf.FILES['sched_data'].format(".*")
     output_file = "%s/out-st" % work_dir
 
-    bins = ["%s/%s" % (data_dir,f) for f in os.listdir(data_dir) if re.match(bin_files, f)]
-    if not len(bins):
-        return
+    task_dict = defaultdict(lambda :
+                            TaskData(None, 1, TimeTracker(), TimeTracker()))
+
+    bin_names = [f for f in os.listdir(data_dir) if re.match(bin_files, f)]
+    if not len(bin_names):
+        return task_dict
 
     # Save an in-english version of the data for debugging
     # This is optional and will only be done if 'st_show' is in PATH
     if conf.BINS['st_show']:
         cmd_arr = [conf.BINS['st_show']]
-        cmd_arr.extend(bins)
+        cmd_arr.extend(bin_names)
         with open(output_file, "w") as f:
-            print("calling %s" % cmd_arr)
             subprocess.call(cmd_arr, cwd=data_dir, stdout=f)
 
-    task_dict = defaultdict(lambda :
-                            TaskData(0, 0, TimeTracker(), TimeTracker()))
-
     # Gather per-task values
-    read_data(task_dict, bins)
+    bin_paths = ["%s/%s" % (data_dir,f) for f in bin_names]
+    read_data(task_dict, bin_paths)
 
-    stat_data = {"avg-tard"   : [], "max-tard"  : [],
-                 "avg-block"  : [], "max-block" : [],
-                 "miss-ratio" : []}
+    return task_dict
+
+def extract_sched_data(result, data_dir, work_dir):
+    task_dict = create_task_dict(data_dir, work_dir)
+    stat_data = defaultdict(list)
 
     # Group per-task values
     for tdata in task_dict.itervalues():
@@ -181,18 +192,18 @@ def extract_sched_data(result, data_dir, work_dir):
             continue
 
         miss_ratio = float(tdata.misses.num) / tdata.jobs
+        stat_data["miss-ratio"].append(float(tdata.misses.num) / tdata.jobs)
+
+        stat_data["max-tard"  ].append(tdata.misses.max / tdata.params.wcet)
         # Scale average down to account for jobs with 0 tardiness
         avg_tard = tdata.misses.avg * miss_ratio
-
-        stat_data["miss-ratio"].append(miss_ratio)
         stat_data["avg-tard"  ].append(avg_tard / tdata.params.wcet)
-        stat_data["max-tard"  ].append(tdata.misses.max / tdata.params.wcet)
+
         stat_data["avg-block" ].append(tdata.blocks.avg / NSEC_PER_MSEC)
         stat_data["max-block" ].append(tdata.blocks.max / NSEC_PER_MSEC)
 
     # Summarize value groups
     for name, data in stat_data.iteritems():
-        if not data:
+        if not data or not sum(data):
             continue
         result[name] = Measurement(str(name)).from_array(data)
-
diff --git a/run/executable/executable.py b/run/executable/executable.py
index 263e305..e6f2003 100644
--- a/run/executable/executable.py
+++ b/run/executable/executable.py
@@ -6,9 +6,10 @@ from common import get_executable
 class Executable(object):
     '''Parent object that represents an executable for use in task-sets.'''
 
-    def __init__(self, exec_file, extra_args=None, stdout_file = None, stderr_file = None):
+    def __init__(self, exec_file, extra_args=None, stdout_file = None,
+                 stderr_file = None, cwd = None):
         self.exec_file = get_executable(exec_file)
-        self.cwd = None
+        self.cwd = cwd
         self.stdout_file = stdout_file
         self.stderr_file = stderr_file
         self.sp = None
diff --git a/run/tracer.py b/run/tracer.py
index 6e1d05c..5e92a74 100644
--- a/run/tracer.py
+++ b/run/tracer.py
@@ -38,8 +38,8 @@ class LinuxTracer(Tracer):
         stdout = open('%s/trace-cmd-stdout.txt' % self.output_dir, 'w')
         stderr = open('%s/trace-cmd-stderr.txt' % self.output_dir, 'w')
 
-        execute = Executable(conf.BINS['trace-cmd'], extra_args, stdout, stderr)
-        execute.cwd = output_dir
+        execute = Executable(conf.BINS['trace-cmd'], extra_args,
+                             stdout, stderr, output_dir)
         self.bins.append(execute)
 
     @staticmethod
diff --git a/run_exps.py b/run_exps.py
index 6531415..905d033 100755
--- a/run_exps.py
+++ b/run_exps.py
@@ -197,9 +197,8 @@ def run_parameter(exp_dir, out_dir, params, param_name):
     script = com.get_executable(script_name, cwd=exp_dir)
 
     out  = open('%s/%s-out.txt' % (out_dir, param_name), 'w')
-    prog = Executable(script, script_params,
+    prog = Executable(script, script_params, cwd=out_dir,
                       stderr_file=out, stdout_file=out)
-    prog.cwd = out_dir
 
     prog.execute()
     prog.wait()