From 8e9d3399bbc1249370a4423bce3d1db9e417d952 Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Fri, 23 Oct 2020 15:56:49 -0400
Subject: Fix an argument parsing error in libextra and cleanup

---
 .gitignore   | 4 ++++
 extra.h      | 5 ++---
 run_bench.sh | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0e0db96..b7e90f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,15 +26,19 @@
 **/adpcm_dec
 **/adpcm_enc
 **/ammunition
+**/anagram
+**/audiobeam
 **/cjpeg_transupp
 **/cjpeg_wrbmp
 **/dijkstra
 **/epic
 **/fmref
+**/g723_enc
 **/gsm_dec
 **/gsm_enc
 **/h264_dec
 **/huff_enc
+**/huff_dec
 **/mpeg2
 **/ndes
 **/petrinet
diff --git a/extra.h b/extra.h
index 9f27a80..990d2e0 100644
--- a/extra.h
+++ b/extra.h
@@ -83,7 +83,7 @@ long unsigned int _rt_period;
 static void _rt_load_params_itrl(int argc, char **argv) {
 #ifdef PAIRED
     if (argc != (8 + LITMUS*2) && argc != (9 + LITMUS*2)) {
-        fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?>\n", argv[0]);
+        fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?> <pairID>\n", argv[0]);
 #else
     if (argc != (6 + LITMUS*2)) {
         fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);
@@ -120,7 +120,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     _rt_will_output = atoi(argv[7]);
     char *pairId;
     int end;
-    if (argc > 7) {
+    if (argc > 8) {
         pairId = argv[8];
         end = 9;
     } else {
@@ -218,7 +218,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     rt_param.phase = 0;
     rt_param.priority = LITMUS_LOWEST_PRIORITY;
     rt_param.cls = crit;
-    rt_param.release_policy = TASK_PERIODIC;
     rt_param.budget_policy = NO_ENFORCEMENT;
     rt_param.cpu = _rt_core;
     rt_param.release_policy = TASK_PERIODIC;
diff --git a/run_bench.sh b/run_bench.sh
index ddc6bcc..6c92fd5 100755
--- a/run_bench.sh
+++ b/run_bench.sh
@@ -363,10 +363,10 @@ for (( i = 0; i < ${#bench[@]} ; i++ )); do
                 # Synchronize between pairs - original hard real-time SMT approach
                 if [[ -v $LITMUS ]]; then
                     echo "${input[$i]}" | numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 & PID1=$!;
-                    echo "${input[$j]}" | numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 2 & PID2=$!;
+                    echo "${input[$j]}" | numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 1 & PID2=$!;
                 else
                     echo "${input[$i]}" | chrt -r 97 numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 & PID1=$!;
-                    echo "${input[$j]}" | chrt -r 97 numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 2 & PID2=$!;
+                    echo "${input[$j]}" | chrt -r 97 numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 1 & PID2=$!;
                 fi
                 # We launched them asynchronously, so we have to wait
                 wait $PID1 $PID2
-- 
cgit v1.2.2