3 files changed, 14 insertions, 6 deletions

diff --git a/bin/rt_launch.c b/bin/rt_launch.c
index 3863031..5c71d01 100644
--- a/bin/rt_launch.c
+++ b/bin/rt_launch.c
@@ -29,11 +29,12 @@ int launch(void *task_info_p) {
 }
 
 void usage(char *error) {
-        fprintf(stderr, "%s\nUsage: rt_launch [-w][-v][-p cpu][-c hrt | srt | be] wcet period program [arg1 arg2 ...]\n"
+        fprintf(stderr, "%s\nUsage: rt_launch [-w][-v][-p cpu][-c hrt | srt | be] [-m criticality] wcet period program [arg1 arg2 ...]\n"
                         "\t-w\tSynchronous release\n"
                         "\t-v\tVerbose\n"
                         "\t-p\tcpu (or initial cpu)\n"
                         "\t-c\tClass\n"
+                        "\t-m\tCriticality\n"
                         "\twcet, period in ms\n"
                         "\tprogram to be launched\n",
                         error);
@@ -41,7 +42,7 @@ void usage(char *error) {
 }
 
 
-#define OPTSTR "p:c:vw"
+#define OPTSTR "p:c:vwm:"
 
 int main(int argc, char** argv) 
 {
@@ -51,6 +52,7 @@ int main(int argc, char** argv)
         int migrate = 0;
         int cpu = 0;
         int opt;
+    crit_level_t crit;
         int verbose = 0;
         int wait = 0;
         startup_info_t info;
@@ -68,6 +70,11 @@ int main(int argc, char** argv)
                         cpu = atoi(optarg);
                         migrate = 1;
                         break;
+                case 'm':
+                        crit = str2crit(optarg);
+                        if (crit == -1)
+                                usage("Unknown criticality level.");
+                        break;
                 case 'c':
                         class = str2class(optarg);
                         if (class == -1)
@@ -107,7 +114,7 @@ int main(int argc, char** argv)
                 if (ret < 0)
                         bail_out("could not migrate to target partition");
         }
-        ret = __create_rt_task(launch, &info, cpu, wcet, period, class);
+        ret = __create_rt_task(launch, &info, cpu, crit, wcet, period, class);
 
         
         if (ret < 0)
diff --git a/include/litmus.h b/include/litmus.h
index c76f36e..632b9e1 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -84,7 +84,7 @@ typedef int (*rt_fn_t)(void*);
 
 /* These two functions configure the RT task to use enforced exe budgets */
 int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period);
-int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
+int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, crit_level_t crit, int wcet,
                      int period, task_class_t cls);
 
 /*      per-task modes */
diff --git a/src/task.c b/src/task.c
index 4d237bd..11ee3cf 100644
--- a/src/task.c
+++ b/src/task.c
@@ -40,11 +40,12 @@ int __launch_rt_task(rt_fn_t rt_prog, void *rt_arg, rt_setup_fn_t setup,
         return rt_task;
 }
 
-int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
+int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, crit_level_t crit, int wcet, int period,
                      task_class_t class)
 {
         struct rt_task params;
         params.cpu       = cpu;
+    params.crit      = crit;
         params.period    = period;
         params.exec_cost = wcet;
         params.cls       = class;
@@ -57,7 +58,7 @@ int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
 }
 
 int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period) {
-        return __create_rt_task(rt_prog, arg, cpu, wcet, period, RT_CLASS_HARD);
+        return __create_rt_task(rt_prog, arg, cpu, CRIT_LEVEL_C, wcet, period, RT_CLASS_HARD);
 }