/* -*-c-*-
*
- * $Id: mparena.c,v 1.3 1999/11/22 13:58:00 mdw Exp $
+ * $Id$
*
* Allocation and freeing of MP buffers
*
* (c) 1999 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
- *
+ *
* Catacomb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with Catacomb; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: mparena.c,v $
- * Revision 1.3 1999/11/22 13:58:00 mdw
- * Document the tweakables.
- *
- * Revision 1.2 1999/11/21 22:14:19 mdw
- * Fix bug. Improve diagnostic capabilities.
- *
- * Revision 1.1 1999/11/17 18:02:16 mdw
- * New multiprecision integer arithmetic suite.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <mLib/alloc.h>
+#include <mLib/arena.h>
+#include <mLib/exc.h>
#include <mLib/sub.h>
#include "mparena.h"
* itself.
*/
-/* #define MPARENA_TRIVIAL */
+#define MPARENA_TRIVIAL
/* --- @MPARENA_DEBUG@ --- *
*
/* #define MPARENA_DEBUG "mparena.out" */
-/*----- Default allocator -------------------------------------------------*/
-
-static void *defalloc(mparena *a, size_t sz) { return xmalloc(sz); }
-static void deffree(mparena *a, void *p) { free(p); }
-
-mparena_ops mparena_defops = { defalloc, deffree };
-
/*----- Static variables --------------------------------------------------*/
#ifdef MPARENA_DEBUG
#endif
-static mparena arena = { 0, &mparena_defops };
+/*----- Standard arenas ---------------------------------------------------*/
-#define MPARENA_RESOLVE(a) do { \
- if ((a) == MPARENA_GLOBAL) \
- (a) = &arena; \
-} while (0)
+mparena mparena_global = MPARENA_INIT;
+mparena mparena_secure = MPARENA_INIT;
/*----- Main code ---------------------------------------------------------*/
void mparena_create(mparena *a)
{
a->root = 0;
- a->ops = &mparena_defops;
+ a->n = 0;
+ a->a = &arena_stdlib;
}
-/* --- @mparena_setops@ --- *
+/* --- @mparena_setarena@ --- *
*
- * Arguments: @mparena *a@ = pointer to arena block
- * @mparena_ops *ops@ = pointer to operations block or null
+ * Arguments: @mparena *a@ = pointer to MP arena block
+ * @arena *aa@ = pointer to arena
*
- * Returns: The previous operations block.
+ * Returns: ---
*
- * Use: Sets or queries the operations attached to an arena.
+ * Use: Sets the underlying arena for an MP arena.
*/
-mparena_ops *mparena_setops(mparena *a, mparena_ops *ops)
-{
- mparena_ops *o;
- MPARENA_RESOLVE(a);
- o = a->ops;
- if (ops)
- a->ops = ops;
- return (0);
-}
+extern void mparena_setarena(mparena *a, arena *aa) { a->a = aa; }
/* --- @mparena_destroy@ --- *
*
static void tfree(mparena *a, mparena_node *n)
{
- a->ops->free(a, n->v);
+ A_FREE(a->a, n->v);
if (n->left)
tfree(a, n->left);
if (n->right)
a->root = 0;
}
+/* --- @mparena_count@ --- *
+ *
+ * Arguments: @mparena *a@ = pointer to arena block
+ *
+ * Returns: Number of allocated blocks from this arena.
+ *
+ * Use: Reports the number of blocks allocated from the arena and not
+ * yet freed.
+ */
+
+unsigned mparena_count(mparena *a)
+{
+ return (a->n);
+}
+
/* --- @mpalloc@ --- *
*
* Arguments: @mparena *a@ = pointer to arena block
mpw *mpalloc(mparena *a, size_t sz)
{
- MPARENA_RESOLVE(a);
- return (a->ops->alloc(a, MPWS(sz)));
+ mpw *v;
+ if (!sz) return (0);
+ a->n++;
+ v = A_ALLOC(a->a, MPWS(sz));
+ if (!v)
+ THROW(EXC_NOMEM);
+ return (v);
}
#else
mparena_node **nn, *n;
mpw *v;
- MPARENA_RESOLVE(a);
nn = &a->root;
#ifdef MPARENA_DEBUG
MPARENA_OPENFILE;
- fprintf(debugfp, "alloc %u\n before: ", sz);
+ fprintf(debugfp, "alloc %u\n before: ", sz);
tdump(a->root); putc('\n', debugfp);
- if (sz == 0)
- asm("nop");
#endif
/* --- First, find a block which is big enough --- */
#ifdef MPARENA_DEBUG
fputs(" failed\n", debugfp);
#endif
- v = a->ops->alloc(a, MPWS(sz + 1));
+ if ((v = A_ALLOC(a->a, MPWS(sz + 1))) == 0)
+ THROW(EXC_NOMEM);
v[0] = sz;
+ a->n++;
return (v + 1);
}
if (n->v[0] < sz) {
/* --- Get rid of this node now --- */
DESTROY(n);
+ a->n++;
return (v + 1);
}
*
* Returns: ---
*
- * Use: Returns an MP vector to an arena. It doesn't have to be
- * returned to the arena from which it was allocated.
+ * Use: Returns an MP vector to an arena.
*/
#ifdef MPARENA_TRIVIAL
void mpfree(mparena *a, mpw *v)
{
- MPARENA_RESOLVE(a);
- a->ops->free(a, v);
+ if (!v) return;
+ a->n--;
+ A_FREE(a->a, v);
}
#else
mparena_node **nn, *n;
size_t sz = *--v;
- MPARENA_RESOLVE(a);
-
#ifdef MPARENA_DEBUG
MPARENA_OPENFILE;
fprintf(debugfp, "free %u\n before: ", sz);
n->left = n->right = 0;
n->v = v;
*nn = n;
+ a->n--;
#ifdef MPARENA_DEBUG
fputs(" after: ", debugfp);
projects / u / mdw / catacomb / blobdiff