X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=include%2Fcommon.h;h=d8811a9d0d5fa5bb1d9553b047e48dbd1e0ee5fa;hp=8988ed01debc6ec5224ef7b17e823a34fcceba63;hb=5aa9223647fbb52fa8941d92c8896ebaf148b41c;hpb=2b107655a1df8ae7703b44ef8cf1430a7250a5c3

diff --git a/include/common.h b/include/common.h
index 8988ed0..d8811a9 100644
--- a/include/common.h
+++ b/include/common.h
@@ -11,17 +11,20 @@
 #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
-#define SYNC_ADD           __sync_add_and_fetch
-#define SYNC_FETCH_AND_OR  __sync_fetch_and_or
+#define SYNC_SWAP           __sync_lock_test_and_set
+#define SYNC_CAS            __sync_val_compare_and_swap
+#define SYNC_ADD            __sync_add_and_fetch
+#define SYNC_FETCH_AND_OR   __sync_fetch_and_or
+
+#define COUNT_TRAILING_ZEROS __builtin_ctz
 
 #define MASK(n)     ((1ULL << (n)) - 1)
 
@@ -45,13 +48,20 @@
 #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;
+typedef unsigned short     uint16_t;
 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