Changeset 78d3dd5 for src/libcfa/assert.c

Timestamp:

Mar 31, 2017, 12:24:39 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5ea06d6

Parents:

72dc82a (diff), 077810d (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 branches 'master' and 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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();
         }