Minor changes to lock proc

3 files changed, 6 insertions, 4 deletions

diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index 22f7372bf621..cc62fa0cb044 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -24,7 +24,7 @@ static inline struct task_struct* top_priority(struct binheap* handle) {
 void print_hp_waiters(struct binheap_node* n, int depth);
 #endif
 
-#define LOCK_NAME_LEN 16
+#define LOCK_NAME_LEN 32
 struct litmus_lock_proc_ops {
         void (*add)(struct litmus_lock *l);
         void (*remove)(struct litmus_lock *l);
diff --git a/litmus/locking.c b/litmus/locking.c
index b7f02f0e6b24..81a1fc9bdd12 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -66,7 +66,7 @@ static  int create_generic_lock(void** obj_ref, obj_type_t type, void* __user ar
                 lock->ident = atomic_inc_return(&lock_id_gen);
                 *obj_ref = lock;
 
-                TRACE_CUR("Lock %d created. Type = %d\n.", lock->ident, type);
+                TRACE_CUR("Lock %d (%p) created. Type = %d\n.", lock->ident, lock, type);
 
                 if (lock->proc && lock->proc->add) {
                         lock->proc->add(lock);
diff --git a/litmus/rsm_lock.c b/litmus/rsm_lock.c
index ae6dd3fb237b..dcf44a848cbb 100644
--- a/litmus/rsm_lock.c
+++ b/litmus/rsm_lock.c
@@ -531,6 +531,8 @@ out:
 #endif
         unlock_global_irqrestore(dgl_lock, flags);
 
+        TRACE_TASK(t, "-- Freed lock %d --\n", l->ident);
+
         return err;
 }
 
@@ -803,7 +805,7 @@ static int rsm_proc_print(char *page, char **start, off_t off, int count, int *e
         }
 
         if (locked) {
-                w = scnprintf(next, size, "%s:\n", mutex->litmus_lock.name);
+                w = scnprintf(next, size, "%s (mutex: %p, data: %p):\n", mutex->litmus_lock.name, mutex, data);
                 size -= w;
                 next += w;
 
@@ -903,7 +905,7 @@ static int rsm_proc_print(char *page, char **start, off_t off, int count, int *e
 
 static void rsm_proc_add(struct litmus_lock* l)
 {
-        snprintf(l->name, LOCK_NAME_LEN, "rsm-%d", l->ident);
+        snprintf(l->name, LOCK_NAME_LEN, "rsm-%d_%p", l->ident, l);
 
         l->proc_entry = litmus_add_proc_lock(l, rsm_proc_print);
 }