1 files changed, 34 insertions, 2 deletions

diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index cc62fa0cb044..660bfc7f8174 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -11,6 +11,7 @@ struct nested_info
         struct litmus_lock *lock;
         struct task_struct *hp_waiter_eff_prio;
         struct task_struct **hp_waiter_ptr;
+        struct task_struct **owner_ptr;
     struct binheap_node hp_binheap_node;
 };
 
@@ -30,6 +31,8 @@ struct litmus_lock_proc_ops {
         void (*remove)(struct litmus_lock *l);
 };
 
+
+
 /* Generic base struct for LITMUS^RT userspace semaphores.
  * This structure should be embedded in protocol-specific semaphores.
  */
@@ -41,10 +44,8 @@ struct litmus_lock {
 
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
         struct nested_info nest;
-//#ifdef CONFIG_DEBUG_SPINLOCK
         char cheat_lockdep[2];
         struct lock_class_key key;
-//#endif
 #endif
 
         struct litmus_lock_proc_ops *proc;
@@ -71,7 +72,32 @@ void select_next_lock(dgl_wait_state_t* dgl_wait /*, struct litmus_lock* prev_lo
 void init_dgl_waitqueue_entry(wait_queue_t *wq_node, dgl_wait_state_t* dgl_wait);
 int dgl_wake_up(wait_queue_t *wq_node, unsigned mode, int sync, void *key);
 void __waitqueue_dgl_remove_first(wait_queue_head_t *wq, dgl_wait_state_t** dgl_wait, struct task_struct **task);
+
+
+int __attempt_atomic_dgl_acquire(struct litmus_lock *cur_lock, dgl_wait_state_t *dgl_wait);
+#endif
+
+
+
+
+static inline struct task_struct* get_queued_task(wait_queue_t* q)
+{
+        struct task_struct *queued;
+#ifdef CONFIG_LITMUS_DGL_SUPPORT
+        if(q->func == dgl_wake_up) {
+                dgl_wait_state_t *dgl_wait = (dgl_wait_state_t*) q->private;
+                queued = dgl_wait->task;
+        }
+        else {
+                queued = (struct task_struct*) q->private;
+        }
+#else
+        queued = (struct task_struct*) q->private;
 #endif
+        return queued;
+}
+
+
 
 typedef int (*lock_op_t)(struct litmus_lock *l);
 typedef lock_op_t lock_close_t;
@@ -94,16 +120,22 @@ struct litmus_lock_ops {
         /* The lock is no longer being referenced (mandatory method). */
         lock_free_t deallocate;
 
+        
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
         void (*propagate_increase_inheritance)(struct litmus_lock* l, struct task_struct* t, raw_spinlock_t* to_unlock, unsigned long irqflags);
         void (*propagate_decrease_inheritance)(struct litmus_lock* l, struct task_struct* t, raw_spinlock_t* to_unlock, unsigned long irqflags);
 #endif
 
+        
 #ifdef CONFIG_LITMUS_DGL_SUPPORT
         raw_spinlock_t* (*get_dgl_spin_lock)(struct litmus_lock *l);
         int (*dgl_lock)(struct litmus_lock *l, dgl_wait_state_t* dgl_wait, wait_queue_t* wq_node);
         int (*is_owner)(struct litmus_lock *l, struct task_struct *t);
         void (*enable_priority)(struct litmus_lock *l, dgl_wait_state_t* dgl_wait);
+        
+        int (*dgl_can_quick_lock)(struct litmus_lock *l, struct task_struct *t);
+        void (*dgl_quick_lock)(struct litmus_lock *l, struct litmus_lock *cur_lock,
+                  struct task_struct* t, wait_queue_t *q);
 #endif
 };