X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=include%2Fcommon.h;h=c644bb5631f0ab480c0e756f62bb53aa4118f4dd;hp=5bc2a6f5ff321f3af65ae6016cb37ae991714cec;hb=f3eb4799a11ceaeb47ab02034595b5d641c2f1c9;hpb=d61d7ffdfa8fab555a5086e61d2e9dfe699a14b9

diff --git a/include/common.h b/include/common.h
index 5bc2a6f..c644bb5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -11,19 +11,10 @@
 #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 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)
 
@@ -32,19 +23,33 @@
 #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) ((int64_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)
+
 typedef unsigned long long uint64_t;
 typedef unsigned int       uint32_t;
 typedef unsigned char      uint8_t;
 
+typedef size_t markable_t;
+
 #include "lwt.h"
 #endif //COMMON_H