Add level-A mixed criticality ID parameter.

1 files changed, 9 insertions, 8 deletions

diff --git a/bin/rtspin.c b/bin/rtspin.c
index c5a2600..728afb5 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -24,7 +24,7 @@ static void usage(char *error) {
                 "       rt_spin -l\n"
                 "\n"
                 "COMMON-OPTS = [-w] [-p PARTITION] [-c CLASS] [-s SCALE]\n"
-                "              [-r CRITICALITY = [a|b|c|d]]\n"
+                "              [-r CRITICALITY = [a|b|c|d]] [-i MC-LVL-A-ID]\n"
                 "\n"
                 "WCET and PERIOD are milliseconds, DURATION is seconds.\n");
         exit(EXIT_FAILURE);
@@ -179,7 +179,7 @@ enum crit_level str2crit(const char* str)
         return NUM_CRIT_LEVELS;
 }
 
-#define OPTSTR "p:c:wlveo:f:s:r:"
+#define OPTSTR "p:c:wlveo:f:s:r:i:"
 
 int main(int argc, char** argv)
 {
@@ -200,8 +200,7 @@ int main(int argc, char** argv)
         double scale = 1.0;
         task_class_t class = RT_CLASS_HARD;
         int cur_job, num_jobs;
-        enum crit_level crit = NUM_CRIT_LEVELS;
-        struct mc_task mc_task;
+        struct mc_task mc_task = { .crit = NUM_CRIT_LEVELS, .lvl_a_id = -1 };
 
         progname = argv[0];
 
@@ -235,10 +234,13 @@ int main(int argc, char** argv)
                         scale = atof(optarg);
                         break;
                 case 'r':
-                        crit = str2crit(optarg);
-                        if (NUM_CRIT_LEVELS == crit)
+                        mc_task.crit = str2crit(optarg);
+                        if (NUM_CRIT_LEVELS == mc_task.crit)
                                 usage("Bad crit level.");
                         break;
+                case 'i':
+                        mc_task.lvl_a_id = atoi(optarg);
+                        break;
                 case ':':
                         usage("Argument missing.");
                         break;
@@ -306,9 +308,8 @@ int main(int argc, char** argv)
         if (ret < 0)
                 bail_out("could not setup rt task params");
 
-        if (NUM_CRIT_LEVELS != crit)
+        if (NUM_CRIT_LEVELS != mc_task.crit)
         {
-                mc_task.crit = crit;
                 ret = set_rt_task_mc_param(gettid(), &mc_task);
                 if (ret < 0)
                         bail_out("could not setup rt mixed criticality params");