X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=99d22cdc86163142c4f631f9e40e522dbde5cfc7;hb=964a340466d80d4c992aaa5a81159f6c13fb70d8;hp=9df63472f545d8faf7ebe7a500e342fde097c419;hpb=eb0f67241481fb645a377b1c5df9683f8f1bd2fb;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index 9df6347..99d22cd 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.4  1997-09-29 07:12:50  adam
+ * Revision 1.7  1998-02-11 11:53:36  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6  1997/10/31 12:20:09  adam
+ * Improved memory debugging for xmalloc/nmem.c. References to NMEM
+ * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
+ * Bug fix: missing fclose in data1_read_espec1.
+ *
+ * Revision 1.5  1997/10/06 09:09:52  adam
+ * Function mmem_exit releases memory used by the freelists.
+ *
+ * Revision 1.4  1997/09/29 07:12:50  adam
  * NMEM thread safe. NMEM must be initialized before use (sigh) -
  * routine nmem_init/nmem_exit implemented.
  *
@@ -27,6 +38,7 @@
 
 #include <xmalloc.h>
 #include <nmem.h>
+#include <log.h>
 #ifdef WINDOWS
 #include <windows.h>
 #endif
@@ -44,6 +56,7 @@ static CRITICAL_SECTION critical_section;
 
 static nmem_block *freelist = NULL;        /* "global" freelists */
 static nmem_control *cfreelist = NULL;
+static int nmem_active_no = 0;
 
 static void free_block(nmem_block *p)
 {  
@@ -72,8 +85,8 @@ static nmem_block *get_block(int size)
 
 	if (get < size)
 	    get = size;
-	r = xmalloc(sizeof(*r));
-	r->buf = xmalloc(r->size = get);
+	r = (nmem_block *)xmalloc(sizeof(*r));
+	r->buf = (char *)xmalloc(r->size = get);
     }
     r->top = 0;
     return r;
@@ -124,32 +137,51 @@ int nmem_total(NMEM n)
     return n->total;
 }
 
+#if NMEM_DEBUG
+NMEM nmem_create_f(const char *file, int line)
+#else
 NMEM nmem_create(void)
+#endif
 {
     NMEM r;
     
     NMEM_ENTER;
+    nmem_active_no++;
     r = cfreelist;
     if (r)
 	cfreelist = cfreelist->next;
     else
-	r = xmalloc(sizeof(*r));
+	r = (nmem_control *)xmalloc(sizeof(*r));
     NMEM_LEAVE;
+
+#if NMEM_DEBUG
+    logf (LOG_DEBUG, "%s:%d: nmem_create %d p=%p", file, line,
+                     nmem_active_no-1, r);
+#endif
     r->blocks = 0;
     r->total = 0;
     r->next = 0;
     return r;
 }
 
+#if NMEM_DEBUG
+void nmem_destroy_f(const char *file, int line, NMEM n)
+#else
 void nmem_destroy(NMEM n)
+#endif
 {
     if (!n)
 	return;
     nmem_reset(n);
     NMEM_ENTER;
+    nmem_active_no--;
     n->next = cfreelist;
     cfreelist = n;
     NMEM_LEAVE;
+#if NMEM_DEBUG
+    logf (LOG_DEBUG, "%s:%d: nmem_destroy %d p=%p", file, line,
+                     nmem_active_no, n);
+#endif
 }
 
 void nmem_init (void)
@@ -157,12 +189,26 @@ void nmem_init (void)
 #ifdef WINDOWS
     InitializeCriticalSection(&critical_section);
 #endif
+    nmem_active_no = 0;
     freelist = NULL;
     cfreelist = NULL;
 }
 
 void nmem_exit (void)
 {
+    while (freelist)
+    {
+	struct nmem_block *fl = freelist;
+	freelist = freelist->next;
+	xfree (fl->buf);
+	xfree (fl);
+    }
+    while (cfreelist)
+    {
+	struct nmem_control *cfl = cfreelist;
+	cfreelist = cfreelist->next;
+	xfree (cfl);
+    }
 #ifdef WINDOWS
     DeleteCriticalSection(&critical_section);
 #endif