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

diff --git a/util/nmem.c b/util/nmem.c
index 8fbfd84..9df6347 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.1  1995-11-13 09:27:52  quinn
+ * 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.
+ *
+ * Revision 1.3  1997/07/21 12:47:38  adam
+ * Moved definition of nmem_control and nmem_block.
+ *
+ * Revision 1.2  1995/12/13 13:44:37  quinn
+ * Modified Data1-system to use nmem
+ *
+ * Revision 1.1  1995/11/13  09:27:52  quinn
  * Fiddling with the variant stuff.
  *
  *
@@ -17,27 +27,26 @@
 
 #include <xmalloc.h>
 #include <nmem.h>
+#ifdef WINDOWS
+#include <windows.h>
+#endif
 
 #define NMEM_CHUNK (10*1024)
 
-typedef struct nmem_block
-{
-    char *buf;              /* memory allocated in this block */
-    int size;               /* size of buf */
-    int top;                /* top of buffer */
-    struct nmem_block *next;
-} nmem_block;
+#ifdef WINDOWS
+static CRITICAL_SECTION critical_section;
+#define NMEM_ENTER EnterCriticalSection(&critical_section)
+#define NMEM_LEAVE LeaveCriticalSection(&critical_section)
+#else
+#define NMEM_ENTER
+#define NMEM_LEAVE
+#endif
 
-typedef struct nmem_control
-{
-    int total;
-    nmem_block *blocks;
-} nmem_control;
-
-static nmem_block *freelist = 0; /* global freelist */
+static nmem_block *freelist = NULL;        /* "global" freelists */
+static nmem_control *cfreelist = NULL;
 
 static void free_block(nmem_block *p)
-{
+{  
     p->next = freelist;
     freelist = p;
 }
@@ -76,12 +85,14 @@ void nmem_reset(NMEM n)
 
     if (!n)
 	return;
+    NMEM_ENTER;
     while (n->blocks)
     {
     	t = n->blocks;
 	n->blocks = n->blocks->next;
 	free_block(t);
     }
+    NMEM_LEAVE;
     n->total = 0;
 }
 
@@ -92,6 +103,7 @@ void *nmem_malloc(NMEM n, int size)
 
     if (!n)
 	return xmalloc(size);
+    NMEM_ENTER;
     p = n->blocks;
     if (!p || p->size - p->top < size)
     {
@@ -103,6 +115,7 @@ void *nmem_malloc(NMEM n, int size)
     /* align size */
     p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
     n->total += size;
+    NMEM_LEAVE;
     return r;
 }
 
@@ -113,10 +126,18 @@ int nmem_total(NMEM n)
 
 NMEM nmem_create(void)
 {
-    NMEM r = xmalloc(sizeof(*r));
+    NMEM r;
     
+    NMEM_ENTER;
+    r = cfreelist;
+    if (r)
+	cfreelist = cfreelist->next;
+    else
+	r = xmalloc(sizeof(*r));
+    NMEM_LEAVE;
     r->blocks = 0;
     r->total = 0;
+    r->next = 0;
     return r;
 }
 
@@ -125,5 +146,25 @@ void nmem_destroy(NMEM n)
     if (!n)
 	return;
     nmem_reset(n);
-    xfree(n);
+    NMEM_ENTER;
+    n->next = cfreelist;
+    cfreelist = n;
+    NMEM_LEAVE;
+}
+
+void nmem_init (void)
+{
+#ifdef WINDOWS
+    InitializeCriticalSection(&critical_section);
+#endif
+    freelist = NULL;
+    cfreelist = NULL;
 }
+
+void nmem_exit (void)
+{
+#ifdef WINDOWS
+    DeleteCriticalSection(&critical_section);
+#endif
+}
+