X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=include%2Fcommon.h;h=fbd64bc2a84faf5c17c69df3518ed60ea7e0ea32;hp=bf3d04ecc17a2960298f7916fd9b235f612a2cf1;hb=778b8c8ca708b082a1192acfb114a6751b2ad7c9;hpb=025017478bb385da88a6b185849c8bcffeb2e2aa

diff --git a/include/common.h b/include/common.h
index bf3d04e..fbd64bc 100644
--- a/include/common.h
+++ b/include/common.h
@@ -11,39 +11,70 @@
 #include <string.h>
 #include <sys/types.h>
 
-#define malloc "DON'T USE MALLOC" // use nbd_malloc() instead
-#define free   "DON'T USE FREE"   // use nbd_free() instead
+#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 MAX_NUM_THREADS 4 // make this whatever you want, but make it a power of 2
+#define EXPECT_TRUE(x)      __builtin_expect(!!(x), 1)
+#define EXPECT_FALSE(x)     __builtin_expect(!!(x), 0)
 
-#define CACHE_LINE_SIZE 64
+#ifndef NBD_SINGLE_THREADED
 
-#define EXPECT_TRUE(x)     __builtin_expect(x, 1)
-#define EXPECT_FALSE(x)    __builtin_expect(x, 0)
+#define MAX_NUM_THREADS  16 // make this whatever you want, but make it a power of 2
 
-#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(addr,x)         __sync_lock_test_and_set(addr,x)
+#define SYNC_CAS(addr,old,x)      __sync_val_compare_and_swap(addr,old,x)
+#define SYNC_ADD(addr,n)          __sync_add_and_fetch(addr,n)
+#define SYNC_FETCH_AND_OR(addr,x) __sync_fetch_and_or(addr,x)
+#else// NBD_SINGLE_THREADED
+
+#define MAX_NUM_THREADS  1
+
+#define SYNC_SWAP(addr,x)         ({ typeof(*(addr)) _old = *(addr); *(addr)  = (x); _old; })
+#define SYNC_CAS(addr,old,x)      ({ typeof(*(addr)) _old = *(addr); *(addr)  = (x); _old; })
+//#define SYNC_CAS(addr,old,x)    ({ typeof(*(addr)) _old = *(addr); if ((old) == _old) { *(addr)  = (x); } _old; })
+#define SYNC_ADD(addr,n)          ({ typeof(*(addr)) _old = *(addr); *(addr) += (n); _old; })
+#define SYNC_FETCH_AND_OR(addr,x) ({ typeof(*(addr)) _old = *(addr); *(addr) |= (x); _old; })
+
+#endif//NBD_SINGLE_THREADED
+
+#define COUNT_TRAILING_ZEROS __builtin_ctz
 
 #define MASK(n)     ((1ULL << (n)) - 1)
 
 #define TRUE  1
 #define FALSE 0
 
-#define TAG          (1ULL << 63)
-#define TAG_VALUE(v) ((uint64_t)(v) |  TAG)
-#define IS_TAGGED(v) ((uint64_t)(v) &  TAG)
-#define STRIP_TAG(v) ((uint64_t)(v) & ~TAG)
+#ifdef NBD32
+#define TAG1         (1U << 31)
+#define TAG2         (1U << 30)
+#else
+#define TAG1         (1ULL << 63)
+#define TAG2         (1ULL << 62)
+#endif
+#define TAG_VALUE(v, tag) ((v) |  tag)
+#define IS_TAGGED(v, tag) ((v) &  tag)
+#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 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