Cluster-aware rtspin and rt_launch.

This patch adds cluster scheduling options to
rtspin and rt_launch. The convenience routines
in litmus.h were also updated to facilitate
clustered scheduling. For partitioned scheduling,
just set cluster_size = 1 (default size for rtspin
and rt_launch).

2 files changed, 17 insertions, 14 deletions

diff --git a/src/litmus.c b/src/litmus.c
index b774c63..1110bd4 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -92,18 +92,19 @@ task_class_t str2class(const char* str)
 #define NS_PER_MS 1000000
 
 int sporadic_task(lt_t e, lt_t p, lt_t phase,
-                  int cpu, unsigned int priority,
+                  int cluster, int cluster_size, 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, priority, cls, budget_policy, set_cpu_set);
+                                cluster, cluster_size, priority, cls,
+                                budget_policy, set_cpu_set);
 }
 
 int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
-                     int cpu, unsigned int priority,
+                     int cluster, int cluster_size, unsigned int priority,
                      task_class_t cls,
-                     budget_policy_t budget_policy, int set_cpu_set)
+                     budget_policy_t budget_policy, int migrate)
 {
         struct rt_task param;
         int ret;
@@ -116,15 +117,15 @@ int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
         param.exec_cost = e;
         param.period    = p;
         param.relative_deadline = p; /* implicit deadline */
-        param.cpu       = cpu;
+        param.cpu       = cluster_to_first_cpu(cluster, cluster_size);
         param.cls       = cls;
         param.phase     = phase;
         param.budget_policy = budget_policy;
         param.priority  = priority;
 
-        if (set_cpu_set) {
-                ret = be_migrate_to_cpu(cpu);
-                check("migrate to cpu");
+        if (migrate) {
+                ret = be_migrate_to_cluster(cluster, cluster_size);
+                check("migrate to cluster");
         }
         return set_rt_task_param(gettid(), &param);
 }
diff --git a/src/task.c b/src/task.c
index ed1c6aa..9121f0c 100644
--- a/src/task.c
+++ b/src/task.c
@@ -40,11 +40,11 @@ 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, lt_t wcet, lt_t period,
-                     unsigned int priority, task_class_t class)
+int __create_rt_task(rt_fn_t rt_prog, void *arg, int cluster, int cluster_size,
+                lt_t wcet, lt_t period, unsigned int priority, task_class_t class)
 {
         struct rt_task params;
-        params.cpu       = cpu;
+        params.cpu       = cluster_to_first_cpu(cluster, cluster_size);
         params.period    = period;
         params.exec_cost = wcet;
         params.cls       = class;
@@ -57,9 +57,11 @@ int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, lt_t wcet, lt_t period
                                 (rt_setup_fn_t) set_rt_task_param, &params);
 }
 
-int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, lt_t wcet, lt_t period,
-                   unsigned int priority) {
-        return __create_rt_task(rt_prog, arg, cpu, wcet, period, priority, RT_CLASS_HARD);
+int create_rt_task(rt_fn_t rt_prog, void *arg, int cluster, int cluster_size,
+                lt_t wcet, lt_t period, unsigned int prio)
+{
+        return __create_rt_task(rt_prog, arg, cluster, cluster_size, wcet, period,
+                                prio, RT_CLASS_HARD);
 }