Changeset 12c38f5 in mainline

Timestamp:

2010-10-25T18:48:26Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

619e2a6b

Parents:

1fa010c

Message:

Do not attempt to print the caller's stack twice in print_deadlock().
Print the matching "waits for" - "owned by" pair together.

File:

• uspace/lib/c/generic/fibril_synch.c (modified) (1 diff)

uspace/lib/c/generic/fibril_synch.c

@@ -73 +73 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
 
-        printf("Deadlock detected: ");
+        printf("Deadlock detected.\n");
+        stacktrace_print();
 
         printf("Fibril %p waits for primitive %p.\n", f, oi);
-        stacktrace_print();
 
         while (oi && oi->owned_by) {
-                printf(". ");
                 printf("Primitive %p is owned by fibril %p.\n",
                     oi, oi->owned_by);
+                if (oi->owned_by == f)
+                        break;
                 stacktrace_print_fp_pc(oi->owned_by->ctx.ebp,
                     oi->owned_by->ctx.pc);
-                if (oi->owned_by == f)
-                        break;
                 printf("Fibril %p waits for primitive %p.\n",
                      oi->owned_by, oi->owned_by->waits_for);