common: make model_print() use OS file descriptor, not C library FILE*

[model-checker.git] / common.h

diff --git a/common.h b/common.h
index 2dc8b7d9e8e59457fd4bfee6b850af028414d9c9..1071135892ac11508c52459eee99e8d8da3ab254 100644 (file)
--- a/common.h
+++ b/common.h
@@ -8,9 +8,13 @@
 #include <stdio.h>
 #include "config.h"
 
+extern int model_out;
+
+#define model_print(fmt, ...) do { dprintf(model_out, fmt, ##__VA_ARGS__); } while (0)
+
 #ifdef CONFIG_DEBUG
-#define DEBUG(fmt, ...) do { printf("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
-#define DBG() DEBUG("\n");
+#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
 #define DEBUG(fmt, ...)
@@ -18,19 +22,26 @@
 #define DBG_ENABLED() (0)
 #endif
 
+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);
+} while (0)
+#else
+#define ASSERT(expr) \
+       do { } while (0)
+#endif /* CONFIG_ASSERT */
 
 #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
 void print_trace(void);
 void model_print_summary(void);
-
 #endif /* __COMMON_H__ */