Changeset 82d56184 in mainline for uspace/lib/c/generic/assert.c

Timestamp:

2011-06-01T21:05:19Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5cac9cd

Parents:

682cfceb (diff), 5d1b3aa (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>
+#include <stdint.h>
+
+static atomic_t failed_asserts = {0};
 
 void assert_abort(const char *cond, const char *file, unsigned int line)
 {
+        /*
+         * Send the message safely to klog. Nested asserts should not occur.
+         */
+        klog_printf("Assertion failed (%s) in file \"%s\", line %u.\n",
+            cond, file, line);
+        
+        /*
+         * 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("Assertion failed (%s) in file \"%s\", line %u.\n",
             cond, file, line);
         stacktrace_print();
+        
         abort();
 }