X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=9acaaeec3d25695554d1c1fdf4b8c77883e47b7e;hb=b0ea0712dd81e2d3dd25ec14c0bb9a6ce0a51056;hp=61fe86237984064174ec078fc8b48cdc8a2ca0c1;hpb=b440dce0831a72bebe4f4821ab7771cc05e8facb;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index 61fe862..9acaaee 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,10 +1,28 @@
 /*
- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2000, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.18  1999-08-27 09:40:32  adam
+ * Revision 1.24  2000-05-11 14:37:55  adam
+ * Minor changes.
+ *
+ * Revision 1.23  2000/05/09 10:55:05  adam
+ * Public nmem_print_list (for debugging).
+ *
+ * Revision 1.22  2000/05/03 22:00:00  adam
+ * Reference counter (if multiple modules are init/freeing nmem).
+ *
+ * Revision 1.21  2000/02/29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.20  2000/01/06 14:59:13  adam
+ * Added oid_init/oid_exit. Changed oid_exit.
+ *
+ * Revision 1.19  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.18  1999/08/27 09:40:32  adam
  * Renamed logf function to yaz_log. Removed VC++ project files.
  *
  * Revision 1.17  1999/07/13 13:28:25  adam
@@ -71,12 +89,15 @@
  * This is a simple and fairly wasteful little module for nibble memory
  * allocation. Evemtually we'll put in something better.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <assert.h>
 #include <string.h>
-#include <xmalloc.h>
-#include <nmem.h>
-#include <log.h>
+#include <yaz/xmalloc.h>
+#include <yaz/nmem.h>
+#include <yaz/log.h>
 #ifdef WIN32
 #include <windows.h>
 #elif _REENTRANT
@@ -110,14 +131,14 @@ static int nmem_active_no = 0;
 static int nmem_init_flag = 0;
 
 #if NMEM_DEBUG
-struct nmem_debug {
+struct nmem_debug_info {
     void *p;
     char file[40];
     int line;
-    struct nmem_debug *next;
+    struct nmem_debug_info *next;
 };
   
-struct nmem_debug *nmem_debug_list = 0;  
+struct nmem_debug_info *nmem_debug_list = 0;  
 #endif
 
 static void free_block(nmem_block *p)
@@ -132,12 +153,13 @@ static void free_block(nmem_block *p)
 #if NMEM_DEBUG
 void nmem_print_list (void)
 {
-    struct nmem_debug *p;
+    struct nmem_debug_info *p;
 
     yaz_log (LOG_DEBUG, "nmem print list");
     NMEM_ENTER;
     for (p = nmem_debug_list; p; p = p->next)
-	yaz_log (LOG_DEBUG, " %s:%d p=%p", p->file, p->line, p->p);
+	yaz_log (LOG_DEBUG, " %s:%d p=%p size=%d", p->file, p->line, p->p,
+		 nmem_total(p->p));
     NMEM_LEAVE;
 }
 #endif
@@ -250,7 +272,7 @@ NMEM nmem_create(void)
 {
     NMEM r;
 #if NMEM_DEBUG
-    struct nmem_debug *debug_p;
+    struct nmem_debug_info *debug_p;
 #endif
     
     NMEM_ENTER;
@@ -297,7 +319,7 @@ void nmem_destroy(NMEM n)
 #endif
 {
 #if NMEM_DEBUG
-    struct nmem_debug **debug_p;
+    struct nmem_debug_info **debug_p;
     int ok = 0;
 #endif
     if (!n)
@@ -310,7 +332,7 @@ void nmem_destroy(NMEM n)
     for (debug_p = &nmem_debug_list; *debug_p; debug_p = &(*debug_p)->next)
 	if ((*debug_p)->p == n)
 	{
-	    struct nmem_debug *debug_save = *debug_p;
+	    struct nmem_debug_info *debug_save = *debug_p;
 	    *debug_p = (*debug_p)->next;
 	    xfree (debug_save);
 	    ok = 1;
@@ -358,32 +380,37 @@ void nmem_critical_leave (void)
 
 void nmem_init (void)
 {
-    nmem_init_flag = 1;
+    if (++nmem_init_flag == 1)
+    {
 #ifdef WIN32
-    InitializeCriticalSection(&critical_section);
+	InitializeCriticalSection(&critical_section);
 #endif
-    nmem_active_no = 0;
-    freelist = NULL;
-    cfreelist = NULL;
+	nmem_active_no = 0;
+	freelist = NULL;
+	cfreelist = NULL;
+    }
 }
 
 void nmem_exit (void)
 {
-    while (freelist)
+    if (--nmem_init_flag == 0)
     {
-	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);
-    }
+	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 WIN32
-    DeleteCriticalSection(&critical_section);
+	DeleteCriticalSection(&critical_section);
 #endif
+    }
 }