1 files changed, 43 insertions, 6 deletions

diff --git a/litmus/sched_mc_ce.c b/litmus/sched_mc_ce.c
index 63b0470e1f52..c5066918f282 100644
--- a/litmus/sched_mc_ce.c
+++ b/litmus/sched_mc_ce.c
@@ -52,6 +52,10 @@ struct ce_pid_entry {
         unsigned int expected_job;
 };
 
+/*
+ * Each CPU needs a mapping of level A ID (integer) to struct pid so that we
+ * can get its task struct.
+ */
 struct ce_pid_table {
         struct ce_pid_entry entries[CONFIG_PLUGIN_MC_LEVEL_A_MAX_TASKS];
         int num_pid_entries;
@@ -434,7 +438,10 @@ void mc_ce_task_exit_common(struct task_struct *ts)
  * Timer stuff
  **********************************************************/
 
-void mc_ce_timer_callback_common(struct domain *dom, struct hrtimer *timer)
+/*
+ * Returns the next absolute time that the timer should fire.
+ */
+lt_t mc_ce_timer_callback_common(struct domain *dom)
 {
         /* relative and absolute times for cycles */
         lt_t now, offset_rel, cycle_start_abs, next_timer_abs;
@@ -455,9 +462,7 @@ void mc_ce_timer_callback_common(struct domain *dom, struct hrtimer *timer)
         cycle_start_abs = now - offset_rel;
         idx = mc_ce_schedule_at(dom, offset_rel);
         pid_entry = get_pid_entry(ce_data->cpu, idx);
-        /* set the timer to fire at the next cycle start */
         next_timer_abs = cycle_start_abs + pid_entry->acc_time;
-        hrtimer_set_expires(timer, ns_to_ktime(next_timer_abs));
 
         STRACE("timer: now: %llu  offset_rel: %llu  cycle_start_abs: %llu  "
                         "next_timer_abs: %llu\n", now, offset_rel,
@@ -495,32 +500,52 @@ void mc_ce_timer_callback_common(struct domain *dom, struct hrtimer *timer)
                 sched_trace_task_release(should_schedule);
                 set_rt_flags(ce_data->should_schedule, RT_F_RUNNING);
         }
+        return next_timer_abs;
 }
 
 /*
  * What to do when a timer fires. The timer should only be armed if the number
  * of PID entries is positive.
  */
+#ifdef CONFIG_MERGE_TIMERS
+static void mc_ce_timer_callback(struct rt_event *e)
+#else
 static enum hrtimer_restart mc_ce_timer_callback(struct hrtimer *timer)
+#endif
 {
         struct ce_dom_data *ce_data;
         unsigned long flags;
         struct domain *dom;
-
+        lt_t next_timer_abs;
+#ifdef CONFIG_MERGE_TIMERS
+        struct event_group *event_group;
+        ce_data = container_of(e, struct ce_dom_data, event);
+        event_group = get_event_group_for(ce_data->cpu);
+#else
         ce_data = container_of(timer, struct ce_dom_data, timer);
+#endif
         dom = get_domain_for(ce_data->cpu);
 
         TRACE("timer callback on CPU %d (before lock)\n", ce_data->cpu);
 
         raw_spin_lock_irqsave(dom->lock, flags);
-        mc_ce_timer_callback_common(dom, timer);
+        next_timer_abs = mc_ce_timer_callback_common(dom);
+
+        /* setup an event or timer for the next release in the CE schedule */
+#ifdef CONFIG_MERGE_TIMERS
+        add_event(event_group, e, next_timer_abs);
+#else
+        hrtimer_set_expires(timer, ns_to_ktime(next_timer_abs));
+#endif
 
         if (ce_data->scheduled != ce_data->should_schedule)
                 preempt_if_preemptable(ce_data->scheduled, ce_data->cpu);
 
         raw_spin_unlock_irqrestore(dom->lock, flags);
 
+#ifndef CONFIG_MERGE_TIMERS
         return HRTIMER_RESTART;
+#endif
 }
 
 /*
@@ -530,7 +555,10 @@ static int cancel_all_timers(void)
 {
         struct ce_dom_data *ce_data;
         struct domain *dom;
-        int cpu, cancel_res, ret = 0;
+        int cpu, ret = 0;
+#ifndef CONFIG_MERGE_TIMERS
+        int cancel_res;
+#endif
 
         TRACE("cancel all timers\n");
 
@@ -538,10 +566,14 @@ static int cancel_all_timers(void)
                 dom = get_domain_for(cpu);
                 ce_data = dom->data;
                 ce_data->should_schedule = NULL;
+#ifdef CONFIG_MERGE_TIMERS
+                cancel_event(&ce_data->event);
+#else
                 cancel_res = hrtimer_cancel(&ce_data->timer);
                 atomic_set(&ce_data->timer_info.state,
                                 HRTIMER_START_ON_INACTIVE);
                 ret = ret || cancel_res; 
+#endif
         }
         return ret;
 }
@@ -570,9 +602,14 @@ static void arm_all_timers(void)
                 for (idx = 0; idx < pid_table->num_pid_entries; idx++) {
                         pid_table->entries[idx].expected_job = 0;
                 }
+#ifdef CONFIG_MERGE_TIMERS
+                TRACE("adding event for CPU %d\n", cpu);
+                add_event(get_event_group_for(cpu), &ce_data->event, start);
+#else
                 TRACE("arming timer for CPU %d\n", cpu);
                 hrtimer_start_on(cpu, &ce_data->timer_info, &ce_data->timer,
                                 ns_to_ktime(start), HRTIMER_MODE_ABS_PINNED);
+#endif
         }
 }