X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=2ac396bedc54f13363d0b491359b2c5440dd8c7d;hb=b9bb96ec1112fdf416296d4c49293eb5cbb6da41;hp=81af78644ac0401a92c61ba20d82fa3711e0f401;hpb=5d0368dd546d03580ae69f8058a3a4fdc31de83b;p=c11tester.git

diff --git a/common.h b/common.h
index 81af7864..2ac396be 100644
--- a/common.h
+++ b/common.h
@@ -6,12 +6,23 @@
 #define __COMMON_H__
 
 #include <stdio.h>
+#include <unistd.h>
 #include "config.h"
+#include "printf.h"
 
 extern int model_out;
-extern int switch_alloc;
 
-#define model_print(fmt, ...) do { switch_alloc = 1; dprintf(model_out, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
+#define model_print(fmt, ...) do { \
+		char mprintbuf[2048];                                                \
+		int printbuflen=snprintf_(mprintbuf, 2048, fmt, ## __VA_ARGS__);     \
+		int lenleft = printbuflen < 2048 ? printbuflen : 2048;                   \
+		int totalwritten = 0; \
+		while(lenleft) {                                                    \
+			int byteswritten=write(model_out, &mprintbuf[totalwritten], lenleft); \
+			lenleft-=byteswritten;                                            \
+			totalwritten+=byteswritten;                                       \
+		}                                                                   \
+} while (0)
 
 #ifdef CONFIG_DEBUG
 #define DEBUG(fmt, ...) do { model_print("*** %15s:%-4d %25s() *** " fmt, __FILE__, __LINE__, __func__, ## __VA_ARGS__); } while (0)
@@ -32,7 +43,7 @@ void assert_hook(void);
 			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); \
+			_Exit(EXIT_FAILURE); \
 		} \
 	} while (0)
 #else