Check point commit for merging CE with MC plugin.

Also started to fix typos in Jonathan's code, but there were too many
after I realized that event_group.o was not in the LITMUS Makefile.

2 files changed, 30 insertions, 5 deletions

diff --git a/include/litmus/event_group.h b/include/litmus/event_group.h
index 10b60fab2a8f..f17631e4e230 100644
--- a/include/litmus/event_group.h
+++ b/include/litmus/event_group.h
@@ -12,8 +12,8 @@ typedef struct event_group {
         lt_t                    res;
         int                     cpu;
         struct list_head        event_queue[EVENT_QUEUE_SLOTS];
-        raw_spin_lock_t         queue_lock;
-} timer_group_t;
+        raw_spinlock_t  queue_lock;
+} event_group_t;
 
 /**
  * event_list_t - A group of actions to fire at a given time
@@ -27,7 +27,7 @@ typedef struct event_list {
         struct hrtimer_start_on_info    info;
 
         struct list_head list;  /* For event_queue */
-        timer_group_t*   group; /* For callback    */
+        event_group_t *group; /* For callback    */
 } event_list_t;
 
 /**
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index d29796298701..95cd22cd7202 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -1,8 +1,6 @@
 #ifndef _LINUX_SCHED_MC_H_
 #define _LINUX_SCHED_MC_H_
 
-#include <litmus/rt_param.h>
-
 /* criticality levels */
 enum crit_level {
         /* probably don't need to assign these (paranoid) */
@@ -34,6 +32,33 @@ struct mc_data {
 #define tsk_mc_crit(t)   (tsk_mc_data(t)->mc_task.crit)
 #define is_ghost(t)      (tsk_mc_data(t)->mc_job.is_ghost)
 
+/*
+ * Cache the budget along with the struct PID for a task so that we don't need
+ * to fetch its task_struct every time we check to see what should be
+ * scheduled.
+ */
+struct ce_dom_pid_entry {
+        struct pid *pid;
+        lt_t budget;
+        /* accumulated (summed) budgets, including this one */
+        lt_t acc_time;
+        int expected_job;
+};
+
+struct ce_dom_data {
+        int cpu;
+        struct task_struct *scheduled, *should_schedule;
+        /*
+         * Each CPU needs a mapping of level A ID (integer) to struct pid so
+         * that we can get its task struct.
+         */
+        struct ce_dom_pid_entry pid_entries[CONFIG_PLUGIN_MC_LEVEL_A_MAX_TASKS];
+        int num_pid_entries;
+        lt_t cycle_time;
+        struct hrtimer_start_on_info timer_info;
+        struct hrtimer timer;
+};
+
 #endif /* __KERNEL__ */
 
 #endif