Revert "map: add support for persistent storage"

This reverts commit 0e6333d.

Author: razvancrainea

map.c

@@ -28,11 +28,27 @@
 #include <stdlib.h>
 #include <string.h>
 #include "str.h"
+#include "map.h"
 
 #include "mem/mem.h"
 #include "mem/shm_mem.h"
-#include "mem/rpm_mem.h"
-#include "map.h"
+
+#define avl_malloc(dest,size,flags) do		\
+{						\
+	if(flags & AVLMAP_SHARED)			\
+		(dest) = shm_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);			\
+} while(0)
+
 
 #define min(a,b)  ((a)<(b))?(a):(b)
 
@@ -59,24 +75,11 @@ static int str_cmp(str s1, str s2)
 map_t map_create(enum map_flags flags)
 {
 	map_t tree;
-	osips_malloc_f m;
-	osips_free_f f;
-
-	if (flags & AVLMAP_PERSISTENT) {
-		m = rpm_malloc_func;
-		f = rpm_free_func;
-	} else if (flags & AVLMAP_SHARED) {
-		m = shm_malloc_func;
-		f = shm_free_func;
-	} else {
-		m = pkg_malloc_func;
-		f = pkg_free_func;
-	}
-	tree = func_malloc(m, sizeof *tree);
+
+	avl_malloc(tree, sizeof *tree, flags);
+
 	if (tree == NULL)
 		return NULL;
-	tree->malloc = m;
-	tree->free = f;
 
 	tree->avl_root = NULL;
 	tree->flags = flags;
@@ -133,7 +136,7 @@ void ** map_get( map_t tree, str key)
 			y = p;
 	}
 
-	n = func_malloc(tree->malloc, sizeof *n);
+	avl_malloc( n, sizeof *n, tree->flags );
 
 	if (n == NULL)
 		return NULL;
@@ -144,7 +147,7 @@ void ** map_get( map_t tree, str key)
 
 	if( !( tree->flags & AVLMAP_NO_DUPLICATE ) )
 	{
-		key_copy.s = func_malloc(tree->malloc, key.len);
+		avl_malloc(key_copy.s, key.len, tree->flags );
 		if (!key_copy.s)
 			return NULL;
 
@@ -327,9 +330,9 @@ void * delete_node(map_t tree, struct avl_node * p)
 	}
 
 	if(!( tree->flags & AVLMAP_NO_DUPLICATE ) )
-		func_free(tree->free, p->key.s);
+		avl_free(p->key.s,tree->flags);
 
-	func_free(tree->free, p);
+	avl_free(p,tree->flags);
 
 	while (q != (struct avl_node *) & tree->avl_root) {
 		struct avl_node *y = q;
@@ -481,15 +484,15 @@ void map_destroy( map_t tree, value_destroy_func destroy)
 			if (destroy != NULL && p->val != NULL)
 				destroy(p->val);
 			if( !(tree->flags & AVLMAP_NO_DUPLICATE ) )
-				func_free(tree->free, p->key.s);
-			func_free(tree->free, p);
+				avl_free( p->key.s,tree->flags);
+			avl_free( p, tree->flags );
 		} else {
 			q = p->avl_link[0];
 			p->avl_link[0] = q->avl_link[1];
 			q->avl_link[1] = p;
 		}
 
-	func_free(tree->free, tree);
+	avl_free( tree, tree->flags );
 }
 
 int map_size( map_t tree )

map.h

@@ -24,7 +24,6 @@
  */
 
 #include "str.h"
-#include "mem/mem.h"
 #include <stddef.h>
 
 #ifndef AVL_H
@@ -42,9 +41,7 @@ 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_PERSISTENT = 4,	/* determines if the map will be stored in
-				persistent memory */
+	AVLMAP_NO_DUPLICATE = 2	/* determines if the map will duplicate added keys*/
 
 };
 
@@ -55,9 +52,6 @@ typedef struct avl_table {
 	size_t avl_count;		/* Number of items in tree. */
 	int ret_code;
 
-	osips_malloc_f malloc;
-	osips_free_f free;
-
 } *map_t;
 
 /* Iterator data structure. */
@@ -104,7 +98,6 @@ 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
  *
  */