Add support for static priority tasks.

3 files changed, 21 insertions, 10 deletions

diff --git a/bin/rtspin.c b/bin/rtspin.c
index ae76941..1244073 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -161,7 +161,7 @@ static int job(double exec_time, double program_end)
         }
 }
 
-#define OPTSTR "p:c:wlveo:f:s:"
+#define OPTSTR "p:c:wlveo:f:s:q:"
 
 int main(int argc, char** argv)
 {
@@ -169,6 +169,7 @@ int main(int argc, char** argv)
         lt_t wcet;
         lt_t period;
         double wcet_ms, period_ms;
+        unsigned int priority = 0;
         int migrate = 0;
         int cpu = 0;
         int opt;
@@ -194,6 +195,11 @@ int main(int argc, char** argv)
                         cpu = atoi(optarg);
                         migrate = 1;
                         break;
+                case 'q':
+                        priority = atoi(optarg);
+                        if (priority == 0 || priority > LITMUS_MAX_PRIORITY)
+                                usage("Invalid priority.");
+                        break;
                 case 'c':
                         class = str2class(optarg);
                         if (class == -1)
@@ -274,7 +280,7 @@ int main(int argc, char** argv)
                         bail_out("could not migrate to target partition");
         }
 
-        ret = sporadic_task_ns(wcet, period, 0, cpu, class,
+        ret = sporadic_task_ns(wcet, period, 0, cpu, priority, class,
                                want_enforcement ? PRECISE_ENFORCEMENT
                                                 : NO_ENFORCEMENT,
                                migrate);
diff --git a/include/litmus.h b/include/litmus.h
index 52435d8..c2ec40d 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -31,20 +31,22 @@ int get_rt_task_param(pid_t pid, struct rt_task* param);
 /* times are given in ms */
 int sporadic_task(
                 lt_t e, lt_t p, lt_t phase,
-                int partition, task_class_t cls,
+                int partition, unsigned int priority,
+                task_class_t cls,
                 budget_policy_t budget_policy, int set_cpu_set);
 
 /* times are given in ns */
 int sporadic_task_ns(
                 lt_t e, lt_t p, lt_t phase,
-                int cpu, task_class_t cls,
+                int cpu, unsigned int priority,
+                task_class_t cls,
                 budget_policy_t budget_policy, int set_cpu_set);
 
 /* 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, 0, RT_CLASS_SOFT, NO_ENFORCEMENT, 0)
 #define sporadic_partitioned(e, p, cpu) \
-        sporadic_task(e, p, 0, cpu, RT_CLASS_SOFT, NO_ENFORCEMENT, 1)
+        sporadic_task(e, p, 0, cpu, 0, RT_CLASS_SOFT, NO_ENFORCEMENT, 1)
 
 /* file descriptor attached shared objects support */
 typedef enum  {
diff --git a/src/litmus.c b/src/litmus.c
index d3cc6bb..d478ffc 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -42,16 +42,18 @@ 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,
+                  int cpu, unsigned int priority,
+                  task_class_t cls,
                   budget_policy_t budget_policy, int set_cpu_set)
 {
         return sporadic_task_ns(e * NS_PER_MS, p * NS_PER_MS, phase * NS_PER_MS,
-                                cpu, cls, budget_policy, set_cpu_set);
+                                cpu, priority, cls, budget_policy, set_cpu_set);
 }
 
 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)
+                     int cpu, unsigned int priority,
+                     task_class_t cls,
+                     budget_policy_t budget_policy, int set_cpu_set)
 {
         struct rt_task param;
         int ret;
@@ -67,6 +69,7 @@ int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
         param.cls       = cls;
         param.phase     = phase;
         param.budget_policy = budget_policy;
+        param.priority  = priority;
 
         if (set_cpu_set) {
                 ret = be_migrate_to(cpu);