Reservation destroy

4 files changed, 50 insertions, 12 deletions

diff --git a/include/litmus/reservation.h b/include/litmus/reservation.h
index 5ccb20055a56..0e656ad2667e 100644
--- a/include/litmus/reservation.h
+++ b/include/litmus/reservation.h
@@ -129,6 +129,8 @@ struct reservation {
         
         /* for global env. */
         int scheduled_on;
+        /* for blocked by ghost */
+        int blocked_by_ghost;
 };
 
 void reservation_init(struct reservation *res);
@@ -225,14 +227,14 @@ struct gmp_reservation_environment {
         /* set to true if a call to gmp_dispatch() is imminent */
         bool will_schedule;
 };
-/*
+
 void gmp_init(struct gmp_reservation_environment* gmp_env);
 void gmp_add_new_reservation(struct gmp_reservation_environment* gmp_env,
         struct reservation* new_res);
 void gmp_update_time(struct gmp_reservation_environment* gmp_env, lt_t now);
 struct task_struct* gmp_dispatch(struct gmp_reservation_environment* gmp_env);
-
+struct next_timer_event* gmp_find_event_by_id(struct gmp_reservation_environment* gmp_env, unsigned int id);
 struct reservation* gmp_find_by_id(struct gmp_reservation_environment* gmp_env,
         unsigned int id);
-*/
+
 #endif
diff --git a/litmus/polling_reservations.c b/litmus/polling_reservations.c
index 941a371c26e9..ec5cadd19b4f 100644
--- a/litmus/polling_reservations.c
+++ b/litmus/polling_reservations.c
@@ -46,6 +46,7 @@ static void periodic_polling_client_arrives(
                         break;
 
                 case RESERVATION_ACTIVE_IDLE:
+                        res->blocked_by_ghost = 0;
                         res->env->change_state(res->env, res,
                                 RESERVATION_ACTIVE);
                         break;
diff --git a/litmus/reservation.c b/litmus/reservation.c
index 2dc3dc2b4688..16b3a4818e1e 100644
--- a/litmus/reservation.c
+++ b/litmus/reservation.c
@@ -194,9 +194,11 @@ static void sup_charge_budget(
                 res = list_entry(pos, struct reservation, list);
                 if (res->state == RESERVATION_ACTIVE) {
                         TRACE("sup_charge_budget ACTIVE R%u drain %llu\n", res->id, delta);
-                        if (encountered_active == 0)
+                        if (encountered_active == 0 && res->blocked_by_ghost == 0) {
+                                TRACE("DRAIN !!\n");
                                 res->ops->drain_budget(res, delta);
-                        encountered_active = 1;
+                                encountered_active = 1;
+                        }                       
                 } else {
                         BUG_ON(res->state != RESERVATION_ACTIVE_IDLE);
                         TRACE("sup_charge_budget INACTIVE R%u drain %llu\n", res->id, delta);
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index 499f770a87d3..0c260190f287 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -86,17 +86,25 @@ static void task_departs(struct task_struct *tsk, int job_complete)
         }               
 }
 
-static void task_arrives(struct task_struct *tsk)
+static void task_arrives(struct mc2_cpu_state *state, struct task_struct *tsk)
 {
         struct mc2_task_state* tinfo = get_mc2_state(tsk);
         struct reservation* res;
         struct reservation_client *client;
+        enum crit_level lv = get_task_crit_level(tsk);
 
         res    = tinfo->res_info.client.reservation;
         client = &tinfo->res_info.client;
 
         tinfo->has_departed = false;
         res->ops->client_arrives(res, client);
+        
+        if (lv != NUM_CRIT_LEVELS) {
+                struct crit_entry *ce;
+                ce = &state->crit_entries[lv];
+                if (ce->running == tsk)
+                        ce->running = NULL;
+        }
 }
 
 /* NOTE: drops state->lock */
@@ -174,8 +182,13 @@ static void mc2_update_ghost_state(struct mc2_cpu_state *state)
                                 continue;
                         TRACE("LV %d running id %d budget %llu\n", lv, tinfo->mc2_param.res_id, res->cur_budget);
                         if (!res->cur_budget) {
+                                struct sup_reservation_environment* sup_env = &state->sup_env;
+                                
                                 TRACE("GHOST FINISH id %d at %llu\n", tinfo->mc2_param.res_id, litmus_clock());
                                 ce->running = NULL;
+                                res = list_first_entry_or_null(&sup_env->active_reservations, struct reservation, list);
+                                if (res)
+                                        litmus_reschedule_local();
                         }
                 }
         }
@@ -262,7 +275,10 @@ struct task_struct* mc2_dispatch(struct sup_reservation_environment* sup_env, st
                                         ce = &state->crit_entries[lv];
                                         if (likely(!ce->running)) {
                                                 sup_scheduler_update_after(sup_env, res->cur_budget);
+                                                res->blocked_by_ghost = 0;
                                                 return tsk;
+                                        } else {
+                                                res->blocked_by_ghost = 1;
                                         }
                                 }
                         }
@@ -275,7 +291,6 @@ struct task_struct* mc2_dispatch(struct sup_reservation_environment* sup_env, st
 static struct task_struct* mc2_schedule(struct task_struct * prev)
 {
         /* next == NULL means "schedule background work". */
-        struct mc2_task_state *tinfo;
         struct mc2_cpu_state *state = local_cpu_state();
 
         raw_spin_lock(&state->lock);
@@ -352,7 +367,7 @@ static void mc2_task_resume(struct task_struct  *tsk)
                  * at the moment. */
                 sup_update_time(&state->sup_env, litmus_clock());
                 mc2_update_ghost_state(state);
-                task_arrives(tsk);
+                task_arrives(state, tsk);
                 /* NOTE: drops state->lock */
                 TRACE_TASK(tsk, "mc2_resume()\n");
                 mc2_update_timer_and_unlock(state);
@@ -498,7 +513,7 @@ static void mc2_task_new(struct task_struct *tsk, int on_runqueue,
                  * [see comment in pres_task_resume()] */
                 sup_update_time(&state->sup_env, litmus_clock());
                 mc2_update_ghost_state(state);
-                task_arrives(tsk);
+                task_arrives(state, tsk);
                 /* NOTE: drops state->lock */
                 TRACE("mc2_new()\n");
                 mc2_update_timer_and_unlock(state);
@@ -521,6 +536,7 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
         struct reservation *res = NULL, *next;
         struct sup_reservation_environment *sup_env;
         int found = 0;
+        enum crit_level lv = get_task_crit_level(current);
                 
         state = cpu_state_for(cpu);
         raw_spin_lock(&state->lock);
@@ -530,8 +546,13 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
         //if (!res) {
         list_for_each_entry_safe(res, next, &sup_env->depleted_reservations, list) {
                 if (res->id == reservation_id) {
+                        if (lv == CRIT_LEVEL_A) {
+                                struct table_driven_reservation *tdres;
+                                tdres = container_of(res, struct table_driven_reservation, res);
+                                kfree(tdres->intervals);
+                        }
                         list_del(&res->list);
-                        //kfree(res);
+                        kfree(res);
                         found = 1;
                         ret = 0;
                 }
@@ -539,8 +560,13 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
         if (!found) {
                 list_for_each_entry_safe(res, next, &sup_env->inactive_reservations, list) {
                         if (res->id == reservation_id) {
+                                if (lv == CRIT_LEVEL_A) {
+                                        struct table_driven_reservation *tdres;
+                                        tdres = container_of(res, struct table_driven_reservation, res);
+                                        kfree(tdres->intervals);
+                                }
                                 list_del(&res->list);
-                                //kfree(res);
+                                kfree(res);
                                 found = 1;
                                 ret = 0;
                         }
@@ -549,8 +575,13 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
         if (!found) {
                 list_for_each_entry_safe(res, next, &sup_env->active_reservations, list) {
                         if (res->id == reservation_id) {
+                                if (lv == CRIT_LEVEL_A) {
+                                        struct table_driven_reservation *tdres;
+                                        tdres = container_of(res, struct table_driven_reservation, res);
+                                        kfree(tdres->intervals);
+                                }
                                 list_del(&res->list);
-                                //kfree(res);
+                                kfree(res);
                                 found = 1;
                                 ret = 0;
                         }
@@ -665,6 +696,7 @@ static long create_polling_reservation(
                         config->polling_params.relative_deadline,
                         config->polling_params.offset);
                 pres->res.id = config->id;
+                pres->res.blocked_by_ghost = 0;
                 if (!use_edf)
                         pres->res.priority = config->priority;
                 sup_add_new_reservation(&state->sup_env, &pres->res);
@@ -765,6 +797,7 @@ static long create_table_driven_reservation(
                                 slots, num_slots);
                         td_res->res.id = config->id;
                         td_res->res.priority = config->priority;
+                        td_res->res.blocked_by_ghost = 0;
                         sup_add_new_reservation(&state->sup_env, &td_res->res);
                         err = config->id;
                 } else {