Remove custom allocators from nick/patricia.

[irc/quakenet/newserv.git] / patricia / patricia_alloc.c

diff --git a/patricia/patricia_alloc.c b/patricia/patricia_alloc.c
index 33d4ac506bfd5837a1d84ab4a5d3b73f8280f4fb..ed3cd87f0a6f59ddff8c3f9f53de17645f2e3d92 100644 (file)
--- a/patricia/patricia_alloc.c
+++ b/patricia/patricia_alloc.c
@@ -4,58 +4,20 @@
 #include <assert.h>
 #include "../core/nsmalloc.h"
 
-#define ALLOCUNIT  100
-
-patricia_node_t *node_freelist;
-union prefixes *prefix_freelist;
-
 prefix_t *newprefix() {
-    union prefixes *prefixes = prefix_freelist;
-    int i;
-
-    if (prefixes==NULL) {
-      prefixes=(union prefixes *)nsmalloc(POOL_PATRICIA,ALLOCUNIT*sizeof(prefix_t));
-
-      for (i=0;i<(ALLOCUNIT-1);i++) {
-        prefixes[i].next=&(prefixes[i+1]);
-      }
-      prefixes[ALLOCUNIT-1].next=NULL;
-    }
-
-    prefix_freelist = prefixes->next;
-    return &(prefixes->prefix);
-
+  return nsmalloc(POOL_PATRICIA, sizeof(prefix_t));
 }
 
-void freeprefix (prefix_t *prefix) {
-  union prefixes *ups =  (union prefixes *)prefix;
-  ups->next = prefix_freelist;
-  prefix_freelist = ups;
+void freeprefix(prefix_t *prefix) {
+  nsfree(POOL_PATRICIA, prefix);
 }
 
-
 patricia_node_t *newnode() {
-  int i;
-  patricia_node_t *node;
-
-  if( node_freelist==NULL ) {
-    node_freelist=(patricia_node_t *)nsmalloc(POOL_PATRICIA,ALLOCUNIT*sizeof(patricia_node_t));
-
-    for (i=0;i<(ALLOCUNIT-1);i++) {
-      node_freelist[i].parent=(patricia_node_t *)&(node_freelist[i+1]);
-    }
-    node_freelist[ALLOCUNIT-1].parent=NULL;
-  }
-
-  node=node_freelist;
-  node_freelist=(patricia_node_t *)node->parent;
-
-  return node;
+  return nsmalloc(POOL_PATRICIA, sizeof(patricia_node_t));
 }
 
-void freenode (patricia_node_t *node) {
- node->parent=(patricia_node_t *)node_freelist;
- node_freelist=node;
+void freenode(patricia_node_t *node) {
+  nsfree(POOL_PATRICIA, node);
 }