LV cwip-mc2-ver2

1 files changed, 18 insertions, 4 deletions

diff --git a/include/litmus/reservation.h b/include/litmus/reservation.h
index 0e656ad2667e..fc7e31918a60 100644
--- a/include/litmus/reservation.h
+++ b/include/litmus/reservation.h
@@ -129,8 +129,10 @@ struct reservation {
         
         /* for global env. */
         int scheduled_on;
-        /* for blocked by ghost */
+        /* for blocked by ghost. Do not charge budget when ACTIVE */
         int blocked_by_ghost;
+        /* ghost_job. If it is clear, do not charge budget when ACTIVE_IDLE */
+        int is_ghost;
 };
 
 void reservation_init(struct reservation *res);
@@ -199,11 +201,19 @@ struct reservation* sup_find_by_id(struct sup_reservation_environment* sup_env,
         unsigned int id);
         
 /* A global multiprocessor reservation environment. */
+/*
+typedef enum {
+        EVENT_REPLENISH = 0,
+        EVENT_DRAIN,
+        EVENT_OTHERS,
+} event_type_t;
+*/
 
 struct next_timer_event {
         lt_t next_update;
         int timer_armed_on;
-        unsigned int id;
+        //unsigned int id;
+        //event_type_t type;
         struct list_head list;
 };
 
@@ -222,6 +232,7 @@ struct gmp_reservation_environment {
 
         /* timer event ordered by next_update */
         struct list_head next_events;
+        
         /* (schedule_now == true) means call gmp_dispatch() now */
         bool schedule_now;
         /* set to true if a call to gmp_dispatch() is imminent */
@@ -231,9 +242,12 @@ struct gmp_reservation_environment {
 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);
+void gmp_scheduler_update_after(struct gmp_reservation_environment* gmp_env,
+        lt_t timeout);
+bool 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 next_timer_event* gmp_find_event_by_id(struct gmp_reservation_environment* gmp_env, unsigned int id);
+struct next_timer_event* gmp_find_event_by_time(struct gmp_reservation_environment* gmp_env, lt_t when);
 struct reservation* gmp_find_by_id(struct gmp_reservation_environment* gmp_env,
         unsigned int id);