Changeset 9d47440 in mainline for uspace/lib/c/generic/assert.c

Timestamp:

2011-05-21T16:23:17Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ff03f3

Parents:

8d308b9 (diff), 13f2461 (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 mainline changes.

File:

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

uspace/lib/c/generic/assert.c

@@ -33 +33 @@
 #include <assert.h>
 #include <stdio.h>
+#include <io/klog.h>
 #include <stdlib.h>
+#include <atomic.h>
 #include <stacktrace.h>
 
-void assert_abort(const char *cond, const char *file, unsigned int line)
+#define MSG_START       "Assertion failed ("
+#define MSG_FILE        ") in file \""
+#define MSG_LINE        "\", line "
+#define MSG_END         ".\n"
+
+static atomic_t failed_asserts;
+
+void assert_abort(const char *cond, const char *file, const char *line)
 {
-        printf("Assertion failed (%s) in file \"%s\", line %u.\n",
+        /*
+         * Send the message safely to klog. Nested asserts should not occur.
+         */
+        klog_write(MSG_START, str_size(MSG_START));
+        klog_write(cond, str_size(cond));
+        klog_write(MSG_FILE, str_size(MSG_FILE));
+        klog_write(file, str_size(file));
+        klog_write(MSG_LINE, str_size(MSG_LINE));
+        klog_write(line, str_size(line));
+        klog_write(MSG_END, str_size(MSG_END));
+
+        /*
+         * Check if this is a nested or parallel assert.
+         */
+        if (atomic_postinc(&failed_asserts))
+                abort();
+        
+        /*
+         * Attempt to print the message to standard output and display
+         * the stack trace. These operations can theoretically trigger nested
+         * assertions.
+         */
+        printf(MSG_START "%s" MSG_FILE "%s" MSG_LINE "%s" MSG_END,
             cond, file, line);
         stacktrace_print();
+
         abort();
 }