rtspin: streamline "read exec. times from CSV" option (was -F -C, now only -C)

Specify a single argument of the form -C FILE[:COLUMN] instead of -F
FILE -C COLUMN.

3 files changed, 34 insertions, 18 deletions

diff --git a/bin/common.c b/bin/common.c
index b614077..3749b87 100644
--- a/bin/common.c
+++ b/bin/common.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <string.h>
 #include <errno.h>
 
 #include "common.h"
@@ -35,3 +36,13 @@ double str2double(const char* arg, int *failure_flag)
                 *failure_flag = *arg == '\0' || *end != '\0';
         return val;
 }
+
+char* strsplit(char split_char, char *str)
+{
+        char *found = strrchr(str, split_char);
+        if (found) {
+                /* terminate first string and move to next char */
+                *found++ = '\0';
+        }
+        return found;
+}
diff --git a/bin/rtspin.c b/bin/rtspin.c
index d7cb7b0..13d6626 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -18,7 +18,7 @@
 const char *usage_msg =
         "Usage: (1) rtspin OPTIONS WCET PERIOD DURATION\n"
         "       (2) rtspin -S [INPUT] WCET PERIOD DURATION\n"
-        "       (3) rtspin OPTIONS -F FILE [-C COLUMN] WCET PERIOD [DURATION]\n"
+        "       (3) rtspin OPTIONS -C FILE:COLUMN WCET PERIOD [DURATION]\n"
         "       (4) rtspin -l\n"
         "       (5) rtspin -B -m FOOTPRINT\n"
         "\n"
@@ -27,7 +27,7 @@ const char *usage_msg =
         "           using INPUT as a file from which events are received\n"
         "           by means of blocking reads (default: read from STDIN)\n"
         "       (3) as (1) or (2), but load per-job execution times from\n"
-        "           a CSV file\n"
+        "           the given column of a CSV file\n"
         "       (4) Run calibration loop (how accurately are target\n"
         "           runtimes met?)\n"
         "       (5) Run background, non-real-time cache-thrashing loop.\n"
@@ -56,8 +56,9 @@ const char *usage_msg =
         "    -v                verbose (print per-job statistics)\n"
         "    -w                wait for synchronous release\n"
         "\n"
-        "    -F FILE           load per-job execution times from CSV file\n"
-        "    -C COLUMN         specify column to read per-job execution times from (default: 1)\n"
+        "    -C FILE[:COLUMN]  load per-job execution times from CSV file;\n"
+        "                      if COLUMN is given, it specifies the column to read\n"
+        "                      per-job execution times from (default: 1)\n"
         "\n"
         "    -S[FILE]          read from FILE to trigger sporadic job releases\n"
         "                      default w/o -S: periodic job releases\n"
@@ -326,7 +327,7 @@ static void job(double exec_time, double program_end, int lock_od, double cs_len
         }
 }
 
-#define OPTSTR "p:c:wlveo:F:s:m:q:r:X:L:Q:iRu:U:Bhd:C:S::O::TD:E:"
+#define OPTSTR "p:c:wlveo:s:m:q:r:X:L:Q:iRu:U:Bhd:C:S::O::TD:E:"
 
 int main(int argc, char** argv)
 {
@@ -349,7 +350,7 @@ int main(int argc, char** argv)
         int test_loop = 0;
         int background_loop = 0;
         int column = 1;
-        const char *file = NULL;
+        const char *cost_csv_file = NULL;
         int want_enforcement = 0;
         double duration = 0, start = 0;
         double *exec_times = NULL;
@@ -358,6 +359,8 @@ int main(int argc, char** argv)
         int cur_job = 0, num_jobs = 0;
         struct rt_task param;
 
+        char *after_colon;
+
         int rss = 0;
         int idx;
 
@@ -420,10 +423,11 @@ int main(int argc, char** argv)
                         background_loop = 1;
                         break;
                 case 'C':
-                        column = want_non_negative_int(optarg, "-C");
-                        break;
-                case 'F':
-                        file = optarg;
+                        after_colon = strsplit(':', optarg);
+                        cost_csv_file = optarg;
+                        if (after_colon) {
+                                column = want_non_negative_int(after_colon, "-C");
+                        }
                         break;
                 case 'S':
                         sporadic = 1;
@@ -555,7 +559,7 @@ int main(int argc, char** argv)
                 return 0;
         }
 
-        if (argc - optind < 3 || (argc - optind < 2 && !file))
+        if (argc - optind < 3 || (argc - optind < 2 && !cost_csv_file))
                 usage("Arguments missing.");
 
         wcet_ms   = want_positive_double(argv[optind + 0], "WCET");
@@ -574,15 +578,15 @@ int main(int argc, char** argv)
 
         if (period <= 0)
                 usage("The period must be a positive number.");
-        if (!file && wcet > period) {
+        if (!cost_csv_file && wcet > period) {
                 usage("The worst-case execution time must not "
                                 "exceed the period.");
         }
 
-        if (file)
-                get_exec_times(file, column, &num_jobs, &exec_times);
+        if (cost_csv_file)
+                get_exec_times(cost_csv_file, column, &num_jobs, &exec_times);
 
-        if (argc - optind < 3 && file)
+        if (argc - optind < 3 && cost_csv_file)
                 /* If duration is not given explicitly,
                  * take duration from file. */
                 duration = num_jobs * period_ms * 0.001;
@@ -731,9 +735,8 @@ int main(int argc, char** argv)
                 }
 
                 /* figure out for how long this job should use the CPU */
-                cur_job++;
 
-                if (file) {
+                if (cost_csv_file) {
                         /* read from provided CSV file and convert to seconds */
                         acet = exec_times[cur_job % num_jobs] * 0.001;
                 } else {
@@ -793,13 +796,14 @@ int main(int argc, char** argv)
                                 sleep_next_period();
                         }
                 }
+                cur_job++;
         }
 
         ret = task_mode(BACKGROUND_TASK);
         if (ret != 0)
                 bail_out("could not become regular task (huh?)");
 
-        if (file)
+        if (cost_csv_file)
                 free(exec_times);
 
         if (base != MAP_FAILED)
diff --git a/include/common.h b/include/common.h
index 216f01c..e936878 100644
--- a/include/common.h
+++ b/include/common.h
@@ -62,5 +62,6 @@ double str2double(const char* arg, int *failure_flag);
                 usage("option " name " requires a positive argument"); \
         __val; })
 
+char* strsplit(char split_char, char *str);
 
 #endif