Changeset bed78cb in mainline for kernel/generic/src/synch/mutex.c

Timestamp:

2012-05-10T07:28:31Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

81a7858

Parents:

5b26747 (diff), fce7b43 (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 with mainline

File:

• kernel/generic/src/synch/mutex.c (modified) (3 diffs)

kernel/generic/src/synch/mutex.c

@@ -40 +40 @@
 #include <debug.h>
 #include <arch.h>
+#include <stacktrace.h>
 
 /** Initialize mutex.
@@ -61 +62 @@
         return semaphore_count_get(&mtx->sem) <= 0;
 }
+
+#define MUTEX_DEADLOCK_THRESHOLD        100000000
 
 /** Acquire mutex.
@@ -87 +90 @@
                 ASSERT(!(flags & SYNCH_FLAGS_INTERRUPTIBLE));
                 
+                unsigned int cnt = 0;
+                bool deadlock_reported = false;
                 do {
+                        if (cnt++ > MUTEX_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);
         }