X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=518226ba46992b6ae52ca87effab3041e5376cee;hb=febd96e724a673b84f5db8f48dfb71c805c7f5e6;hp=72fc0a888aaacd12b26fc8e72362f600fab87f2a;hpb=853b3f256a6753ea6dc26f6123a4956740ed82b4;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index 72fc0a8..518226b 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,10 +1,21 @@
 /*
- * Copyright (c) 1995-1998, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.12  1998-10-13 16:00:18  adam
+ * Revision 1.15  1999-02-11 09:10:26  adam
+ * Function nmem_init only mandatory on Windows.
+ *
+ * Revision 1.14  1999/02/02 13:57:40  adam
+ * Uses preprocessor define WIN32 instead of WINDOWS to build code
+ * for Microsoft WIN32.
+ *
+ * Revision 1.13  1998/10/19 15:24:21  adam
+ * New nmem utility, nmem_transfer, that transfer blocks from one
+ * NMEM to another.
+ *
+ * Revision 1.12  1998/10/13 16:00:18  adam
  * Implemented nmem_critical_{enter,leave}.
  *
  * Revision 1.11  1998/08/21 14:13:36  adam
@@ -52,10 +63,11 @@
  * allocation. Evemtually we'll put in something better.
  */
 
+#include <assert.h>
 #include <xmalloc.h>
 #include <nmem.h>
 #include <log.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <windows.h>
 #elif _REENTRANT
 
@@ -69,7 +81,7 @@
 
 #define NMEM_CHUNK (4*1024)
 
-#ifdef WINDOWS
+#ifdef WIN32
 static CRITICAL_SECTION critical_section;
 #define NMEM_ENTER EnterCriticalSection(&critical_section)
 #define NMEM_LEAVE LeaveCriticalSection(&critical_section)
@@ -85,6 +97,7 @@ static pthread_mutex_t nmem_mutex = PTHREAD_MUTEX_INITIALIZER;
 static nmem_block *freelist = NULL;        /* "global" freelists */
 static nmem_control *cfreelist = NULL;
 static int nmem_active_no = 0;
+static int nmem_init_flag = 0;
 
 static void free_block(nmem_block *p)
 {  
@@ -150,8 +163,8 @@ void nmem_reset(NMEM n)
 	n->blocks = n->blocks->next;
 	free_block(t);
     }
-    NMEM_LEAVE;
     n->total = 0;
+    NMEM_LEAVE;
 }
 
 #if NMEM_DEBUG
@@ -169,6 +182,9 @@ void *nmem_malloc(NMEM n, int size)
 #endif
     if (!n)
 	return xmalloc(size);
+#ifdef WIN32
+    assert (nmem_init_flag);
+#endif
     NMEM_ENTER;
     p = n->blocks;
     if (!p || p->size - p->top < size)
@@ -237,6 +253,19 @@ void nmem_destroy(NMEM n)
 #endif
 }
 
+void nmem_transfer (NMEM dst, NMEM src)
+{
+    nmem_block *t;
+    while ((t=src->blocks))
+    {
+	src->blocks = t->next;
+	t->next = dst->blocks;
+	dst->blocks = t;
+    }
+    dst->total += src->total;
+    src->total = 0;
+}
+
 void nmem_critical_enter (void)
 {
     NMEM_ENTER;
@@ -249,7 +278,8 @@ void nmem_critical_leave (void)
 
 void nmem_init (void)
 {
-#ifdef WINDOWS
+    nmem_init_flag = 1;
+#ifdef WIN32
     InitializeCriticalSection(&critical_section);
 #endif
     nmem_active_no = 0;
@@ -272,7 +302,7 @@ void nmem_exit (void)
 	cfreelist = cfreelist->next;
 	xfree (cfl);
     }
-#ifdef WINDOWS
+#ifdef WIN32
     DeleteCriticalSection(&critical_section);
 #endif
 }