Code cleanup and bugfixes for infrastructure code

- Remove unused parameters to extra.h
- Use floats to avoid integer overflow when timing long loops
- Only include litmus headers and/or MMDC headers if the appropriate
  define is set in extra.h
- Update job parameters to match those used in my PRP experiments

1 files changed, 6 insertions, 1 deletions

diff --git a/baseline/run_baseline.sh b/baseline/run_baseline.sh
index 7fdc2aa..f7a98fa 100755
--- a/baseline/run_baseline.sh
+++ b/baseline/run_baseline.sh
@@ -49,7 +49,12 @@ done < $tacleNames
 num_tests=$(wc -l < $tacleNames)
 for (( i = 0; i < $num_tests ; i++ ))
 do
-    chrt -r 97 taskset -c $core ./bin/${tacleProg[$i]} ${tacleProg[$i]} $maxJobs $core none none $runID 1 none
+    # Check if we're using LITMUS^RT or not
+    if grep -q "#define LITMUS 1" source/extra.h; then
+        ./bin/${tacleProg[$i]} ${tacleProg[$i]} $maxJobs $core $runID 1
+    else
+        chrt -r 97 taskset -c $core ./bin/${tacleProg[$i]} ${tacleProg[$i]} $maxJobs $core $runID 1
+    fi
     echo COMPLETE: ${tacleProg[$i]}
 done