fixed timer

2 files changed, 22 insertions, 11 deletions

diff --git a/litmus/reservation.c b/litmus/reservation.c
index 86d2f6e65382..25e838cb31f9 100644
--- a/litmus/reservation.c
+++ b/litmus/reservation.c
@@ -4,8 +4,8 @@
 #include <litmus/litmus.h>
 #include <litmus/reservation.h>
 
-#define TRACE(fmt, args...) do {} while (false)
-#define TRACE_TASK(fmt, args...) do {} while (false)
+//#define TRACE(fmt, args...) do {} while (false)
+//#define TRACE_TASK(fmt, args...) do {} while (false)
 
 void reservation_init(struct reservation *res)
 {
@@ -387,15 +387,25 @@ static void gmp_add_event(
 {
         struct next_timer_event *nevent, *queued;
         struct list_head *pos;
-        int found = 0;
+        int found = 0, update = 0;
 
         //when = div64_u64(when, TIMER_RESOLUTION);
         //when *= TIMER_RESOLUTION;
 //printk(KERN_ALERT "GMP_ADD id=%d type=%d when=%llu\n", id, type, when);
         nevent = gmp_find_event_by_id(gmp_env, id);
         
-        if (!nevent || nevent->type != type) {
-                nevent = kzalloc(sizeof(*nevent), GFP_ATOMIC);
+        if (nevent)
+                TRACE("EVENT R%d update prev = %llu, new = %llu\n", nevent->id, nevent->next_update, when);
+        
+        if (nevent && nevent->next_update > when) {
+                list_del(&nevent->list);
+                update = 1;
+                
+        }
+        
+        if (!nevent || nevent->type != type || update == 1) {
+                if (update == 0)
+                        nevent = kzalloc(sizeof(*nevent), GFP_ATOMIC);
                 BUG_ON(!nevent);
                 nevent->next_update = when;
                 nevent->id = id;
@@ -421,9 +431,9 @@ static void gmp_add_event(
 ; //printk(KERN_ALERT "EVENT FOUND id = %d type=%d when=%llu, NEW EVENT type=%d when=%llu\n", nevent->id, nevent->type, nevent->next_update, type, when);
         }
         
-        //TRACE("======START PRINTING EVENT LIST======\n");
-        //gmp_print_events(gmp_env, litmus_clock());
-        //TRACE("======FINISH PRINTING EVENT LIST======\n");
+        TRACE("======START PRINTING EVENT LIST======\n");
+        gmp_print_events(gmp_env, litmus_clock());
+        TRACE("======FINISH PRINTING EVENT LIST======\n");
 }
 
 void gmp_add_event_after(
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index f7758f2aff58..0d378c11ae85 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -170,6 +170,7 @@ static void task_departs(struct task_struct *tsk, int job_complete)
                 ce = &state->crit_entries[lv];
                 ce->running = tsk;
                 res->is_ghost = 1;
+                gmp_add_event_after(&_global_env, res->cur_budget, res->id, EVENT_DRAIN);
                 TRACE_TASK(tsk, "BECOME GHOST at %llu\n", litmus_clock());
                 
         }               
@@ -305,7 +306,7 @@ static void mc2_update_timer_and_unlock(struct mc2_cpu_state *state)
                                         litmus_reschedule(cpu);
                                 }
                         }
-                } else if (event->next_update < update && event->timer_armed_on == NO_CPU) {
+                } else if (event->next_update < update && (event->timer_armed_on == NO_CPU || event->timer_armed_on == state->cpu)) {
                         event->timer_armed_on = state->cpu;
                         update = event->next_update;
                         break;
@@ -484,7 +485,7 @@ static enum hrtimer_restart on_scheduling_timer(struct hrtimer *timer)
                 update = now + remain_budget;
         }
         
-        //TRACE_CUR("on_scheduling_timer at %llu, upd:%llu (for cpu=%d) g_schedule_now:%d\n", now, update, state->cpu, global_schedule_now);
+        TRACE_CUR("on_scheduling_timer at %llu, upd:%llu (for cpu=%d) g_schedule_now:%d\n", now, update, state->cpu, global_schedule_now);
 //printk(KERN_ALERT "on_scheduling_timer at %llu, upd:%llu (for cpu=%d) g_schedule_now:%d\n", now, update, state->cpu, global_schedule_now);
         if (update <= now) {
                 litmus_reschedule_local();
@@ -502,7 +503,7 @@ static enum hrtimer_restart on_scheduling_timer(struct hrtimer *timer)
                         raw_spin_lock(&_lowest_prio_cpu.lock);
                         _lowest_prio_cpu.cpu_entries[cpu].will_schedule = true;
                         raw_spin_unlock(&_lowest_prio_cpu.lock);
-                        //TRACE("LOWEST CPU = P%d\n", cpu);
+                        TRACE("LOWEST CPU = P%d\n", cpu);
                         litmus_reschedule(cpu);
                 }
         }