Remove EDF-Fm specific parameters from rt_param.h

Move parameters specific to EDF-Fm plugin only inside a dedicated data
structure. Use union within rt_task to merge also the other semi-part
plugins.

1 files changed, 41 insertions, 23 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 1c63b006f50e..90685e93ad21 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -20,9 +20,6 @@ static inline int lt_after_eq(lt_t a, lt_t b)
 }
 #define lt_before_eq(a, b) lt_after_eq(b, a)
 
-#define NR_CPUS_EDF_FM  2
-#define NR_CPUS_SEMI    NR_CPUS_EDF_FM
-
 /* different types of clients */
 typedef enum {
         RT_CLASS_HARD,
@@ -36,6 +33,31 @@ typedef enum {
         PRECISE_ENFORCEMENT  /* NOT IMPLEMENTED - enforced with hrtimers */
 } budget_policy_t;
 
+
+/* Parameters for EDF-Fm scheduling algorithm.
+ * Each task may be fixed or migratory. Migratory tasks may
+ * migrate on 2 (contiguous) CPU only. NR_CPUS_EDF_FM = 2.
+ */
+#define NR_CPUS_EDF_FM  2
+
+struct edffm_params {
+        /* EDF-fm where can a migratory task execute? */
+        unsigned int    cpus[NR_CPUS_EDF_FM];
+        /* how many cpus are used by this task?
+         * fixed = 0, migratory = (NR_CPUS_EDF_FM - 1)
+         * Efficient way to allow writing cpus[nr_cpus].
+         */
+        unsigned int    nr_cpus;
+        /* Fraction of this task exec_cost that each CPU should handle.
+         * We keep the fraction divided in num/denom : a matrix of
+         * (NR_CPUS_EDF_FM rows) x (2 columns).
+         * The first column is the numerator of the fraction.
+         * The second column is the denominator.
+         * In EDF-fm this is a 2*2 matrix
+         */
+        lt_t            fraction[2][NR_CPUS_EDF_FM];
+};
+
 struct rt_task {
         lt_t            exec_cost;
         lt_t            period;
@@ -43,21 +65,12 @@ struct rt_task {
         unsigned int    cpu;
         task_class_t    cls;
         budget_policy_t budget_policy; /* ignored by pfair */
-        /* EDF-fm where can a migrat task execute? */
-        unsigned int    cpus[NR_CPUS_SEMI];
-        /* how many cpus are used by this task? fixed = 0, migrat = multi
-         * nr_cpus = (number of cpu where the task can be migrated) - 1
-         * so that one can use: cpus[nr_cpus]
-         */
-        unsigned int    nr_cpus;
-        /* EDF-fm migrating tasks, fraction of this task exec_cost
-         * that the processors should handle.
-         * We keep the fraction divided in num/denom : a matrix of
-         * NR_CPUS_SEMI rows * 2 columns; first column is the numerator
-         * of the fraction, second column is the denominator
-         * (in EDF-fm this is a 2*2 matrix)
-         */
-        lt_t            fraction[2][NR_CPUS_SEMI];
+
+        /* parameters used by the semi-partitioned algorithms */
+        union {
+                /* EDF-Fm; defined in sched_edf_fm.c */
+                struct edffm_params fm;
+        } semi_part;
 };
 
 /* The definition of the data that is shared between the kernel and real-time
@@ -108,11 +121,6 @@ struct rt_job {
          * Increase this sequence number when a job is released.
          */
         unsigned int    job_no;
-
-        /* EDF-fm: number of jobs handled by this cpu
-         * (to determine next cpu for a migrating task)
-         */
-        unsigned int    cpu_job_no[NR_CPUS_SEMI];
 };
 
 struct pfair_param;
@@ -207,6 +215,16 @@ struct rt_param {
 
         /* Pointer to the page shared between userspace and kernel. */
         struct control_page * ctrl_page;
+
+        /* runtime info for the semi-part plugins */
+        union {
+                struct {
+                        /* EDF-fm: number of jobs handled by this cpu
+                         * (to determine next cpu for a migrating task)
+                         */
+                        unsigned int    cpu_job_no[NR_CPUS_EDF_FM];
+                } fm;
+        } semi_part;
 };
 
 /*      Possible RT flags       */