Properly assign cpuwip-edf-os

5 files changed, 62 insertions, 35 deletions

diff --git a/bin/rt_launch_edfos.c b/bin/rt_launch_edfos.c
index 43ebee5..2b26fb2 100644
--- a/bin/rt_launch_edfos.c
+++ b/bin/rt_launch_edfos.c
@@ -50,9 +50,8 @@ int main(int argc, char** argv)
         lt_t wcet;
         lt_t period;
         /* [num,den] */
-        lt_t fracs[NR_CPUS][2];
-        int migrate = 0;
-        int cpu = 0;
+        lt_t fracs[NR_CPUS_EDF_OS][2];
+        int cpu = -1;
         int opt;
         int verbose = 0;
         int wait = 0;
@@ -60,7 +59,7 @@ int main(int argc, char** argv)
         startup_info_t info;
         task_class_t class = RT_CLASS_HARD;
 
-        for (i = 0; i < NR_CPUS; i++) {
+        for (i = 0; i < NR_CPUS_EDF_OS; i++) {
                 fracs[i][0] = 0;
                 fracs[i][1] = 0;
         }
@@ -77,7 +76,6 @@ int main(int argc, char** argv)
                         cpu = atoi(optarg);
                         fracs[cpu][0] = 1;
                         fracs[cpu][1] = 1;
-                        migrate = 1;
                         break;
                 case 'c':
                         class = str2class(optarg);
@@ -106,9 +104,11 @@ int main(int argc, char** argv)
                 fracs[cpu][0] = atoi(argv[i]);
                 fracs[cpu][1] = atoi(argv[i+1]);
         }
+        if (cpu == -1)
+                cpu = compute_initial_cpu_edfos(fracs);
         if (wcet <= 0)
-        usage("The worst-case execution time must be a "
-              "positive number.");
+                usage("The worst-case execution time must be a "
+                      "positive number.");
         if (period <= 0)
                 usage("The period must be a positive number.");
         if (wcet > period) {
@@ -118,17 +118,14 @@ int main(int argc, char** argv)
         info.exec_path = argv[optind + 8];
         info.argv      = argv + optind + 8;
         info.wait      = wait;
-        if (migrate) {
-                ret = be_migrate_to(cpu);
-                if (ret < 0)
-                        bail_out("could not migrate to target partition");
-        }
+        ret = be_migrate_to(cpu);
+        if (ret < 0)
+                bail_out("could not migrate to target partition");
         /* create in src/task.c a new wrapper for the __launch_rt_task
          * which takes the fraction and the cpus */
-        ret = __create_rt_task_edfos(launch, &info, wcet, period, fracs,
+        ret = __create_rt_task_edfos(launch, &info, cpu, wcet, period, fracs,
                         class);
 
-
         if (ret < 0)
                 bail_out("could not create rt child process");
         else if (verbose)
diff --git a/bin/rtspin_edfos.c b/bin/rtspin_edfos.c
index e39a8c0..3ea41c7 100644
--- a/bin/rtspin_edfos.c
+++ b/bin/rtspin_edfos.c
@@ -141,10 +141,10 @@ int main(int argc, char** argv)
         lt_t wcet;
         lt_t period;
         /* [num,den] */
-        lt_t fracs[NR_CPUS][2];
+        lt_t fracs[NR_CPUS_EDF_OS][2];
         double wcet_ms, period_ms;
-        int migrate = 0;
-        int cpu = 0;
+        int cpu = -1;
+        int ccpu;
         int opt;
         int wait = 0;
         int test_loop = 0;
@@ -156,9 +156,9 @@ int main(int argc, char** argv)
 
         progname = argv[0];
 
-        for (i = 0; i < NR_CPUS; i++) {
+        for (i = 0; i < NR_CPUS_EDF_OS; i++) {
                 fracs[i][0] = 0;
-                fracs[i][1] = 1;
+                fracs[i][1] = 0;
         }
 
         while ((opt = getopt(argc, argv, OPTSTR)) != -1) {
@@ -170,7 +170,6 @@ int main(int argc, char** argv)
                         cpu = atoi(optarg);
                         fracs[cpu][0] = 1;
                         fracs[cpu][1] = 1;
-                        migrate = 1;
                         break;
                 case 'c':
                         class = str2class(optarg);
@@ -215,10 +214,12 @@ int main(int argc, char** argv)
         duration  = atof(argv[optind + 2]);
         /* frac num, den = 0 means fixed task */
         for (i = optind + 3; i < argc; i += 3) {
-                cpu = atof(argv[i]);
-                fracs[cpu][0] = argv[i+1];
-                fracs[cpu][1] = argv[i+2];
+                ccpu = atof(argv[i]);
+                fracs[ccpu][0] = argv[i+1];
+                fracs[ccpu][1] = argv[i+2];
         }
+        if (cpu == -1)
+                cpu = compute_initial_cpu_edfos(fracs);
         wcet   = wcet_ms * __NS_PER_MS;
         period = period_ms * __NS_PER_MS;
         if (wcet <= 0)
@@ -231,13 +232,11 @@ int main(int argc, char** argv)
                       "exceed the period.");
         }
 
-        if (migrate) {
-                ret = be_migrate_to(cpu);
-                if (ret < 0)
-                        bail_out("could not migrate to target partition");
-        }
+        ret = be_migrate_to(cpu);
+        if (ret < 0)
+                bail_out("could not migrate to target partition");
 
-        ret = sporadic_task_ns_edfos(wcet, period, 0, fracs, class,
+        ret = sporadic_task_ns_edfos(wcet, period, 0, cpu, fracs, class,
                                 NO_ENFORCEMENT);
 
         if (ret < 0)
diff --git a/include/litmus.h b/include/litmus.h
index 8f997a0..0139d25 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -30,6 +30,8 @@ int get_rt_task_param(pid_t pid, struct rt_task* param);
 
 /* setup helper */
 
+unsigned int compute_initial_cpu_edfos(lt_t fracs[][2]);
+
 /* times are given in ms */
 int sporadic_task(
                 lt_t e, lt_t p, lt_t phase,
@@ -47,7 +49,7 @@ int sporadic_task_ns_edffm(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 sporadic_task_ns_edfos(lt_t e, lt_t p, lt_t phase,
+int sporadic_task_ns_edfos(lt_t e, lt_t p, lt_t phase, int cpu,
                 lt_t fracs[][2], task_class_t cls,
                 budget_policy_t budget_policy);
 
@@ -107,7 +109,7 @@ int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
 int __create_rt_task_edffm(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
                 int period, lt_t *frac1, lt_t *frac2,
                 int cpu1, int cpu2, task_class_t class);
-int __create_rt_task_edfos(rt_fn_t rt_prog, void *arg, int wcet,
+int __create_rt_task_edfos(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
                 int period, lt_t fracs[][2], task_class_t class);
 int __create_rt_task_npsf(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
                 int period, int npsf_id, task_class_t class);
diff --git a/src/litmus.c b/src/litmus.c
index b0416c4..f7c91de 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -39,6 +39,33 @@ int be_migrate_to(int target_cpu)
         return sched_setaffinity(0, sizeof(cpu_set_t), &cpu_set);
 }
 
+static unsigned int compute_pfair_deadline(lt_t wt_num, lt_t wt_den)
+{
+        int dead;
+        dead = wt_den / wt_num;
+        if (wt_den % wt_num > 0)
+                dead++;
+        return dead;
+}
+
+unsigned int compute_initial_cpu_edfos(lt_t fracs[][2])
+{
+        int initial_cpu = -1;
+        int lowest_deadline = UINT_MAX;
+        int current_deadline, i;
+        for (i = 0; i < NR_CPUS_EDF_OS; i++) {
+                if (fracs[i][0] > 0) {
+                        current_deadline = compute_pfair_deadline(fracs[i][0],
+                                                                  fracs[i][1]);
+                        if (current_deadline < lowest_deadline) {
+                                lowest_deadline = current_deadline;
+                                initial_cpu = i;
+                        }
+                }
+        }
+        return initial_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)
@@ -107,7 +134,7 @@ int sporadic_task_ns_edffm(lt_t e, lt_t p, lt_t phase, int cpu,
         return set_rt_task_param(gettid(), &param);
 }
 
-int sporadic_task_ns_edfos(lt_t e, lt_t p, lt_t phase,
+int sporadic_task_ns_edfos(lt_t e, lt_t p, lt_t phase, int cpu,
                 lt_t fracs[][2], task_class_t cls,
                 budget_policy_t budget_policy)
 {
@@ -118,7 +145,8 @@ int sporadic_task_ns_edfos(lt_t e, lt_t p, lt_t phase,
         os.first_cpu = UINT_MAX;
         param.exec_cost = e;
         param.period    = p;
-        for (i = 0; i < NR_CPUS; i++) {
+        param.cpu = cpu;
+        for (i = 0; i < NR_CPUS_EDF_OS; i++) {
                 if (fracs[i][0] > 0) {
                         os.migrat++;
                         if (os.first_cpu == UINT_MAX)
diff --git a/src/task.c b/src/task.c
index e618d9e..8b4287c 100644
--- a/src/task.c
+++ b/src/task.c
@@ -71,12 +71,13 @@ int __create_rt_task_edffm(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
                                 (rt_setup_fn_t) set_rt_task_param, &params);
 }
 
-int __create_rt_task_edfos(rt_fn_t rt_prog, void *arg, int wcet,
+int __create_rt_task_edfos(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
                         int period, lt_t fracs[][2], task_class_t class)
 {
         struct rt_task params;
         struct edfos_params os;
         int i;
+        params.cpu       = cpu;
         params.period    = period;
         params.exec_cost = wcet;
         params.cls       = class;
@@ -86,7 +87,7 @@ int __create_rt_task_edfos(rt_fn_t rt_prog, void *arg, int wcet,
 
         os.migrat = 0;
         os.first_cpu = UINT_MAX;
-        for (i = 0; i < NR_CPUS; i++) {
+        for (i = 0; i < NR_CPUS_EDF_OS; i++) {
                 if (fracs[i][0] > 0) {
                         os.migrat++;
                         if (os.first_cpu == UINT_MAX)