map: rework persistent storage

Author: razvancrainea

map.c

@@ -32,21 +32,26 @@
 
 #include "mem/mem.h"
 #include "mem/shm_mem.h"
-
-#define avl_malloc(dest,size,flags) do		\
-{						\
-	if(flags & AVLMAP_SHARED)			\
-		(dest) = shm_malloc(size);	\
-	else					\
-		(dest) = pkg_malloc(size);	\
+#include "mem/rpm_mem.h"
+
+#define avl_malloc(dest,size,flags) do \
+{ \
+	if(flags & AVLMAP_SHARED) \
+		(dest) = shm_malloc(size); \
+	else if (flags & AVLMAP_PERSISTENT) \
+		(dest) = rpm_malloc(size); \
+	else \
+		(dest) = pkg_malloc(size); \
 } while(0)
 
-#define avl_free(dest,flags)	do		\
-{						\
-	if(flags & AVLMAP_SHARED)			\
-		shm_free(dest);			\
-	else					\
-		pkg_free(dest);			\
+#define avl_free(dest,flags) do \
+{ \
+	if(flags & AVLMAP_SHARED) \
+		shm_free(dest); \
+	else if (flags & AVLMAP_PERSISTENT) \
+		rpm_free(dest); \
+	else \
+		pkg_free(dest); \
 } while(0)
 
 

map.h

@@ -41,7 +41,9 @@ enum map_flags
 {
 	AVLMAP_SHARED = 1,		/* determines if the map is to be allocated in
 				shared or private memory */
-	AVLMAP_NO_DUPLICATE = 2	/* determines if the map will duplicate added keys*/
+	AVLMAP_NO_DUPLICATE = 2,	/* determines if the map will duplicate added keys*/
+	AVLMAP_PERSISTENT = 4,	/* determines if the map will be stored in
+				persistent memory */
 
 };
 
@@ -98,6 +100,7 @@ typedef  int (* process_each_func )(void * param, str key, void * value);
  *
  * AVLMAP_SHARED -> flag for shared memory
  * AVLMAP_NO_DUPLICATE -> flag for key duplication
+ * AVLMAP_PERSISTENT -> flag for persistent shared memory
  *
  */