Work around changes in newer versions of glibc

[model-checker.git] / common.h

diff --git a/common.h b/common.h
index 088ef2da8fe0db69bd0038e2759352121b7b27ca..7be72d72f8e0b56fc8f333ffe25489685b053f60 100644 (file)
--- a/common.h
+++ b/common.h
@@ -1,14 +1,21 @@
+/** @file common.h
+ *  @brief General purpose macros.
+ */
+
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
 #include <stdio.h>
-#include <stdlib.h>
+#include "config.h"
+
+extern int model_out;
+extern int switch_alloc;
 
-#define CONFIG_DEBUG
+#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 { 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, ...)
@@ -16,19 +23,24 @@
 #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__); \
-               exit(1); \
+               /* print_trace(); // Trace printing may cause dynamic memory allocation */ \
+               assert_hook();                           \
+               exit(EXIT_FAILURE); \
        } \
-} while (0);
-
-
-void * myMalloc(size_t size);
-void myFree(void *ptr);
+} while (0)
+#else
+#define ASSERT(expr) \
+       do { } while (0)
+#endif /* CONFIG_ASSERT */
 
-#define userMalloc(size)       malloc(size)
-#define userFree(ptr)          free(ptr)
+#define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
+void print_trace(void);
 #endif /* __COMMON_H__ */