Move 'reservation' field from task_client to generic reservation_client

This makes it a lot easier to write generic code for thread arrival /
thread departure in plugins with multiple types of reservation
clients.

3 files changed, 7 insertions, 6 deletions

diff --git a/include/litmus/reservation.h b/include/litmus/reservation.h
index d8d6ce37dc47..9c23e27165b2 100644
--- a/include/litmus/reservation.h
+++ b/include/litmus/reservation.h
@@ -33,9 +33,11 @@ typedef struct task_struct * (*dispatch_t)  (
 );
 
 /* Something that can be managed in a reservation and that can yield
- * a process for dispatching. */
+ * a process for dispatching. Contains a pointer to the reservation
+ * to which it "belongs". */
 struct reservation_client {
         struct list_head list;
+        struct reservation* reservation;
         dispatch_t dispatch;
 };
 
@@ -135,7 +137,6 @@ struct task_struct* default_dispatch_client(
 /* "connector" reservation client to hook up tasks with reservations */
 struct task_client {
         struct reservation_client client;
-        struct reservation* reservation;
         struct task_struct *task;
 };
 
diff --git a/litmus/reservation.c b/litmus/reservation.c
index cd51b90c14a0..447fc5b1be23 100644
--- a/litmus/reservation.c
+++ b/litmus/reservation.c
@@ -40,8 +40,8 @@ void task_client_init(struct task_client *tc, struct task_struct *tsk,
 {
         memset(&tc->client, sizeof(tc->client), 0);
         tc->client.dispatch = task_client_dispatch;
+        tc->client.reservation = res;
         tc->task = tsk;
-        tc->reservation = res;
 }
 
 static void sup_scheduler_update_at(
@@ -180,7 +180,7 @@ static void sup_charge_budget(
 {
         struct list_head *pos, *next;
         struct reservation *res;
-        
+
         int encountered_active = 0;
 
         list_for_each_safe(pos, next, &sup_env->active_reservations) {
diff --git a/litmus/sched_pres.c b/litmus/sched_pres.c
index 60afde6f8d1b..2c777ec34658 100644
--- a/litmus/sched_pres.c
+++ b/litmus/sched_pres.c
@@ -45,7 +45,7 @@ static void task_departs(struct task_struct *tsk, int job_complete)
         struct reservation* res;
         struct reservation_client *client;
 
-        res    = state->res_info.reservation;
+        res    = state->res_info.client.reservation;
         client = &state->res_info.client;
 
         res->ops->client_departs(res, client, job_complete);
@@ -57,7 +57,7 @@ static void task_arrives(struct task_struct *tsk)
         struct reservation* res;
         struct reservation_client *client;
 
-        res    = state->res_info.reservation;
+        res    = state->res_info.client.reservation;
         client = &state->res_info.client;
 
         res->ops->client_arrives(res, client);