X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=62c16f45250e55a693864fd17759b9673d0220d6;hb=130a35155171503883aaf18e57f8957ce63d06e8;hp=80bc9ad6e8c6977fb3622b8754c1982cf64c25f5;hpb=70515e16c177a40e1053285262ff34e10c33e57e;p=model-checker.git

diff --git a/common.h b/common.h
index 80bc9ad..62c16f4 100644
--- a/common.h
+++ b/common.h
@@ -8,9 +8,13 @@
 #include <stdio.h>
 #include "config.h"
 
+extern int model_out;
+
+#define model_print(fmt, ...) do { dprintf(model_out, fmt, ##__VA_ARGS__); } while (0)
+
 #ifdef CONFIG_DEBUG
-#define DEBUG(fmt, ...) do { printf("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
-#define DBG() DEBUG("\n");
+#define DEBUG(fmt, ...) do { model_print("*** %15s:%-4d %25s() *** " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); } while (0)
+#define DBG() DEBUG("\n")
 #define DBG_ENABLED() (1)
 #else
 #define DEBUG(fmt, ...)
@@ -18,16 +22,24 @@
 #define DBG_ENABLED() (0)
 #endif
 
+void assert_hook(void);
+
+#ifdef CONFIG_ASSERT
 #define ASSERT(expr) \
 do { \
 	if (!(expr)) { \
 		fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
+		/* print_trace(); // Trace printing may cause dynamic memory allocation */ \
+		assert_hook();				 \
 		exit(EXIT_FAILURE); \
 	} \
-} while (0);
+} while (0)
+#else
+#define ASSERT(expr) \
+	do { } while (0)
+#endif /* CONFIG_ASSERT */
 
 #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
 void print_trace(void);
-
 #endif /* __COMMON_H__ */