X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=include%2Fcommon.h;h=2931c4d2bb031b8af7a2e1a550e08b013c6c2c05;hb=7d658a03f83e64690d0c71b4733dd3f9a2c60208;hp=a4fc7e3c0e27459d777821cfe59411e2b97c56a8;hpb=c7c053b290f15b7c8ba4f7327ead5a6fe836ec80;p=nbds

diff --git a/include/common.h b/include/common.h
index a4fc7e3..2931c4d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -11,16 +11,13 @@
 #include <string.h>
 #include <sys/types.h>
 
-#define malloc "DON'T USE MALLOC" // use nbd_malloc() instead
-#define calloc "DON'T USE CALLOC" // use nbd_malloc() instead
-#define free   "DON'T USE FREE"   // use nbd_free() instead
+#define MAX_NUM_THREADS  4 // make this whatever you want, but make it a power of 2
 
-#define MAX_NUM_THREADS 4 // make this whatever you want, but make it a power of 2
+#define CACHE_LINE_SIZE  64 // 64 byte cache line on x86 and x86-64
+#define CACHE_LINE_SCALE 6  // log base 2 of the cache line size
 
-#define CACHE_LINE_SIZE 64
-
-#define EXPECT_TRUE(x)     __builtin_expect(x, 1)
-#define EXPECT_FALSE(x)    __builtin_expect(x, 0)
+#define EXPECT_TRUE(x)     __builtin_expect(!!(x), 1)
+#define EXPECT_FALSE(x)    __builtin_expect(!!(x), 0)
 
 #define SYNC_SWAP          __sync_lock_test_and_set
 #define SYNC_CAS           __sync_val_compare_and_swap
@@ -44,10 +41,12 @@
 #define STRIP_TAG(v, tag) ((v) & ~tag)
 
 #define DOES_NOT_EXIST 0
-#define ERROR_INVALID_OPTION (-1)
-#define ERROR_INVALID_ARGUMENT (-2)
+#define ERROR_INVALID_OPTION      (-1)
+#define ERROR_INVALID_ARGUMENT    (-2)
 #define ERROR_UNSUPPORTED_FEATURE (-3)
-#define ERROR_TXN_NOT_RUNNING (-4)
+#define ERROR_TXN_NOT_RUNNING     (-4)
+
+#define VOLATILE_DEREF(x) (*((volatile typeof(x))(x)))
 
 typedef unsigned long long uint64_t;
 typedef unsigned int       uint32_t;
@@ -55,5 +54,11 @@ typedef unsigned char      uint8_t;
 
 typedef size_t markable_t;
 
+static inline uint64_t rdtsc (void) {
+    unsigned l, u;
+    __asm__ __volatile__("rdtsc" : "=a" (l), "=d" (u));
+    return ((uint64_t)u << 32) | l;
+}
+
 #include "lwt.h"
 #endif //COMMON_H