checkpoint for aux_tasks. can still deadlock

4 files changed, 55 insertions, 3 deletions

diff --git a/include/litmus/aux_tasks.h b/include/litmus/aux_tasks.h
new file mode 100644
index 000000000000..8e50ac85b082
--- /dev/null
+++ b/include/litmus/aux_tasks.h
@@ -0,0 +1,33 @@
+#ifndef LITMUS_AUX_taskS
+#define LITMUS_AUX_taskS
+
+struct task_struct;
+
+#define MAGIC_AUX_TASK_PERIOD ~((lt_t)0)
+
+/* admit an aux task with default parameters */
+//int admit_aux_task(struct task_struct *t);
+
+/* call on an aux task when it exits real-time */
+int exit_aux_task(struct task_struct *t);
+
+/* call when an aux_owner becomes real-time */
+long enable_aux_task_owner(struct task_struct *t);
+
+/* call when an aux_owner exits real-time */
+long disable_aux_task_owner(struct task_struct *t);
+
+
+/* collectivelly make all aux tasks in the process of leader inherit from hp */
+//int aux_tasks_increase_priority(struct task_struct *leader, struct task_struct *hp);
+
+/* collectivelly make all aux tasks in the process of leader inherit from hp */
+//int aux_tasks_decrease_priority(struct task_struct *leader, struct task_struct *hp);
+
+/* call when an aux_owner increases its priority */
+int aux_task_owner_increase_priority(struct task_struct *t);
+
+/* call when an aux_owner decreases its priority */
+int aux_task_owner_decrease_priority(struct task_struct *t);
+
+#endif
\ No newline at end of file
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 1d70ab713571..f9829167294d 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -44,6 +44,7 @@ void litmus_exit_task(struct task_struct *tsk);
         ((t)->rt_param.transition_pending)
 
 #define tsk_rt(t)               (&(t)->rt_param)
+#define tsk_aux(t)              (&(t)->aux_data)
 
 /*      Realtime utility macros */
 #define get_rt_flags(t)         (tsk_rt(t)->flags)
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 02b750a9570b..2a6c70f1dd37 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -285,9 +285,13 @@ struct rt_param {
 #endif
 
         
-         struct task_struct*    hp_group;
-         unsigned int                   is_slave:1;
-         unsigned int                   has_slaves:1;
+#ifdef CONFIG_LITMUS_LOCKING
+        unsigned int            is_aux_task:1;
+        unsigned int            has_aux_tasks:1;
+        
+        struct list_head        aux_task_node;
+        struct binheap_node     aux_task_owner_node;
+#endif
 
 
 #ifdef CONFIG_NP_SECTION
@@ -354,6 +358,13 @@ struct rt_param {
         struct control_page * ctrl_page;
 };
 
+struct aux_data
+{
+        struct list_head        aux_tasks;
+        struct binheap          aux_task_owners;
+        unsigned int            initialized:1;
+};
+
 /*      Possible RT flags       */
 #define RT_F_RUNNING            0x00000000
 #define RT_F_SLEEP              0x00000001
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 24a6858b4b0b..bd75e7c09a10 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -70,6 +70,10 @@ typedef long (*allocate_affinity_observer_t) (
 
 typedef void (*increase_prio_t)(struct task_struct* t, struct task_struct* prio_inh);
 typedef void (*decrease_prio_t)(struct task_struct* t, struct task_struct* prio_inh);
+
+typedef int (*__increase_prio_t)(struct task_struct* t, struct task_struct* prio_inh);
+typedef int (*__decrease_prio_t)(struct task_struct* t, struct task_struct* prio_inh);
+
 typedef void (*nested_increase_prio_t)(struct task_struct* t, struct task_struct* prio_inh,
                                                                           raw_spinlock_t *to_unlock, unsigned long irqflags);
 typedef void (*nested_decrease_prio_t)(struct task_struct* t, struct task_struct* prio_inh,
@@ -146,6 +150,9 @@ struct sched_plugin {
         allocate_lock_t         allocate_lock;
         increase_prio_t         increase_prio;
         decrease_prio_t         decrease_prio;
+        
+        __increase_prio_t       __increase_prio;
+        __decrease_prio_t       __decrease_prio;
 #endif
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
         nested_increase_prio_t nested_increase_prio;