2 files changed, 33 insertions, 4 deletions

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)