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

diff --git a/include/common.h b/include/common.h
index 8988ed0..2931c4d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -11,12 +11,13 @@
 #include <string.h>
 #include <sys/types.h>
 
-#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
+#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 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
@@ -45,7 +46,7 @@
 #define ERROR_UNSUPPORTED_FEATURE (-3)
 #define ERROR_TXN_NOT_RUNNING     (-4)
 
-#define VOLATILE(x) *((volatile typeof(x) *)&x)
+#define VOLATILE_DEREF(x) (*((volatile typeof(x))(x)))
 
 typedef unsigned long long uint64_t;
 typedef unsigned int       uint32_t;
@@ -53,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