Many bugfixes motivated by some end-to-end testing.

1 files changed, 11 insertions, 10 deletions

diff --git a/run/executable/ftcat.py b/run/executable/ftcat.py
index 5da8fa7..1f0420b 100644
--- a/run/executable/ftcat.py
+++ b/run/executable/ftcat.py
@@ -1,18 +1,15 @@
 import os
 import stat
 
-from executable import Executable
+from .executable import Executable
 
 class FTcat(Executable):
     '''Used to wrap the ftcat binary in the Experiment object.'''
 
     def __init__(self, ft_cat_bin, stdout_file, stderr_file, dev, events, cpu=None):
         '''Extends the Executable initializer method with ftcat attributes.'''
+        super(FTcat, self).__init__('/usr/bin/taskset')
 
-        # hack to run FTCat at higher priority
-        chrt_bin = '/usr/bin/chrt'
-
-        super(FTcat, self).__init__(chrt_bin)
         self.stdout_file = stdout_file
         self.stderr_file = stderr_file
 
@@ -23,11 +20,15 @@ class FTcat(Executable):
         if events is None:
             raise Exception('No events!')
 
-        # hack to run FTCat at higher priority
-        self.extra_args = ['-f', '40']
         if cpu is not None:
-            # and bind it to a CPU
-            self.extra_args.extend(['/usr/bin/taskset', '-c', str(cpu)])
+            # Execute only on the given CPU
+            self.extra_args = ['-c', str(cpu)]
+        else:
+            # Execute on any cpu
+            self.extra_args = ['0xFFFFFFFF']
+
         events_str_arr = map(str, events)
-        self.extra_args.extend([ft_cat_bin, dev] + events_str_arr)
+        ft_cat_cmd = [ft_cat_bin, dev] + list(events_str_arr)
+
+        self.extra_args.extend(ft_cat_cmd)