X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=common.h;h=01426a4d66bee75772507710221b3a99a02c49f0;hp=c861285a8ab12c3c73720e357679ec84d4bc8269;hb=bca0ba0915c24c008381dca02cb954b725d7817c;hpb=9d9c0f4e9909c2f58889e198a065479003f7bced

diff --git a/common.h b/common.h
index c861285a..01426a4d 100644
--- a/common.h
+++ b/common.h
@@ -8,12 +8,13 @@
 #include <stdio.h>
 #include "config.h"
 
-extern FILE *model_out;
+extern int model_out;
+extern int switch_alloc;
 
-#define model_print(fmt, ...) do { fprintf(model_out, fmt, ##__VA_ARGS__); } while (0)
+#define model_print(fmt, ...) do { switch_alloc = 1; dprintf(model_out, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
 
 #ifdef CONFIG_DEBUG
-#define DEBUG(fmt, ...) do { model_print("*** %15s:%-4d %25s() *** " fmt, __FILE__, __LINE__, __func__, ##__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
@@ -26,22 +27,20 @@ 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(); \
-		model_print_summary(); \
-		assert_hook();				 \
-		exit(EXIT_FAILURE); \
-	} \
-} while (0)
+	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)
 #else
 #define ASSERT(expr) \
 	do { } while (0)
-#endif /* CONFIG_ASSERT */
+#endif	/* CONFIG_ASSERT */
 
 #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
 void print_trace(void);
-void model_print_summary(void);
-#endif /* __COMMON_H__ */
+#endif	/* __COMMON_H__ */