X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/359df77829d85c6a415220fb4f21d5331323c79f..2685767a6125c1620719c7de6234aedf41857b7e:/lmem.c

diff --git a/lmem.c b/lmem.c
index e443aa6..8a21a6f 100644
--- a/lmem.c
+++ b/lmem.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: lmem.c,v 1.1 1999/12/22 16:02:52 mdw Exp $
+ * $Id: lmem.c,v 1.3 2000/07/29 21:58:15 mdw Exp $
  *
  * Locked memory allocation (Unix-specific)
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: lmem.c,v $
+ * Revision 1.3  2000/07/29 21:58:15  mdw
+ * (l_destroy): New function for destroying locked memory blocks.
+ *
+ * Revision 1.2  2000/06/17 11:29:20  mdw
+ * Add arena support.
+ *
  * Revision 1.1  1999/12/22 16:02:52  mdw
  * Interface to allocating `locked' memory (which isn't paged out).
  *
@@ -52,11 +58,20 @@
 #  include <sys/mman.h>
 #endif
 
+#include <mLib/arena.h>
 #include <mLib/dstr.h>
 #include <mLib/sub.h>
 
 #include "lmem.h"
 
+/*----- Arena operations --------------------------------------------------*/
+
+static void *aalloc(arena *a, size_t sz) { return l_alloc((lmem *)a, sz); }
+static void afree(arena *a, void *p) { l_free((lmem *)a, p); }
+static void apurge(arena *a) { l_purge((lmem *)a); }
+
+static arena_ops l_ops = { aalloc, arena_fakerealloc, afree, apurge };
+
 /*----- Main code ---------------------------------------------------------*/
 
 /* --- @l_init@ --- *
@@ -83,7 +98,9 @@ int l_init(lmem *lm, size_t sz)
 
   /* --- Preliminaries --- */
 
+  lm->a.ops = &l_ops;
   lm->err = 0;
+  lm->f = 0;
 
   /* --- Try making a secure locked passphrase buffer --- *
    *
@@ -120,7 +137,8 @@ int l_init(lmem *lm, size_t sz)
     lm->err = errno;
     munmap(p, sz);
     p = 0;
-  }
+  } else
+    lm->f |= LF_LOCKED;
 
 #endif
 
@@ -282,6 +300,33 @@ void l_purge(lmem *lm)
   lm->free = l->sz;
 }
 
+/* --- @l_destroy@ --- *
+ *
+ * Arguments:	@lmem *lm@ = pointer to locked memory descriptor
+ *
+ * Returns:	---
+ *
+ * Use:		Disposes of a locked memory arena permanently.
+ */
+
+void l_destroy(lmem *lm)
+{
+  l_node *l;
+
+  l = lm->l;
+  while (l) {
+    l_node *ll = l->next;
+    DESTROY(l);
+    l = ll;
+  }
+  memset(lm->p, 0, lm->sz);
+
+  if (lm->f & LF_LOCKED)
+    munmap(lm->p, lm->sz);
+  else
+    free(lm->p);
+}
+
 /* --- @l_report@ --- *
  *
  * Arguments:	@lmem *lm@ = pointer to locked memory descriptor