5 files changed, 68 insertions, 45 deletions

diff --git a/bin/rt_launch.c b/bin/rt_launch.c
index 97d9df9..ae68601 100644
--- a/bin/rt_launch.c
+++ b/bin/rt_launch.c
@@ -29,10 +29,11 @@ int launch(void *task_info_p) {
 }
 
 void usage(char *error) {
-        fprintf(stderr, "%s\nUsage: rt_launch [-w][-v][-p cpu][-q prio][-c hrt | srt | be] wcet period program [arg1 arg2 ...]\n"
+        fprintf(stderr, "%s\nUsage: rt_launch [-w][-v][-p partition/cluster [-z cluster size]][-q prio][-c hrt | srt | be] wcet period program [arg1 arg2 ...]\n"
                         "\t-w\tSynchronous release\n"
                         "\t-v\tVerbose\n"
-                        "\t-p\tcpu (or initial cpu)\n"
+                        "\t-p\tpartition or cluster\n"
+                        "\t-z\tsize of cluster (default = 1 for partitioned)\n"
                         "\t-c\tClass\n"
                         "\twcet, period in ms\n"
                         "\tprogram to be launched\n",
@@ -41,7 +42,7 @@ void usage(char *error) {
 }
 
 
-#define OPTSTR "p:c:vwq:"
+#define OPTSTR "p:z:c:vwq:"
 
 int main(int argc, char** argv) 
 {
@@ -49,7 +50,8 @@ int main(int argc, char** argv)
         lt_t wcet;
         lt_t period;
         int migrate = 0;
-        int cpu = 0;
+        int cluster = 0;
+        int cluster_size = 1;
         int opt;
         int verbose = 0;
         int wait = 0;
@@ -66,9 +68,12 @@ int main(int argc, char** argv)
                         verbose = 1;
                         break;
                 case 'p':
-                        cpu = atoi(optarg);
+                        cluster = atoi(optarg);
                         migrate = 1;
                         break;
+                case 'z':
+                        cluster_size = atoi(optarg);
+                        break;
                 case 'q':
                         priority = atoi(optarg);
                         if (!litmus_is_valid_fixed_prio(priority))
@@ -109,11 +114,12 @@ int main(int argc, char** argv)
         info.argv      = argv + optind + 2;
         info.wait      = wait;
         if (migrate) {
-                ret = be_migrate_to_cpu(cpu);
+                ret = be_migrate_to_cluster(cluster, cluster_size);
                 if (ret < 0)
-                        bail_out("could not migrate to target partition");
+                        bail_out("could not migrate to target partition or cluster");
         }
-        ret = __create_rt_task(launch, &info, cpu, wcet, period, priority, class);
+        ret = __create_rt_task(launch, &info, cluster, cluster_size, wcet, period,
+                                priority, class);
 
 
         if (ret < 0)
diff --git a/bin/rtspin.c b/bin/rtspin.c
index 5f12930..b05c17c 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -21,7 +21,8 @@ static void usage(char *error) {
                 "       rt_spin [COMMON-OPTS] -f FILE [-o COLUMN] WCET PERIOD\n"
                 "       rt_spin -l\n"
                 "\n"
-                "COMMON-OPTS = [-w] [-p PARTITION] [-c CLASS] [-s SCALE]\n"
+                "COMMON-OPTS = [-w] [-s SCALE]\n"
+                "              [-p PARTITION/CLUSTER [-z CLUSTER SIZE]] [-c CLASS]\n"
                 "              [-X LOCKING-PROTOCOL] [-L CRITICAL SECTION LENGTH] [-Q RESOURCE-ID]"
                 "\n"
                 "WCET and PERIOD are milliseconds, DURATION is seconds.\n"
@@ -183,7 +184,7 @@ static int job(double exec_time, double program_end, int lock_od, double cs_leng
         }
 }
 
-#define OPTSTR "p:c:wlveo:f:s:q:X:L:Q:"
+#define OPTSTR "p:z:c:wlveo:f:s:q:X:L:Q:"
 
 int main(int argc, char** argv)
 {
@@ -193,7 +194,8 @@ int main(int argc, char** argv)
         double wcet_ms, period_ms;
         unsigned int priority = LITMUS_LOWEST_PRIORITY;
         int migrate = 0;
-        int cpu = 0;
+        int cluster = 0;
+        int cluster_size = 1;
         int opt;
         int wait = 0;
         int test_loop = 0;
@@ -221,9 +223,12 @@ int main(int argc, char** argv)
                         wait = 1;
                         break;
                 case 'p':
-                        cpu = atoi(optarg);
+                        cluster = atoi(optarg);
                         migrate = 1;
                         break;
+                case 'z':
+                        cluster_size = atoi(optarg);
+                        break;
                 case 'q':
                         priority = atoi(optarg);
                         if (!litmus_is_valid_fixed_prio(priority))
@@ -320,13 +325,8 @@ int main(int argc, char** argv)
         else if (file && num_jobs > 1)
                 duration += period_ms * 0.001 * (num_jobs - 1);
 
-        if (migrate) {
-                ret = be_migrate_to_cpu(cpu);
-                if (ret < 0)
-                        bail_out("could not migrate to target partition");
-        }
-
-        ret = sporadic_task_ns(wcet, period, 0, cpu, priority, class,
+        ret = sporadic_task_ns(wcet, period, 0, cluster, cluster_size,
+                               priority, class,
                                want_enforcement ? PRECISE_ENFORCEMENT
                                                 : NO_ENFORCEMENT,
                                migrate);
@@ -341,7 +341,7 @@ int main(int argc, char** argv)
 
         if (protocol >= 0) {
                 /* open reference to semaphore */
-                lock_od = litmus_open_lock(protocol, resource_id, lock_namespace, &cpu);
+                lock_od = litmus_open_lock(protocol, resource_id, lock_namespace, &cluster);
                 if (lock_od < 0) {
                         perror("litmus_open_lock");
                         usage("Could not open lock.");
diff --git a/include/litmus.h b/include/litmus.h
index b2e81f2..335d01b 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -21,6 +21,13 @@ extern "C" {
 int set_rt_task_param(pid_t pid, struct rt_task* param);
 int get_rt_task_param(pid_t pid, struct rt_task* param);
 
+/* Release-master-aware functions for getting the first
+ * CPU in a particular cluster or partition. Use these
+ * to set rt_task::cpu for cluster/partitioned scheduling.
+ */
+int partition_to_cpu(int partition);
+int cluster_to_first_cpu(int cluster, int cluster_size);
+
 /* setup helper */
 
 /* Times are given in ms. The 'priority' parameter
@@ -30,9 +37,9 @@ 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, 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 be_migrate);
 
 /* Times are given in ns. The 'priority' parameter
  * is only relevant under fixed-priority scheduling (and
@@ -41,16 +48,19 @@ int sporadic_task(
  */
 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 be_migrate);
 
 /* Convenience macros. Budget enforcement off by default in these macros. */
 #define sporadic_global(e, p) \
-        sporadic_task(e, p, 0, 0, LITMUS_LOWEST_PRIORITY, \
+        sporadic_task(e, p, 0, 0, 0, LITMUS_LOWEST_PRIORITY, \
                 RT_CLASS_SOFT, NO_ENFORCEMENT, 0)
-#define sporadic_partitioned(e, p, cpu) \
+#define sporadic_partitioned(e, p, partition) \