X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fcommon.h;h=fac5a0bef27eaded2e5993406bf8c7a30d7c51ee;hb=89ac8c797bdb2299765ea6348a1e51b912805acd;hp=3fffb3419b88f3dc516c48ea915af6f7cb13167c;hpb=8762ed97c242788e724b509b705a308868eb4974;p=satune.git

diff --git a/src/common.h b/src/common.h
index 3fffb34..fac5a0b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -18,20 +18,19 @@
 #include "config.h"
 #include "time.h"
 
-/*
-   extern int model_out;
-   extern int model_err;
-   extern int switch_alloc;
+#if 1
+extern int model_out;
+extern int model_err;
+extern int switch_alloc;
 
- #define model_dprintf(fd, fmt, ...) do { switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
+#define model_dprintf(fd, fmt, ...) do { switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
 
- #define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
-
- #define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
-
- */
-
-#define model_print printf
+#define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
+#define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
+#else
+    #define model_print printf
+#endif
+#define model_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} while(0)
 
 #define NEXTPOW2(x) ((x == 1) ? 1 : (1 << (sizeof(uint) * 8 - __builtin_clz(x - 1))))
 #define NUMBITS(x) ((x == 0) ? 0 : 8 * sizeof(x) - __builtin_clz(x))
@@ -69,7 +68,7 @@ void print_trace(void);
 
 static inline long long getTimeNano() {
 	struct timespec time;
-	clock_gettime(CLOCK_REALTIME, & time);
+	clock_gettime(CLOCK_REALTIME, &time);
 	return time.tv_sec * 1000000000 + time.tv_nsec;
 }
 #endif/* __COMMON_H__ */