Added crit

5 files changed, 51 insertions, 16 deletions

diff --git a/bin/rt_launch.c b/bin/rt_launch.c
index 3863031..bb6668f 100644
--- a/bin/rt_launch.c
+++ b/bin/rt_launch.c
@@ -41,7 +41,7 @@ void usage(char *error) {
 }
 
 
-#define OPTSTR "p:c:vw"
+#define OPTSTR "p:c:vwm:"
 
 int main(int argc, char** argv) 
 {
@@ -50,6 +50,7 @@ int main(int argc, char** argv)
         lt_t period;
         int migrate = 0;
         int cpu = 0;
+        int crit = CRIT_LEVEL_B;
         int opt;
         int verbose = 0;
         int wait = 0;
@@ -73,6 +74,11 @@ int main(int argc, char** argv)
                         if (class == -1)
                                 usage("Unknown task class.");
                         break;
+                case 'm':
+                        crit = str2crit(optarg);
+                        if (crit == -1)
+                                usage("Unknown criticality level.");
+                        break;
 
                 case ':':
                         usage("Argument missing.");
@@ -107,7 +113,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, wcet, period, class, crit);
 
         
         if (ret < 0)
diff --git a/bin/rtspin.c b/bin/rtspin.c
index 01855ab..5c5d8aa 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -152,7 +152,7 @@ static int job(double exec_time, double program_end)
         }
 }
 
-#define OPTSTR "p:c:wld:veo:f:s:"
+#define OPTSTR "p:c:wld:veo:f:s:m:"
 
 int main(int argc, char** argv)
 {
@@ -163,6 +163,7 @@ int main(int argc, char** argv)
         int migrate = 0;
         int cpu = 0;
         int opt;
+        int crit = CRIT_LEVEL_B;
         int wait = 0;
         int column = 1;
         const char *file = NULL;
@@ -187,6 +188,11 @@ int main(int argc, char** argv)
                         if (class == -1)
                                 usage("Unknown task class.");
                         break;
+                case 'm':
+                        crit = str2crit(optarg);
+                        if (crit == -1)
+                                usage("Unknown criticality level.");
+                        break;
                 case 'e':
                         want_enforcement = 1;
                         break;
@@ -257,7 +263,7 @@ int main(int argc, char** argv)
         ret = sporadic_task_ns(wcet, period, 0, cpu, class,
                                want_enforcement ? PRECISE_ENFORCEMENT
                                                 : NO_ENFORCEMENT,
-                               migrate);
+                               migrate, crit);
         if (ret < 0)
                 bail_out("could not setup rt task params");
 
diff --git a/include/litmus.h b/include/litmus.h
index 2a26a4a..bf72f0c 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -32,19 +32,21 @@ int get_rt_task_param(pid_t pid, struct rt_task* param);
 int sporadic_task(
                 lt_t e, lt_t p, lt_t phase,
                 int partition, task_class_t cls,
-                budget_policy_t budget_policy, int set_cpu_set);
+                budget_policy_t budget_policy, int set_cpu_set, int crit);
 
 /* times are given in ns */
 int sporadic_task_ns(
                 lt_t e, lt_t p, lt_t phase,
                 int cpu, task_class_t cls,
-                budget_policy_t budget_policy, int set_cpu_set);
+                budget_policy_t budget_policy, int set_cpu_set, int crit);
 
 /* budget enforcement off by default in these macros */
 #define sporadic_global(e, p) \
-        sporadic_task(e, p, 0, 0, RT_CLASS_SOFT, NO_ENFORCEMENT, 0)
+        sporadic_task(e, p, 0, 0, RT_CLASS_SOFT, NO_ENFORCEMENT, 0, \
+        CRIT_LEVEL_B)
 #define sporadic_partitioned(e, p, cpu) \
-        sporadic_task(e, p, 0, cpu, RT_CLASS_SOFT, NO_ENFORCEMENT, 1)
+        sporadic_task(e, p, 0, cpu, RT_CLASS_SOFT, NO_ENFORCEMENT, 1 \
+        CRIT_LEVEL_B)
 
 /* file descriptor attached shared objects support */
 typedef enum  {
@@ -82,9 +84,10 @@ void exit_litmus(void);
 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 period,
+                        int crit);
 int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
-                     int period, task_class_t cls);
+                     int period, task_class_t cls, int crit);
 
 /*      per-task modes */
 enum rt_task_mode_t {
@@ -95,6 +98,7 @@ int task_mode(int target_mode);
 
 void show_rt_param(struct rt_task* tp);
 task_class_t str2class(const char* str);
+crit_level_t str2crit(const char* str);
 
 /* non-preemptive section support */
 void enter_np(void);
diff --git a/src/litmus.c b/src/litmus.c
index d3cc6bb..ad795a8 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -29,6 +29,20 @@ task_class_t str2class(const char* str)
                 return -1;
 }
 
+crit_level_t str2crit(const char* str)
+{
+        if      (!strcmp(str, "a") || !strcmp(str, "A"))
+                return CRIT_LEVEL_A;
+        else if (!strcmp(str, "b") || !strcmp(str,"B"))
+                return CRIT_LEVEL_B;
+        else if (!strcmp(str, "c") || !strcmp(str,"C"))
+                return CRIT_LEVEL_C;
+        else if (!strcmp(str, "d") || !strcmp(str,"D"))
+                return CRIT_LEVEL_D;
+        else
+                return -1;
+}
+
 #define NS_PER_MS 1000000
 
 /* only for best-effort execution: migrate to target_cpu */
@@ -43,15 +57,16 @@ int be_migrate_to(int target_cpu)
 
 int sporadic_task(lt_t e, lt_t p, lt_t phase,
                   int cpu, task_class_t cls,
-                  budget_policy_t budget_policy, int set_cpu_set)
+                  budget_policy_t budget_policy, int set_cpu_set, int crit)
 {
         return sporadic_task_ns(e * NS_PER_MS, p * NS_PER_MS, phase * NS_PER_MS,
-                                cpu, cls, budget_policy, set_cpu_set);
+                                cpu, cls, budget_policy, set_cpu_set, crit);
 }
 
 int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
                         int cpu, task_class_t cls,
-                        budget_policy_t budget_policy, int set_cpu_set)
+                        budget_policy_t budget_policy, int set_cpu_set,
+                        int crit)
 {
         struct rt_task param;
         int ret;
@@ -64,6 +79,7 @@ int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
         param.exec_cost = e;
         param.period    = p;
         param.cpu       = cpu;
+        param.crit      = crit;
         param.cls       = cls;
         param.phase     = phase;
         param.budget_policy = budget_policy;
diff --git a/src/task.c b/src/task.c
index 4d237bd..4a8c10c 100644
--- a/src/task.c
+++ b/src/task.c
@@ -41,13 +41,14 @@ int __launch_rt_task(rt_fn_t rt_prog, void *rt_arg, rt_setup_fn_t setup,
 }
 
 int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
-                     task_class_t class)
+                     task_class_t class, int crit)
 {
         struct rt_task params;
         params.cpu       = cpu;
         params.period    = period;
         params.exec_cost = wcet;
         params.cls       = class;
+        params.crit      = crit;
         params.phase     = 0;
         /* enforce budget for tasks that might not use sleep_next_period() */
         params.budget_policy = QUANTUM_ENFORCEMENT;
@@ -56,8 +57,10 @@ int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
                                 (rt_setup_fn_t) set_rt_task_param, &params);
 }
 
-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);
+int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
+                                        int crit) {
+        return __create_rt_task(rt_prog, arg, cpu, wcet, period, RT_CLASS_HARD,
+                crit);
 }