X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcommon.h;h=3a0eeaa01c4dd3a0ad0c8e9f7416968ef323f968;hp=d9e6d4346dc525e00fa8d676080bc577cdbeab46;hb=d106cc1899b1f3d82cc35a60d77b2c87f8355fdd;hpb=72621e530c9047773984cb62b4846446a5e9b78b

diff --git a/src/common.h b/src/common.h
index d9e6d43..3a0eeaa 100644
--- a/src/common.h
+++ b/src/common.h
@@ -16,23 +16,26 @@
 
 #include <stdio.h>
 #include "config.h"
+#include "time.h"
 
-/*
+
+#if 0
 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 { int oldsw = switch_alloc; switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = oldsw; } 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)
+#else
+#define model_print printf
+#endif
 
-*/
 
-#define model_print printf
 
-#define NEXTPOW2(x) (1<<(sizeof(uint)*8-__builtin_clz(x-1)))
+#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))
 
 #ifdef CONFIG_DEBUG
 #define DEBUG(fmt, ...) do { model_print("*** %15s:%-4d %25s() *** " fmt, __FILE__, __LINE__, __func__, ## __VA_ARGS__); } while (0)
@@ -52,9 +55,9 @@ void assert_hook(void);
 		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); \
-		} \
+			assert_hook();													 \
+			exit(EXIT_FAILURE);	\
+		}	\
 	} while (0)
 #else
 #define ASSERT(expr) \
@@ -64,4 +67,10 @@ void assert_hook(void);
 #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
 void print_trace(void);
+
+static inline long long getTimeNano() {
+	struct timespec time;
+	clock_gettime(CLOCK_REALTIME, &time);
+	return time.tv_sec * 1000000000 + time.tv_nsec;
+}
 #endif/* __COMMON_H__ */