Changes in src/libcfa/assert.c [57f408e:9d944b2]

File:

• src/libcfa/assert.c (modified) (3 diffs)

src/libcfa/assert.c

@@ -17 +17 @@
 #include "stdlib"                                                                               // abort
 
+#include "libhdr/libdebug.h"
+
 extern "C" {
         #include <stdarg.h>                                                             // varargs
@@ -23 +25 @@
         extern const char * __progname;                                         // global name of running executable (argv[0])
 
-        #define CFA_ASSERT_FMT "*CFA assertion error* from program \"%s\" in \"%s\" at line %d in file \"%s\""
+        #define CFA_ASSERT_FMT "Cforall Assertion error from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
         // called by macro assert in assert.h
         void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
-                fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file );
+                __lib_debug_print_safe( CFA_ASSERT_FMT ".\n", __progname, function, line, file );
                 abort();
         }
@@ -33 +35 @@
         // called by macro assertf
         void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) {
-                fprintf( stderr, CFA_ASSERT_FMT ": ", __progname, function, line, file );
+                __lib_debug_acquire();
+                __lib_debug_print_nolock( CFA_ASSERT_FMT ": ", __progname, function, line, file );
+
                 va_list args;
                 va_start( args, fmt );
-                vfprintf( stderr, fmt, args );
+                __lib_debug_print_vararg( fmt, args );
                 va_end( args );
-                fprintf( stderr, "\n" );
+
+                __lib_debug_print_nolock( "\n" );
+                __lib_debug_release();
                 abort();
         }