Use smarter defaults which can handle data from Bjorns scripts.

3 files changed, 6 insertions, 56 deletions

diff --git a/run/executable/executable.py b/run/executable/executable.py
index 0a408b7..02e35ae 100644
--- a/run/executable/executable.py
+++ b/run/executable/executable.py
@@ -1,7 +1,7 @@
 import sys
 import subprocess
 import signal
-from ..litmus_util import is_executable
+from common import is_executable
 
 class Executable(object):
     '''Parent object that represents an executable for use in task-sets.'''
diff --git a/run/litmus_util.py b/run/litmus_util.py
index 8a7f87d..b9080c1 100644
--- a/run/litmus_util.py
+++ b/run/litmus_util.py
@@ -1,43 +1,8 @@
 import re
 import time
 import subprocess
-import os
-import stat
 import config.config as conf
 
-def num_cpus():
-    '''Return the number of CPUs in the system.'''
-
-    lnx_re = re.compile(r'^(processor|online)')
-    cpus = 0
-
-    with open('/proc/cpuinfo', 'r') as f:
-        for line in f:
-            if lnx_re.match(line):
-                cpus += 1
-    return cpus
-
-def ft_freq():
-    umachine = subprocess.check_output(["uname", "-m"])
-
-    if re.match("armv7", umachine):
-        # Arm V7s use a millisecond timer
-        freq = 1000.0
-    elif re.match("x86", umachine):
-        # X86 timer is equal to processor clock
-        reg = re.compile(r'^cpu MHz\s*:\s*(?P<FREQ>\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 from x86 CPU!")
-        freq = int(match.group('FREQ'))
-    else:
-        # You're on your own
-        freq = 0
-    return freq
-
 def switch_scheduler(switch_to_in):
     '''Switch the scheduler to whatever is passed in.
 
@@ -60,21 +25,6 @@ def switch_scheduler(switch_to_in):
     if switch_to != cur_plugin:
         raise Exception("Could not switch to plugin: %s" % switch_to)
 
-def uname_matches(reg):
-    data = subprocess.check_output(["uname", "-r"])
-    return bool( re.match(reg, data) )
-
-def is_executable(fname):
-    '''Return whether the file passed in is executable'''
-    mode = os.stat(fname)[stat.ST_MODE]
-    return mode & stat.S_IXUSR and mode & stat.S_IRUSR
-
-def is_device(dev):
-    if not os.path.exists(dev):
-        return False
-    mode = os.stat(dev)[stat.ST_MODE]
-    return not (not mode & stat.S_IFCHR)
-
 def waiting_tasks():
     reg = re.compile(r'^ready.*?(?P<READY>\d+)$', re.M)
     with open('/proc/litmus/stats', 'r') as f:
diff --git a/run/tracer.py b/run/tracer.py
index 303aae0..065797c 100644
--- a/run/tracer.py
+++ b/run/tracer.py
@@ -1,7 +1,7 @@
-from . import litmus_util
 import os
 import config.config as conf
 
+from common import is_device,num_cpus
 from operator import methodcaller
 from run.executable.ftcat import FTcat,Executable
 
@@ -58,7 +58,7 @@ class LogTracer(Tracer):
 
     @staticmethod
     def enabled():
-        return litmus_util.is_device(LogTracer.DEVICE_STR)
+        return is_device(LogTracer.DEVICE_STR)
 
     def stop_tracing(self):
         map(methodcaller('interrupt'), self.bins)
@@ -71,7 +71,7 @@ class SchedTracer(Tracer):
         super(SchedTracer, self).__init__("Sched Trace", output_dir)
 
         if SchedTracer.enabled():
-            for cpu in range(litmus_util.num_cpus()):
+            for cpu in range(num_cpus()):
                 # Executable will close the stdout/stderr files
                 stdout_f = open('%s/st-%d.bin' % (self.output_dir, cpu), 'w')
                 stderr_f = open('%s/st-%d-stderr.txt' % (self.output_dir, cpu), 'w')
@@ -83,7 +83,7 @@ class SchedTracer(Tracer):
 
     @staticmethod
     def enabled():
-        return litmus_util.is_device("%s%d" % (SchedTracer.DEVICE_STR, 0))
+        return is_device("%s%d" % (SchedTracer.DEVICE_STR, 0))
 
 class OverheadTracer(Tracer):
     DEVICE_STR = '/dev/litmus/ft_trace0'
@@ -100,7 +100,7 @@ class OverheadTracer(Tracer):
 
     @staticmethod
     def enabled():
-        return litmus_util.is_device(OverheadTracer.DEVICE_STR)
+        return is_device(OverheadTracer.DEVICE_STR)
 
 class PerfTracer(Tracer):
     def __init__(self, output_dir):