improve memory allocator

[nbds] / include / common.h

diff --git a/include/common.h b/include/common.h
index a4fc7e3c0e27459d777821cfe59411e2b97c56a8..8988ed01debc6ec5224ef7b17e823a34fcceba63 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -11,10 +11,6 @@
 #include <string.h>
 #include <sys/types.h>
 
-#define malloc "DON'T USE MALLOC" // use nbd_malloc() instead
-#define calloc "DON'T USE CALLOC" // 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
@@ -44,10 +40,12 @@
 #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 ERROR_TXN_NOT_RUNNING     (-4)
+
+#define VOLATILE(x) *((volatile typeof(x) *)&x)
 
 typedef unsigned long long uint64_t;
 typedef unsigned int       uint32_t;