Don't call printf

[c11tester.git] / common.h

diff --git a/common.h b/common.h
index 1071135892ac11508c52459eee99e8d8da3ab254..67ef78634923118c9055961b5fc73c32470ce57b 100644 (file)
--- a/common.h
+++ b/common.h
@@ -6,14 +6,29 @@
 #define __COMMON_H__
 
 #include <stdio.h>
+#include <unistd.h>
 #include "config.h"
+#include "printf.h"
 
 extern int model_out;
-
-#define model_print(fmt, ...) do { dprintf(model_out, fmt, ##__VA_ARGS__); } while (0)
+extern int switch_alloc;
+
+#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)
+#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 +41,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__ */