Checkpoint commit. Testing begins.

2 files changed, 45 insertions, 15 deletions

diff --git a/include/litmus/ce_domain.h b/include/litmus/ce_domain.h
new file mode 100644
index 000000000000..373f3f5f78d3
--- /dev/null
+++ b/include/litmus/ce_domain.h
@@ -0,0 +1,23 @@
+#ifndef _LITMUS_CE_DOMAIN_H
+#define _LITMUS_CE_DOMAIN_H
+
+/*
+ * Functions that the MC plugin needs to call through a domain pointer.
+ */
+void ce_requeue(domain_t*, struct task_struct*);
+struct task_struct* ce_peek_and_take_ready(domain_t*);
+int ce_higher_prio(struct task_struct*, struct task_struct*);
+
+typedef enum hrtimer_restart (*ce_timer_callback_t)(struct hrtimer*);
+
+void ce_domain_init(domain_t*,
+                raw_spinlock_t*,
+                requeue_t,
+                peek_ready_t,
+                take_ready_t,
+                preempt_needed_t,
+                task_prio_t,
+                struct ce_dom_data*,
+                const int,
+                ce_timer_callback_t);
+#endif
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index ad5d097b3d61..384e65e4151d 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -21,7 +21,10 @@ struct mc_job {
 };
 
 #ifdef __KERNEL__
-/* only used in the kernel (no user space) */
+/*
+ * These are used only in the kernel. Userspace programs like RTSpin won't see
+ * them.
+ */
 
 struct mc_data {
         struct mc_task mc_task;
@@ -33,18 +36,8 @@ struct mc_data {
 #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.
+ * The MC-CE scheduler uses this as domain data.
  */
-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;
@@ -52,9 +45,6 @@ struct ce_dom_data {
          * 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;
 };
@@ -90,6 +80,23 @@ typedef struct {
         crit_entry_t*   crit_entry;
 } domain_data_t;
 
+/*
+ * Functions that are used with the MC-CE plugin.
+ */
+long mc_ce_set_domains(const int, domain_data_t*[]);
+unsigned int mc_ce_get_expected_job(const int, const int);
+
+/*
+ * These functions are (lazily) inserted into the MC plugin code so that it
+ * manipulates the MC-CE state.
+ */
+long mc_ce_admit_task_common(struct task_struct*);
+void mc_ce_task_exit_common(struct task_struct*);
+void mc_ce_timer_callback_common(domain_t*, struct hrtimer*);
+void mc_ce_release_at_common(struct task_struct*, lt_t);
+long mc_ce_activate_plugin_common(void);
+long mc_ce_deactivate_plugin_common(void);
+
 #endif /* __KERNEL__ */
 
 #endif