Small edit

[satune.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 5d8c389710200942c30681065f12a367696d430a..3fffb3419b88f3dc516c48ea915af6f7cb13167c 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -16,24 +16,25 @@
 
 #include <stdio.h>
 #include "config.h"
+#include "time.h"
 
 /*
-extern int model_out;
-extern int model_err;
-extern int switch_alloc;
+   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(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_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
 
-*/
+ */
 
 #define model_print printf
 
-#define NEXTPOW2(x) (1<<(sizeof(uint)*8-__builtin_clz(x-1)))
-#define NUMBITS(x) ((x==0) ? 0 : 8*sizeof(x)-__builtin_clz(x))
+#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)
@@ -65,4 +66,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__ */