Version bump.

[mLib] / hash.c

diff --git a/hash.c b/hash.c
index 96c150bf7c9ca09a9c20eea77f5f1e68e4657979..9483e103d57349aec352a0928a74ffa2c83823b8 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: hash.c,v 1.1 1999/08/02 14:45:48 mdw Exp $
+ * $Id: hash.c,v 1.3 2000/07/16 12:29:16 mdw Exp $

  *
  * General hashtable infrastructure
  *
  *
  * General hashtable infrastructure
  *


@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: hash.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: hash.c,v $

+ * Revision 1.3  2000/07/16 12:29:16  mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
+ * Revision 1.2  2000/06/17 10:37:39  mdw
+ * Add support for arena management.
+ *

  * Revision 1.1  1999/08/02 14:45:48  mdw
  * Break low-level hashtable code out from sym.
  *
  * Revision 1.1  1999/08/02 14:45:48  mdw
  * Break low-level hashtable code out from sym.
  *


@@ -42,10 +48,10 @@
 #include <string.h>
 
 #include "alloc.h"
 #include <string.h>
 
 #include "alloc.h"

+#include "arena.h"

 #include "bits.h"
 #include "exc.h"
 #include "hash.h"
 #include "bits.h"
 #include "exc.h"
 #include "hash.h"

-#include "track.h"

 
 /*----- Main code ---------------------------------------------------------*/
 
 
 /*----- Main code ---------------------------------------------------------*/
 


@@ -64,13 +70,12 @@
 void hash_create(hash_table *t, size_t n)
 {
   hash_base **v;
 void hash_create(hash_table *t, size_t n)
 {
   hash_base **v;

-  TRACK_CTX("hashtable creation");
-  TRACK_PUSH;
-  t->v = xmalloc(n * sizeof(hash_base *));
+
+  t->a = arena_global;
+  t->v = x_alloc(t->a, n * sizeof(hash_base *));

   t->mask = n - 1;
   for (v = t->v; n; v++, n--)
     *v = 0;
   t->mask = n - 1;
   for (v = t->v; n; v++, n--)
     *v = 0;

-  TRACK_POP;

 }
 
 /* --- @hash_destroy@ --- *
 }
 
 /* --- @hash_destroy@ --- *


@@ -85,10 +90,7 @@ void hash_create(hash_table *t, size_t n)
 
 void hash_destroy(hash_table *t)
 {
 
 void hash_destroy(hash_table *t)
 {

-  TRACK_CTX("hashtable destruction");
-  TRACK_PUSH;
-  free(t->v);
-  TRACK_POP;
+  x_free(t->a, t->v);

 }
 
 /* --- @hash_bin@ --- *
 }
 
 /* --- @hash_bin@ --- *


@@ -123,15 +125,11 @@ int hash_extend(hash_table *t)
   uint32 m = t->mask + 1;
   size_t i;
 
   uint32 m = t->mask + 1;
   size_t i;
 

-  /* --- Push in a tracking context --- */
-
-  TRACK_CTX("hashtable extension");
-  TRACK_PUSH;
-

   /* --- Allocate a new hash bin vector --- */
 
   /* --- Allocate a new hash bin vector --- */
 

-  if ((v = realloc(t->v, m * 2 * sizeof(hash_base *))) == 0) {
-    TRACK_POP;
+  if ((v = A_REALLOC(t->a, t->v,
+                    2 * m * sizeof(hash_base *),
+                    m * sizeof(hash_base *))) == 0) {

     return (0);
   }
   t->v = v;
     return (0);
   }
   t->v = v;


@@ -156,7 +154,6 @@ int hash_extend(hash_table *t)
     *q = 0;
   }
 
     *q = 0;
   }
 

-  TRACK_POP;

   return (1);
 }
 
   return (1);
 }