/* -*-c-*-
*
- * $Id: alloc.c,v 1.4 2000/06/17 10:35:51 mdw Exp $
+ * $Id: alloc.c,v 1.5 2000/07/16 12:29:16 mdw Exp $
*
* Memory allocation functions
*
/*----- Revision history --------------------------------------------------*
*
* $Log: alloc.c,v $
+ * Revision 1.5 2000/07/16 12:29:16 mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
* Revision 1.4 2000/06/17 10:35:51 mdw
* Major overhaul for arena support.
*
* Arguments: @arena *a@ = pointer to underlying arena
* @void *p@ = pointer to a block of memory
* @size_t sz@ = new size desired for the block
+ * @size_t osz@ = size of the old block
*
* Returns: Pointer to the resized memory block (which is almost
* certainly not in the same place any more).
* exception @EXC_NOMEM@ is thrown.
*/
-void *x_realloc(arena *a, void *p, size_t sz)
+void *x_realloc(arena *a, void *p, size_t sz, size_t osz)
{
- p = A_REALLOC(a, p, sz);
+ p = A_REALLOC(a, p, sz, osz);
if (!p)
THROW(EXC_NOMEM);
return (p);
*
* Arguments: @void *p@ = pointer to a block of memory
* @size_t sz@ = new size desired for the block
+ * @size_t osz@ = size of the old block
*
* Returns: Pointer to the resized memory block (which is almost
* certainly not in the same place any more).
* exception @EXC_NOMEM@ is thrown.
*/
-void *(xrealloc)(void *p, size_t sz) { return xrealloc(p, sz); }
+void *(xrealloc)(void *p, size_t sz, size_t osz)
+{ return xrealloc(p, sz, osz); }
/* --- @xfree@ --- *
*
/* -*-c-*-
*
- * $Id: alloc.h,v 1.5 2000/06/17 10:35:51 mdw Exp $
+ * $Id: alloc.h,v 1.6 2000/07/16 12:29:16 mdw Exp $
*
* Memory allocation functions
*
/*----- Revision history --------------------------------------------------*
*
* $Log: alloc.h,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:35:51 mdw
* Major overhaul for arena support.
*
* Arguments: @arena *a@ = pointer to underlying arena
* @void *p@ = pointer to a block of memory
* @size_t sz@ = new size desired for the block
+ * @size_t osz@ = size of the old block
*
* Returns: Pointer to the resized memory block (which is almost
* certainly not in the same place any more).
* exception @EXC_NOMEM@ is thrown.
*/
-extern void *x_realloc(arena */*a*/, void */*p*/, size_t /*sz*/);
+extern void *x_realloc(arena */*a*/, void */*p*/,
+ size_t /*sz*/, size_t /*osz*/);
/* --- @x_free@ --- *
*
*
* Arguments: @void *p@ = pointer to a block of memory
* @size_t sz@ = new size desired for the block
+ * @size_t osz@ = size of the old block
*
* Returns: Pointer to the resized memory block (which is almost
* certainly not in the same place any more).
* exception @EXC_NOMEM@ is thrown.
*/
-extern void *xrealloc(void */*p*/, size_t /*sz*/);
-#define xrealloc(p, sz) x_realloc(arena_global, (p), (sz))
+extern void *xrealloc(void */*p*/, size_t /*sz*/, size_t /*osz*/);
+#define xrealloc(p, sz, osz) x_realloc(arena_global, (p), (sz), (osz))
/* --- @xfree@ --- *
*
/* -*-c-*-
*
- * $Id: arena.c,v 1.1 2000/06/17 10:37:53 mdw Exp $
+ * $Id: arena.c,v 1.2 2000/07/16 12:29:16 mdw Exp $
*
* Abstraction for memory allocation arenas
*
/*----- Revision history --------------------------------------------------*
*
* $Log: arena.c,v $
+ * Revision 1.2 2000/07/16 12:29:16 mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
* Revision 1.1 2000/06/17 10:37:53 mdw
* Basic arena management.
*
/*----- The standard arena ------------------------------------------------*/
static void *_alloc(arena *a, size_t sz) { return malloc(sz); }
-static void *_realloc(arena *a, void *p, size_t sz){ return realloc(p, sz); }
+static void *_realloc(arena *a, void *p, size_t sz, size_t osz)
+ { return realloc(p, sz); }
static void _free(arena *a, void *p) { free (p); }
static arena_ops stdlib_ops = { _alloc, _realloc, _free, 0 };
* Arguments: @arena *a@ = pointer to arena block
* @void *p@ = pointer to memory block to resize
* @size_t sz@ = size desired for the block
+ * @size_t osz@ = size of the old block
*
* Returns: ---
*
* support @realloc@ properly.
*/
-void *arena_fakerealloc(arena *a, void *p, size_t sz)
+void *arena_fakerealloc(arena *a, void *p, size_t sz, size_t osz)
{
void *q = A_ALLOC(a, sz);
if (!q)
return (0);
- memcpy(q, p, sz);
+ memcpy(q, p, sz > osz ? osz : sz);
A_FREE(a, p);
return (q);
}
/* --- Function equivalents of the macros --- */
void *a_alloc(arena *a, size_t sz) { return (A_ALLOC(a, sz)); }
-void *a_realloc(arena *a, void *p, size_t sz) { return A_REALLOC(a, p, sz); }
+void *a_realloc(arena *a, void *p, size_t sz, size_t osz)
+{ return A_REALLOC(a, p, sz, osz); }
void a_free(arena *a, void *p) { A_FREE(a, p); }
/*----- That's all, folks -------------------------------------------------*/
/* -*-c-*-
*
- * $Id: arena.h,v 1.1 2000/06/17 10:37:53 mdw Exp $
+ * $Id: arena.h,v 1.2 2000/07/16 12:29:16 mdw Exp $
*
* Abstraction for memory allocation arenas
*
/*----- Revision history --------------------------------------------------*
*
* $Log: arena.h,v $
+ * Revision 1.2 2000/07/16 12:29:16 mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
* Revision 1.1 2000/06/17 10:37:53 mdw
* Basic arena management.
*
typedef struct arena_ops {
void *(*alloc)(arena */*a*/, size_t /*sz*/);
- void *(*realloc)(arena */*a*/, void */*p*/, size_t /*sz*/);
+ void *(*realloc)(arena */*a*/, void */*p*/, size_t /*sz*/, size_t /*osz*/);
void (*free)(arena */*a*/, void */*p*/);
void (*purge)(arena */*a*/);
} arena_ops;
* Arguments: @arena *a@ = pointer to arena block
* @void *p@ = pointer to memory block to resize
* @size_t sz@ = size desired for the block
+ * @size_t osz@ = size of the old block
*
* Returns: ---
*
* support @realloc@ properly.
*/
-extern void *arena_fakerealloc(arena */*a*/, void */*p*/, size_t /*sz*/);
+extern void *arena_fakerealloc(arena */*a*/, void */*p*/,
+ size_t /*sz*/, size_t /*osz*/);
/* --- Useful macros --- */
#define A_ALLOC(a, sz) (((a)->ops->alloc)((a), (sz)))
-#define A_REALLOC(a, p, sz) (((a)->ops->realloc)((a), (p), (sz)))
+#define A_REALLOC(a, p, sz, osz) (((a)->ops->realloc)((a), (p), (sz), (osz)))
#define A_FREE(a, p) (((a)->ops->free)((a), (p)))
/* --- Simple function equivalents --- */
extern void *a_alloc(arena */*a*/, size_t /*sz*/);
-extern void *a_realloc(arena */*a*/, void */*p*/, size_t /*sz*/);
+extern void *a_realloc(arena */*a*/, void */*p*/,
+ size_t /*sz*/, size_t /*osz*/);
extern void a_free(arena */*a*/, void */*p*/);
/*----- That's all, folks -------------------------------------------------*/
/* -*-c-*-
*
- * $Id: darray.c,v 1.5 2000/06/17 10:37:39 mdw Exp $
+ * $Id: darray.c,v 1.6 2000/07/16 12:29:16 mdw Exp $
*
* Dynamically growing dense arrays
*
/*----- 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.
*
*/
if (p && slots == b->off) {
- q = x_realloc(b->a, p - b->off * sz, nsz * sz);
+ 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);
/* -*-c-*-
*
- * $Id: dstr.c,v 1.14 2000/06/17 10:37:39 mdw Exp $
+ * $Id: dstr.c,v 1.15 2000/07/16 12:29:16 mdw Exp $
*
* Handle dynamically growing strings
*
/*----- Revision history --------------------------------------------------*
*
* $Log: dstr.c,v $
+ * Revision 1.15 2000/07/16 12:29:16 mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
* Revision 1.14 2000/06/17 10:37:39 mdw
* Add support for arena management.
*
do nsz <<= 1; while (nsz < rq);
if (d->buf)
- d->buf = x_realloc(d->a, d->buf, nsz);
+ d->buf = x_realloc(d->a, d->buf, nsz, d->sz);
else
d->buf = x_alloc(d->a, nsz);
d->sz = nsz;
void dstr_tidy(dstr *d)
{
- d->buf = x_realloc(d->a, d->buf, d->len + 1);
+ d->buf = x_realloc(d->a, d->buf, d->len + 1, d->sz);
d->buf[d->len] = 0;
d->sz = d->len + 1;
}
/* -*-c-*-
*
- * $Id: hash.c,v 1.2 2000/06/17 10:37:39 mdw Exp $
+ * $Id: hash.c,v 1.3 2000/07/16 12:29:16 mdw Exp $
*
* General hashtable infrastructure
*
/*----- 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.
*
/* --- Allocate a new hash bin vector --- */
- if ((v = A_REALLOC(t->a, t->v, m * 2 * sizeof(hash_base *))) == 0) {
+ if ((v = A_REALLOC(t->a, t->v,
+ 2 * m * sizeof(hash_base *),
+ m * sizeof(hash_base *))) == 0) {
return (0);
}
t->v = v;
.nf
.B "#include <mLib/alloc.h>"
-.BI "void *x_alloc(size_t " sz );
-.BI "char *x_strdup(const char *" s );
-.BI "void *x_realloc(void *" p ", size_t " sz );
-.BI "void x_free(void *" p );
+.BI "void *x_alloc(arena *" a ", size_t " sz );
+.BI "char *x_strdup(arena *" a ", const char *" s );
+.BI "void *x_realloc(arena *" a ", void *" p ", size_t " sz ", size_t " osz );
+.BI "void x_free(arena *" a ", void *" p );
.BI "void *xmalloc(size_t " sz );
-.BI "void *xrealloc(void *" p ", size_t " sz );
+.BI "void *xrealloc(void *" p ", size_t " sz ", size_t " osz );
.BI "char *xstrdup(const char *" s );
.BI "void xfree(void *" p );
.fi
.BI "arena *arena_global;"
.BI "arena arena_stdlib;"
-.BI "void *arena_fakerealloc(arena *" a ", void *" p ", size_t " sz );
+.BI "void *arena_fakerealloc(arena *" a ", void *" p ,
+.BI " size_t " sz ", size_t " osz );
.BI "void *a_alloc(arena *" a ", size_t " sz );
-.BI "void *a_realloc(arena *" a ", void *" p ", size_t " sz );
+.BI "void *a_realloc(arena *" a ", void *" p ", size_t " sz ", size_t " osz );
.BI "void a_free(arena *" a );
.BI "void *A_ALLOC(arena *" a ", size_t " sz );
-.BI "void *A_REALLOC(arena *" a ", void *" p ", size_t " sz );
+.BI "void *A_REALLOC(arena *" a ", void *" p ", size_t " sz ", size_t " osz );
.BI "void A_FREE(arena *" a );
.fi
.SH "DESCRIPTION"
convenient interface to memory allocation, see
.BR alloc (3).
.PP
+.B Note:
+The
+.B realloc
+function has an extra argument
+.I osz
+specifying the old size of the block. This is for the benefit of arena
+handlers which can't easily find the old block's size.
+.PP
.SS "Defining new arenas"
An
.B arena
Allocates a block of memory, of at least
.I sz
bytes in size, appropriately aligned, and returns its address.
+.nf
.TP
-.BI "void *(*" realloc ")(arena *" a ", void *" p ", size_t " sz );
+.BI "void *(*" realloc ")(arena *" a ", void *" p ", size_t " sz ", size_t " osz );
+.fi
Resizes the block pointed to by
.IR p ,
+with
+.I osz
+interesting bytes in it,
so that it is at least
.I sz
bytes long. You can use
/* -*-c-*-
*
- * $Id: pkbuf.c,v 1.1 2000/06/17 10:39:19 mdw Exp $
+ * $Id: pkbuf.c,v 1.2 2000/07/16 12:29:16 mdw Exp $
*
* Simple packet buffering
*
/*----- Revision history --------------------------------------------------*
*
* $Log: pkbuf.c,v $
+ * Revision 1.2 2000/07/16 12:29:16 mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
* Revision 1.1 2000/06/17 10:39:19 mdw
* Experimental new support for packet buffering.
*
do pk->sz <<= 1; while (want < pk->sz);
if (pk->buf) {
if (pk->len)
- pk->buf = x_realloc(pk->a, pk->buf, pk->sz);
+ pk->buf = x_realloc(pk->a, pk->buf, pk->sz, pk->len);
else {
x_free(pk->a, pk->buf);
pk->buf = 0;