Don't call printf

[c11tester.git] / common.h

diff --git a/common.h b/common.h
index 81af78644ac0401a92c61ba20d82fa3711e0f401..67ef78634923118c9055961b5fc73c32470ce57b 100644 (file)
--- a/common.h
+++ b/common.h
@@ -6,12 +6,26 @@
 #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 { \
+    switch_alloc = 1;             \
+    char mprintbuf[256];                                               \
+    int printbuflen=snprintf_(mprintbuf, 256, fmt, ## __VA_ARGS__);    \
+    int lenleft = printbuflen < 256 ?printbuflen:256;                  \
+    int totalwritten = 0;\
+    while(lenleft) {                                                   \
+      int byteswritten=write(model_out, &mprintbuf[totalwritten], lenleft);\
+      lenleft-=byteswritten;                                           \
+      totalwritten+=byteswritten;                                      \
+    }                                                                  \
+    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)
@@ -32,7 +46,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