Changeset 8264867 in mainline for kernel/generic/src/synch

Timestamp:

2012-05-08T10:47:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fce7b43

Parents:

99d05e1 (diff), 8d2d308f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/mm.

Location:

kernel/generic/src/synch

Files:

• mutex.c (modified) (2 diffs)
• spinlock.c (modified) (3 diffs)

kernel/generic/src/synch/mutex.c

@@ -40 +40 @@
 #include <debug.h>
 #include <arch.h>
+#include <stacktrace.h>
 
 /** Initialize mutex.
@@ -87 +88 @@
                 ASSERT(!(flags & SYNCH_FLAGS_INTERRUPTIBLE));
                 
+                unsigned int cnt = 0;
+                bool deadlock_reported = false;
                 do {
+                        if (cnt++ > DEADLOCK_THRESHOLD) {
+                                printf("cpu%u: looping on active mutex %p\n",
+                                    CPU->id, mtx);
+                                stack_trace();
+                                cnt = 0;
+                                deadlock_reported = true;
+                        }
                         rc = semaphore_trydown(&mtx->sem);
                 } while (SYNCH_FAILED(rc) &&
                     !(flags & SYNCH_FLAGS_NON_BLOCKING));
+                if (deadlock_reported)
+                        printf("cpu%u: not deadlocked\n", CPU->id);
         }
 

kernel/generic/src/synch/spinlock.c

@@ -44 +44 @@
 #include <debug.h>
 #include <symtab.h>
+#include <stacktrace.h>
 
 #ifdef CONFIG_SMP
@@ -104 +105 @@
                             "caller=%p (%s)\n", CPU->id, lock, lock->name,
                             (void *) CALLER, symtab_fmt_name_lookup(CALLER));
+                        stack_trace();
                         
                         i = 0;
@@ -260 +262 @@
         int rc = spinlock_trylock(&(lock->lock));
         
-        ASSERT_IRQ_SPINLOCK(!lock->guard, lock);
+        ASSERT_IRQ_SPINLOCK(!rc || !lock->guard, lock);
         return rc;
 }