X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=include%2Fcommon.h;h=2931c4d2bb031b8af7a2e1a550e08b013c6c2c05;hb=973c2b13fe82d6ebd030cd58869fa237b1fe5370;hp=477462842d8b5ac69bbe97cad61082f532439898;hpb=9ec5405d406696c6cbdb7a47ade7fccc736a8b53;p=nbds

diff --git a/include/common.h b/include/common.h
index 4774628..2931c4d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -11,40 +11,54 @@
 #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 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 CAT(x,y) x##y
-#define ON_EXIT_SCOPE_I(x,i) \
-    inline void CAT(scope_cleanup_function_, i) (int *CAT(scope_cleanup_dummy_argument_, i)) { x; }; \
-    int CAT(scope_cleanup_dummy_variable_, i) __attribute__((cleanup(CAT(scope_cleanup_function_, i))));
-#define ON_EXIT_SCOPE(x) ON_EXIT_SCOPE_I(x,__LINE__)
-
-#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 MASK(n)     ((1LL << (n)) - 1)
-
-#define TAG          (1LL << 63)
-#define IS_TAGGED(v) ((uint64_t)(v) < 0)
-#define TAG_VALUE(v) ((uint64_t)(v) |  TAG)
-#define STRIP_TAG(v) ((uint64_t)(v) & ~TAG)
+#define MASK(n)     ((1ULL << (n)) - 1)
 
 #define TRUE  1
 #define FALSE 0
 
+#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_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 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