Changeset 2d93f1f9 in mainline for generic/src/synch

Timestamp:

2005-12-06T21:58:18Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a80d406

Parents:

36e7b6c3

Message:

Named spinlocks

Location:

generic/src/synch

Files:

• rwlock.c (modified) (1 diff)
• spinlock.c (modified) (3 diffs)
• waitq.c (modified) (1 diff)

generic/src/synch/rwlock.c

@@ -76 +76 @@
  */
 void rwlock_initialize(rwlock_t *rwl) {
-        spinlock_initialize(&rwl->lock);
+        spinlock_initialize(&rwl->lock, "rwlock");
         mutex_initialize(&rwl->exclusive);
         rwl->readers_in = 0;

generic/src/synch/spinlock.c

@@ -34 +34 @@
 #include <print.h>
 #include <debug.h>
+#include <symtab.h>
 
 #ifdef CONFIG_SMP
@@ -43 +44 @@
  * @param sl Pointer to spinlock_t structure.
  */
-void spinlock_initialize(spinlock_t *sl)
+void spinlock_initialize(spinlock_t *sl, char *name)
 {
         sl->val = 0;
+#ifdef CONFIG_DEBUG_SPINLOCK
+        sl->name = name;
+#endif  
 }
 
@@ -60 +64 @@
 {
         int i = 0;
-        __address caller = ((__u32 *) &sl)[-1];
+        __address caller = ((__address *) &sl)[-1];
+        char *symbol;
 
         preemption_disable();
         while (test_and_set(&sl->val)) {
                 if (i++ > 300000) {
-                        printf("cpu%d: looping on spinlock %X, caller=%X\n", CPU->id, sl, caller);
+                        printf("cpu%d: looping on spinlock %p:%s, caller=%p",
+                               CPU->id, sl, sl->name, caller);
+                        symbol = get_symtab_entry(caller);
+                        if (symbol)
+                                printf("(%s)", symbol);
+                        printf("\n");
                         i = 0;
                 }

generic/src/synch/waitq.c

@@ -47 +47 @@
 void waitq_initialize(waitq_t *wq)
 {
-        spinlock_initialize(&wq->lock);
+        spinlock_initialize(&wq->lock, "waitq_lock");
         list_initialize(&wq->head);
         wq->missed_wakeups = 0;