improve ikglp heuristics

2 files changed, 9 insertions, 0 deletions

diff --git a/include/litmus/ikglp_lock.h b/include/litmus/ikglp_lock.h
index 0b89c8135360..9d0cd3d1904e 100644
--- a/include/litmus/ikglp_lock.h
+++ b/include/litmus/ikglp_lock.h
@@ -114,6 +114,7 @@ struct ikglp_queue_info
         struct fifo_queue* q;
         lt_t estimated_len;
         int *nr_cur_users;
+        int *nr_aff_users;
 };
 
 struct ikglp_affinity_ops
@@ -128,6 +129,8 @@ struct ikglp_affinity_ops
         void (*notify_acquired)(struct ikglp_affinity* aff, struct fifo_queue* fq, struct task_struct* t);      // replica acquired
         void (*notify_freed)(struct ikglp_affinity* aff, struct fifo_queue* fq, struct task_struct* t);         // replica freed
         int (*replica_to_resource)(struct ikglp_affinity* aff, struct fifo_queue* fq);          // convert a replica # to a GPU (includes offsets and simult user folding)
+
+        int (*notify_exit)(struct ikglp_affinity* aff, struct task_struct* t);
 };
 
 struct ikglp_affinity
@@ -136,6 +139,7 @@ struct ikglp_affinity
         struct ikglp_affinity_ops *ops;
         struct ikglp_queue_info *q_info;
         int *nr_cur_users_on_rsrc;
+        int *nr_aff_on_rsrc;
         int offset;
         int nr_simult;
         int nr_rsrc;
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 44f85a366574..cb7c3ac64339 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -188,6 +188,8 @@ typedef struct feedback_est{
 
 #define AVG_EST_WINDOW_SIZE 20
 
+typedef int (*notify_rsrc_exit_t)(struct task_struct* tsk);
+
 typedef struct avg_est{
         lt_t history[AVG_EST_WINDOW_SIZE];
         uint16_t count;
@@ -248,6 +250,9 @@ struct rt_param {
         gpu_migration_dist_t    gpu_migration;
         int                             last_gpu;
 
+        notify_rsrc_exit_t      rsrc_exit_cb;
+        void* rsrc_exit_cb_args;
+
         lt_t accum_gpu_time;
         lt_t gpu_time_stamp;