PGM data structure refinement.

1 files changed, 21 insertions, 14 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index bc84bfc358a3..a5d68250eef3 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -33,6 +33,16 @@ typedef enum {
         PRECISE_ENFORCEMENT  /* budgets are enforced with hrtimers */
 } budget_policy_t;
 
+struct rt_task {
+        lt_t            exec_cost;
+        lt_t            period;
+        lt_t            phase;
+        unsigned int    cpu;
+        task_class_t    cls;
+        budget_policy_t budget_policy; /* ignored by pfair */
+};
+
+
 #ifdef CONFIG_PGM
 
 #define MAX_FAN CONFIG_MAX_PGM_FAN
@@ -60,24 +70,16 @@ struct pgm_consume
 {
         int nr_consumptions;                            /* num of consumption constraints */
         char satisfied[FAN_BYTES];                      /* bit-array of satisfied constraints;
-                                                                                   bit == 0 means satisfied! */
+                                                                                 bit == 0 means satisfied! */
         struct pgm_consumption consume[0];      /* array of consumption constraints */
 };
-#endif
 
-struct rt_task {
-        lt_t            exec_cost;
-        lt_t            period;
-        lt_t            phase;
-        unsigned int    cpu;
-        task_class_t    cls;
-        budget_policy_t budget_policy; /* ignored by pfair */
-        
-#ifdef CONFIG_PGM
-        struct pgm_produce *produce;
-        struct pgm_consume *consume;
-#endif
+struct rt_pgm {
+        struct pgm_produce *produce;    /* output and current state */
+        struct pgm_consume *consume;    /* input constraints and current state */ 
+        struct task_struct *src;                /* only not NULL if task is sink */
 };
+#endif
 
 union np_flag {
         uint32_t raw;
@@ -164,6 +166,11 @@ struct rt_param {
         /* timing parameters */
         struct rt_job           job_params;
 
+#ifdef CONFIG_PGM
+        struct rt_pgm           pgm_params;
+        unsigned int            is_pgm_node:1;
+#endif
+        
         /* task representing the current "inherited" task
          * priority, assigned by inherit_priority and
          * return priority in the scheduler plugins.