X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/f8509853f72daec365373f9d8c18f63cf8bad54e..78b1464e4a78dc364ecc8aebcfd5ec13b3f6bb07:/darray.c

diff --git a/darray.c b/darray.c
index bee6955..c1ee606 100644
--- a/darray.c
+++ b/darray.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: darray.c,v 1.2 1999/10/28 22:05:28 mdw Exp $
+ * $Id: darray.c,v 1.6 2000/07/16 12:29:16 mdw Exp $
  *
  * Dynamically growing dense arrays
  *
@@ -30,6 +30,18 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: darray.c,v $
+ * Revision 1.6  2000/07/16 12:29:16  mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
+ * Revision 1.5  2000/06/17 10:37:39  mdw
+ * Add support for arena management.
+ *
+ * Revision 1.4  1999/11/06 12:40:45  mdw
+ * Minor changes to allocation strategy.
+ *
+ * Revision 1.3  1999/10/29 22:59:22  mdw
+ * New array adjustment macros for unsigned arguments.
+ *
  * Revision 1.2  1999/10/28 22:05:28  mdw
  * Modify and debug allocation routines.
  *
@@ -45,6 +57,7 @@
 #include <stdlib.h>
 
 #include "alloc.h"
+#include "arena.h"
 #include "darray.h"
 
 /*----- Magic numbers -----------------------------------------------------*/
@@ -103,10 +116,11 @@ void *da_ensure(da_base *b, void *v, size_t sz, size_t n)
   /* --- Maybe just shunt data around a bit --- *
    *
    * If the vector is large enough, then theoretically we could cope by
-   * moving the objects about in their existing storage.
+   * moving the objects about in their existing storage.  It's not worth
+   * bothering if there's not actually double the amount of space I need.
    */
 
-  if (rq < b->sz + b->off) {
+  if (rq * 2 < b->sz + b->off) {
     q = p - (b->off - slots) * sz;
     memmove(q, p, b->len * sz);
     b->sz += b->off - slots;
@@ -115,15 +129,37 @@ void *da_ensure(da_base *b, void *v, size_t sz, size_t n)
     return (q);
   }
 
-  /* --- Reallocate the array --- */
+  /* --- Decide on a new size --- *
+   *
+   * There's a minimum possible size for the array which is used if it's
+   * currently completely empty.  Otherwise I choose the smallest power of
+   * two which is big enough, starting at double the current size.
+   */
 
   nsz = v ? b->sz + b->off : (DA_INITSZ >> 1);
   do nsz <<= 1; while (nsz < rq);
-  q = xmalloc(nsz * sz);
-  q += slots * sz;
-  memcpy(q, p, b->len * sz);
-  if (p)
-    free(p - b->off * sz);
+
+  /* --- Reallocate the block --- *
+   *
+   * If I'm not changing the base offset then it's worth using @realloc@;
+   * otherwise there'll probably be two calls to @memcpy@ to shunt the data
+   * around so it's not worth bothering.
+   */
+
+  if (p && slots == b->off) {
+    q = x_realloc(b->a, p - b->off * sz, nsz * sz, b->sz + b->off);
+    q += slots * sz;
+  } else {
+    q = x_alloc(b->a, nsz * sz);
+    q += slots * sz;
+    if (p) {
+      memcpy(q, p, b->len * sz);
+      x_free(b->a, p - b->off * sz);
+    }
+  }
+
+  /* --- Fill in the other parts of the base structure --- */
+
   b->off = slots;
   b->sz = nsz - slots;
   b->unshift = b->push = 0;
@@ -182,10 +218,11 @@ void *da_shunt(da_base *b, void *v, size_t sz, size_t n)
   /* --- Maybe just shunt data around a bit --- *
    *
    * If the vector is large enough, then theoretically we could cope by
-   * moving the objects about in their existing storage.
+   * moving the objects about in their existing storage.  Again, if there's
+   * not actually twice the space needed, reallocate the array.
    */
 
-  if (rq < b->sz + b->off) {
+  if (rq * 2 < b->sz + b->off) {
     q = p + (b->sz - slots) * sz;
     memmove(q, p, b->len * sz);
     b->off += b->sz - slots;
@@ -194,15 +231,37 @@ void *da_shunt(da_base *b, void *v, size_t sz, size_t n)
     return (q);
   }
 
-  /* --- Reallocate the array --- */
+  /* --- Reallocate the array --- *
+   *
+   * The neat @realloc@ code doesn't need to be here: the offset changes
+   * almost all the time -- that's the whole point of this routine!
+   */
+
+  /* --- Decide on a new size --- *
+   *
+   * There's a minimum possible size for the array which is used if it's
+   * currently completely empty.  Otherwise I choose the smallest power of
+   * two which is big enough, starting at double the current size.
+   */
 
   nsz = v ? b->sz + b->off : (DA_INITSZ >> 1);
   do nsz <<= 1; while (nsz < rq);
-  q = xmalloc(nsz * sz);
+
+  /* --- Reallocate the block --- *
+   *
+   * The neat @realloc@ code doesn't need to be here: the offset changes
+   * almost all the time -- that's the whole point of this routine!
+   */
+
+  q = x_alloc(b->a, nsz * sz);
   q += (nsz - slots) * sz;
-  memcpy(q, p, b->len * sz);
-  if (p)
-    free(p - b->off * sz);
+  if (p) {
+    memcpy(q, p, b->len * sz);
+    x_free(b->a, p - b->off * sz);
+  }
+
+  /* --- Fill in the other parts of the base structure --- */
+  
   b->off = nsz - slots;
   b->sz = slots;
   b->unshift = b->push = 0;
@@ -234,13 +293,13 @@ void *da_tidy(da_base *b, void *v, size_t sz)
     return (p);
 
   if (!b->len) {
-    free(p - b->off * sz);
+    xfree(p - b->off * sz);
     return (0);
   }
 
-  q = xmalloc(b->len * sz);
+  q = x_alloc(b->a, b->len * sz);
   memcpy(q, p, b->len * sz);
-  free(p - b->off * sz);
+  x_free(b->a, p - b->off * sz);
   b->sz = b->len;
   b->off = 0;
   return (q);