fix minor bugs. there is still a bug in GEDF PAI.

1 files changed, 21 insertions, 19 deletions

diff --git a/litmus/locking.c b/litmus/locking.c
index 48b548a61f63..cb11c04ed0d4 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -282,6 +282,8 @@ static long do_litmus_dgl_lock(dgl_wait_state_t *dgl_wait)
 
         dgl_wait->nr_remaining = dgl_wait->size;
 
+        TRACE_CUR("Locking DGL with size %d\n", dgl_wait->size);
+
         // try to acquire each lock.  enqueue (non-blocking) if it is unavailable.
         for(i = 0; i < dgl_wait->size; ++i) {
                 struct litmus_lock *l = dgl_wait->locks[i];
@@ -339,7 +341,7 @@ static long do_litmus_dgl_lock(dgl_wait_state_t *dgl_wait)
                 }
 
                 TRACE_CUR("Didn't have to suspend after all, but calling schedule() anyway.\n");
-                BUG();
+                //BUG();
         }
 
         raw_spin_unlock_irqrestore(dgl_lock, irqflags);
@@ -357,14 +359,14 @@ all_acquired:
         return 0;
 }
 
-//static int supports_dgl(struct litmus_lock *l)
-//{
-//      struct litmus_lock_ops* ops = l->ops;
-//
-//      return (ops->dgl_lock                   &&
-//                      ops->is_owner                   &&
-//                      ops->enable_priority);
-//}
+static int supports_dgl(struct litmus_lock *l)
+{
+        struct litmus_lock_ops* ops = l->ops;
+
+        return (ops->dgl_lock                   &&
+                        ops->is_owner                   &&
+                        ops->enable_priority);
+}
 
 asmlinkage long sys_litmus_dgl_lock(void* __user usr_dgl_ods, int dgl_size)
 {
@@ -393,11 +395,11 @@ asmlinkage long sys_litmus_dgl_lock(void* __user usr_dgl_ods, int dgl_size)
                 struct od_table_entry *entry = get_entry_for_od(dgl_ods[i]);
                 if(entry && is_lock(entry)) {
                         dgl_wait_state.locks[i] = get_lock(entry);
-//                      if(!supports_dgl(dgl_wait_state.locks[i])) {
-//                              TRACE_CUR("Lock %d does not support all required DGL operations.\n",
-//                                                dgl_wait_state.locks[i]->ident);
-//                              goto out;
-//                      }
+                        if(!supports_dgl(dgl_wait_state.locks[i])) {
+                                TRACE_CUR("Lock %d does not support all required DGL operations.\n",
+                                                  dgl_wait_state.locks[i]->ident);
+                                goto out;
+                        }
                 }
                 else {
                         TRACE_CUR("Invalid lock identifier\n");
@@ -468,11 +470,11 @@ asmlinkage long sys_litmus_dgl_unlock(void* __user usr_dgl_ods, int dgl_size)
                 entry = get_entry_for_od(dgl_ods[i]);
                 if(entry && is_lock(entry)) {
                         dgl_locks[i] = get_lock(entry);
-//                      if(!supports_dgl(dgl_locks[i])) {
-//                              TRACE_CUR("Lock %d does not support all required DGL operations.\n",
-//                                                dgl_locks[i]->ident);
-//                              goto out;
-//                      }
+                        if(!supports_dgl(dgl_locks[i])) {
+                                TRACE_CUR("Lock %d does not support all required DGL operations.\n",
+                                                  dgl_locks[i]->ident);
+                                goto out;
+                        }
                 }
                 else {
                         TRACE_CUR("Invalid lock identifier\n");