Removed dependency on overhead-analysis repo.

2 files changed, 15 insertions, 1 deletions

diff --git a/experiment/experiment.py b/experiment/experiment.py
index 8c88799..deb4ff2 100644
--- a/experiment/experiment.py
+++ b/experiment/experiment.py
@@ -178,7 +178,8 @@ class Experiment(object):
         self.log("Writing %d proc entries" % len(self.proc_entries))
         map(methodcaller('write_proc'), self.proc_entries)
 
-        time.sleep(5)
+        if len(self.proc_entries):
+            time.sleep(2)
 
         self.log("Switching to %s" % self.scheduler)
         litmus_util.switch_scheduler(self.scheduler)
diff --git a/experiment/litmus_util.py b/experiment/litmus_util.py
index cde0bca..42d3e5f 100644
--- a/experiment/litmus_util.py
+++ b/experiment/litmus_util.py
@@ -17,6 +17,19 @@ def num_cpus():
                 cpus += 1
     return cpus
 
+def cpu_freq():
+    """
+    The frequency (in MHz) of the CPU.
+    """
+    reg = re.compile(r'^cpu MHz\s*:\s*(\d+)', re.M)
+    with open('/proc/cpuinfo', 'r') as f:
+        data = f.read()
+
+    match = re.search(reg, data)
+    if not match:
+        raise Exception("Cannot parse CPU frequency!")
+    return int(match.group(1))
+
 def switch_scheduler(switch_to_in):
     """Switch the scheduler to whatever is passed in.