General utilities cleanup. Add signature support to catcrypt. Throw in

[u/mdw/catacomb] / mparena.h

diff --git a/mparena.h b/mparena.h
index b541b25..08722b3 100644 (file)
--- a/mparena.h
+++ b/mparena.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mparena.h,v 1.2 1999/12/10 23:28:59 mdw Exp $
+ * $Id: mparena.h,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
  * Allocation and freeing of MP buffers
  *
@@ -27,17 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mparena.h,v $
- * Revision 1.2  1999/12/10 23:28:59  mdw
- * Memory allocation counting.
- *
- * Revision 1.1  1999/11/17 18:02:16  mdw
- * New multiprecision integer arithmetic suite.
- *
- */
-
 #ifndef CATACOMB_MPARENA_H
 #define CATACOMB_MPARENA_H
 
@@ -47,6 +36,8 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#include <mLib/arena.h>
+
 #ifndef CATACOMB_MPW_H
 #  include "mpw.h"
 #endif
@@ -72,28 +63,16 @@ typedef struct mparena_node {
 typedef struct mparena {
   mparena_node *root;
   unsigned n;
-  struct mparena_ops *ops;
+  arena *a;
 } mparena;
 
-/* --- @mparena_ops@ --- *
- *
- * Operations required for an arena memory manager.  The default manager just
- * calls @xmalloc@ and @free@, although it's possible to envisage a more
- * paranoid implementation which allocates locked memory pages.  Switch them
- * over with @mparena_setops@.  It's usual to only do this when you've
- * attached your extra state to the end of the @mparena@ structure.
- */
-
-typedef struct mparena_ops {
-  void *(*alloc)(mparena */*a*/, size_t /*sz*/);
-  void (*free)(mparena */*a*/, void */*p*/);
-} mparena_ops;
+/*----- Standard arenas ---------------------------------------------------*/
 
-/*----- Magical constants -------------------------------------------------*/
+extern mparena mparena_global;
+#define MPARENA_GLOBAL (&mparena_global)
 
-#define MPARENA_GLOBAL ((mparena *)0)
-
-extern mparena_ops mparena_defaultops;
+extern mparena mparena_secure;
+#define MPARENA_SECURE (&mparena_secure)
 
 /*----- Functions provided ------------------------------------------------*/
 
@@ -109,19 +88,19 @@ extern mparena_ops mparena_defaultops;
 
 extern void mparena_create(mparena */*a*/);
 
-#define MPARENA_INIT { 0, 0, &mparena_defaultops }
+#define MPARENA_INIT { 0, 0, &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.
  */
 
-extern mparena_ops *mparena_setops(mparena */*a*/, mparena_ops */*ops*/);
+extern void mparena_setarena(mparena */*a*/, arena */*aa*/);
 
 /* --- @mparena_destroy@ --- *
  *
@@ -131,7 +110,8 @@ extern mparena_ops *mparena_setops(mparena */*a*/, mparena_ops */*ops*/);
  *
  * Use:                Frees an MP arena, and all the vectors held within it.  The
  *             blocks which are currently allocated can be freed into some
- *             other arena.
+ *             other MP arena, as long as the underlying arenas are the
+ *             same.
  */
 
 extern void mparena_destroy(mparena */*a*/);