Changeset 8119363 in mainline for uspace/lib/c/generic/assert.c

Timestamp:

2018-06-26T17:35:40Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

6e569bf

Parents:

fbfe59d (diff), e768aea (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 some preliminary async/fibril framework changes.

File:

• uspace/lib/c/generic/assert.c (modified) (4 diffs)

uspace/lib/c/generic/assert.c

@@ -38 +38 @@
 #include <stacktrace.h>
 #include <stdint.h>
+#include <task.h>
 
 static atomic_t failed_asserts = { 0 };
@@ -46 +47 @@
          * Send the message safely to kio. Nested asserts should not occur.
          */
-        kio_printf("Assertion failed (%s) in file \"%s\", line %u.\n",
-            cond, file, line);
+        kio_printf("Assertion failed (%s) in task %ld, file \"%s\", line %u.\n",
+            cond, (long) task_get_id(), file, line);
+
+        stacktrace_kio_print();
 
         /* Sometimes we know in advance that regular printf() would likely fail. */
@@ -58 +61 @@
          * Send the message safely to kio. Nested asserts should not occur.
          */
-        kio_printf("Assertion failed (%s) in file \"%s\", line %u.\n",
-            cond, file, line);
+        kio_printf("Assertion failed (%s) in task %ld, file \"%s\", line %u.\n",
+            cond, (long) task_get_id(), file, line);
+
+        stacktrace_kio_print();
 
         /*
@@ -72 +77 @@
          * assertions.
          */
-        printf("Assertion failed (%s) in file \"%s\", line %u.\n",
-            cond, file, line);
+        kio_printf("Assertion failed (%s) in task %ld, file \"%s\", line %u.\n",
+            cond, (long) task_get_id(), file, line);
         stacktrace_print();