1 files changed, 21 insertions, 17 deletions

diff --git a/litmus/sched_mc_ce.c b/litmus/sched_mc_ce.c
index 702b46da93d5..e4d66bad2138 100644
--- a/litmus/sched_mc_ce.c
+++ b/litmus/sched_mc_ce.c
@@ -130,7 +130,7 @@ static inline lt_t get_cycle_offset(const lt_t when, const lt_t cycle_time)
  *
  * Do not call prepare_for_next_period on Level-A tasks!
  */
-static void mc_ce_job_completion(struct domain *dom, struct task_struct *ts)
+void mc_ce_job_completion(struct domain *dom, struct task_struct *ts)
 {
         const int cpu = task_cpu(ts);
         const int idx = tsk_mc_data(ts)->mc_task.lvl_a_id;
@@ -141,6 +141,7 @@ static void mc_ce_job_completion(struct domain *dom, struct task_struct *ts)
 
         /* sched_trace_task_completion(ts, 0); */
         /* post-increment is important here */
+        sched_trace_server_completion(-ts->pid, get_rt_job(ts));
         just_finished = (tsk_rt(ts)->job_params.job_no)++;
 
         /* Job completes in expected window: everything is normal.
@@ -157,7 +158,6 @@ static void mc_ce_job_completion(struct domain *dom, struct task_struct *ts)
                 printk(KERN_CRIT "job %u completed in expected job %u which "
                                 "seems too early\n", just_finished,
                                 pid_entry->expected_job);
-                BUG();
         }
 }
 
@@ -451,7 +451,7 @@ lt_t mc_ce_timer_callback_common(struct domain *dom)
         struct ce_pid_table *pid_table;
         struct ce_pid_entry *pid_entry;
         struct ce_dom_data *ce_data;
-        int idx, budget_overrun;
+        int idx, budget_overrun, expected;
 
         ce_data = dom->data;
         pid_table = get_pid_table(ce_data->cpu);
@@ -481,26 +481,31 @@ lt_t mc_ce_timer_callback_common(struct domain *dom)
                  * If jobs are not overrunning their budgets, then this
                  * should not happen.
                  */
-                pid_entry->expected_job++;
-                budget_overrun = pid_entry->expected_job !=
+                expected = ++pid_entry->expected_job;
+                TRACE_MC_TASK(should_schedule, "Expected now: %d\n", expected);
+                budget_overrun = expected !=
                         tsk_rt(should_schedule)->job_params.job_no;
-                if (budget_overrun)
+                if (budget_overrun) {
                         TRACE_MC_TASK(should_schedule,
                                       "timer expected job number: %u "
                                       "but current job: %u\n",
-                                      pid_entry->expected_job,
+                                      expected,
                                       tsk_rt(should_schedule)->job_params.job_no);
+                }
         }
 
         if (ce_data->should_schedule) {
-                tsk_rt(should_schedule)->job_params.deadline =
+                get_deadline(should_schedule) =
                         cycle_start_abs + pid_entry->acc_time;
-                tsk_rt(should_schedule)->job_params.release =
-                        tsk_rt(should_schedule)->job_params.deadline -
+                get_release(should_schedule) = tsk_rt(should_schedule)->job_params.deadline -
                         pid_entry->budget;
                 tsk_rt(should_schedule)->job_params.exec_time = 0;
-                /* sched_trace_task_release(should_schedule); */
+
+                TRACE_MC_TASK(should_schedule, "Released!\n");
                 set_rt_flags(ce_data->should_schedule, RT_F_RUNNING);
+                sched_trace_task_release(should_schedule);
+                sched_trace_server_release(-should_schedule->pid, get_rt_job(should_schedule),
+                                           tsk_rt(should_schedule)->job_params);
         }
         return next_timer_abs;
 }
@@ -603,7 +608,7 @@ static void arm_all_timers(void)
                 if (0 == pid_table->num_pid_entries)
                         continue;
                 for (idx = 0; idx < pid_table->num_pid_entries; idx++) {
-                        pid_table->entries[idx].expected_job = 0;
+                        pid_table->entries[idx].expected_job = 1;
                 }
 #ifdef CONFIG_PLUGIN_MC_RELEASE_MASTER
                 cpu_for_timer = interrupt_cpu;
@@ -629,7 +634,7 @@ static void arm_all_timers(void)
  */
 void mc_ce_release_at_common(struct task_struct *ts, lt_t start)
 {
-        TRACE_TASK(ts, "release at\n");
+        TRACE("release CE at %llu\n", start);
         if (atomic_inc_and_test(&start_time_set)) {
                 /* in this case, we won the race */
                 cancel_all_timers();
@@ -664,8 +669,7 @@ long mc_ce_activate_plugin_common(void)
 
         atomic_set(&start_time_set, -1);
         atomic64_set(&start_time, litmus_clock());
-        /* may not want to arm timers on activation, just after release */
-        arm_all_timers();
+
         ret = 0;
 out:
         return ret;
@@ -707,7 +711,7 @@ static void clear_pid_entries(void)
                         }
                         pid_table->entries[entry].budget = 0;
                         pid_table->entries[entry].acc_time = 0;
-                        pid_table->entries[entry].expected_job = 0;
+                        pid_table->entries[entry].expected_job = 1;
                 }
         }
 }
@@ -752,7 +756,7 @@ static int __init init_sched_mc_ce(void)
                 raw_spin_lock_init(ce_lock);
                 dom_data = &per_cpu(_mc_ce_doms, cpu);
                 dom = &dom_data->domain;
-                ce_domain_init(dom, ce_lock, NULL, NULL, NULL, NULL, NULL,
+                ce_domain_init(dom, ce_lock, NULL, NULL, NULL, NULL,
                                 &per_cpu(_mc_ce_dom_data, cpu), cpu,
                                 mc_ce_timer_callback);
         }