pad struct to improve hazard performance, fix off-by-one error

[nbds] / include / common.h

diff --git a/include/common.h b/include/common.h
index faebe4c807160d7f093bb34a85acd0e584dcc305..c644bb5631f0ab480c0e756f62bb53aa4118f4dd 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -11,9 +11,6 @@
 #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
@@ -31,20 +28,28 @@
 #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)
-#define TAG_VALUE(v, tag) ((uint64_t)(v) |  tag)
-#define IS_TAGGED(v, tag) ((uint64_t)(v) &  tag)
-#define STRIP_TAG(v, tag) ((uint64_t)(v) & ~tag)
+#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