Changeset 13f2461 in mainline for uspace/lib/c/generic/assert.c

Timestamp:

2011-05-21T15:45:48Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9d47440, e06e2716

Parents:

faeb7cc

Message:

Merge the functionality of assert_abort() and assert_static_abort() into
assert_abort().

Print the unexpanded message to klog first. Then try to print the
message and the stack trace to standard output using printf. Use the
same unabbreviated message wording for both klog and stdout. If a
nested or a parallel assert is detected, send the message only to klog
and then abort.

Re-introduce malloc_assert() to up the malloc_futex. This appears to be
inevitable if we want to print to stdout. To prevent undesired macro
expansion, call assert_abort() from malloc_assert() directly.

File:

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

uspace/lib/c/generic/assert.c

@@ -35 +35 @@
 #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();
-}
 
-void assert_static_abort(const char *msg)
-{
-        klog_write(msg, str_size(msg));
         abort();
 }