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

diff --git a/common.h b/common.h
index b1d6b31..62c16f4 100644
--- a/common.h
+++ b/common.h
@@ -8,10 +8,12 @@
 #include <stdio.h>
 #include "config.h"
 
-#define model_print(fmt, ...) do { printf(fmt, ##__VA_ARGS__); } while (0)
+extern int model_out;
+
+#define model_print(fmt, ...) do { dprintf(model_out, fmt, ##__VA_ARGS__); } while (0)
 
 #ifdef CONFIG_DEBUG
-#define DEBUG(fmt, ...) do { model_print("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
+#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
@@ -27,8 +29,7 @@ void assert_hook(void);
 do { \
 	if (!(expr)) { \
 		fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
-		print_trace(); \
-		model_print_summary(); \
+		/* print_trace(); // Trace printing may cause dynamic memory allocation */ \
 		assert_hook();				 \
 		exit(EXIT_FAILURE); \
 	} \
@@ -41,5 +42,4 @@ do { \
 #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
 void print_trace(void);
-void model_print_summary(void);
 #endif /* __COMMON_H__ */