X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=4f458471b36b1917249e534e871e91281bc288d8;hb=8030536c98d595898b316df5eb118b1d6398450c;hp=99d22cdc86163142c4f631f9e40e522dbde5cfc7;hpb=044d170f0a963555486df54653cd2fdc5815928b;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index 99d22cd..4f45847 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.7  1998-02-11 11:53:36  adam
+ * Revision 1.11  1998-08-21 14:13:36  adam
+ * Added GNU Configure script to build Makefiles.
+ *
+ * Revision 1.10  1998/07/20 12:35:57  adam
+ * Added more memory diagnostics (when NMEM_DEBUG is 1).
+ *
+ * Revision 1.9  1998/07/07 15:49:01  adam
+ * Reduced chunk size.
+ *
+ * Revision 1.8  1998/07/03 14:21:27  adam
+ * Added critical sections for pthreads-library. Thanks to Ian Ibbotson,
+ * Fretwell Downing Informatics.
+ *
+ * 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
@@ -41,14 +54,26 @@
 #include <log.h>
 #ifdef WINDOWS
 #include <windows.h>
+#elif _REENTRANT
+
+#if HAVE_PTHREAD_H
+#include <pthread.h>
+#elif HAVE_THREAD_H
+#include <thread.h>
+#endif
+
 #endif
 
-#define NMEM_CHUNK (10*1024)
+#define NMEM_CHUNK (4*1024)
 
 #ifdef WINDOWS
 static CRITICAL_SECTION critical_section;
 #define NMEM_ENTER EnterCriticalSection(&critical_section)
 #define NMEM_LEAVE LeaveCriticalSection(&critical_section)
+#elif _REENTRANT
+static pthread_mutex_t nmem_mutex = PTHREAD_MUTEX_INITIALIZER;
+#define NMEM_ENTER pthread_mutex_lock(&nmem_mutex);
+#define NMEM_LEAVE pthread_mutex_unlock(&nmem_mutex);
 #else
 #define NMEM_ENTER
 #define NMEM_LEAVE
@@ -62,6 +87,9 @@ static void free_block(nmem_block *p)
 {  
     p->next = freelist;
     freelist = p;
+#if NMEM_DEBUG
+    logf (LOG_DEBUG, "nmem free_block p=%p", p);
+#endif
 }
 
 /*
@@ -71,20 +99,31 @@ static nmem_block *get_block(int size)
 {
     nmem_block *r, *l;
 
+#if NMEM_DEBUG
+    logf (LOG_DEBUG, "nmem get_block size=%d", size);
+#endif
     for (r = freelist, l = 0; r; l = r, r = r->next)
     	if (r->size >= size)
 	    break;
     if (r)
+    {
+#if NMEM_DEBUG
+	logf (LOG_DEBUG, "nmem get_block found free block p=%p", r);
+#endif
     	if (l)
 	    l->next = r->next;
 	else
 	    freelist = r->next;
+    }
     else
     {
     	int get = NMEM_CHUNK;
 
 	if (get < size)
 	    get = size;
+#if NMEM_DEBUG
+	logf (LOG_DEBUG, "nmem get_block alloc new block size=%d", get);
+#endif
 	r = (nmem_block *)xmalloc(sizeof(*r));
 	r->buf = (char *)xmalloc(r->size = get);
     }
@@ -96,6 +135,9 @@ void nmem_reset(NMEM n)
 {
     nmem_block *t;
 
+#if NMEM_DEBUG
+    logf (LOG_DEBUG, "nmem_reset p=%p", n);
+#endif
     if (!n)
 	return;
     NMEM_ENTER;
@@ -109,11 +151,19 @@ void nmem_reset(NMEM n)
     n->total = 0;
 }
 
+#if NMEM_DEBUG
+void *nmem_malloc_f (const char *file, int line, NMEM n, int size)
+#else
 void *nmem_malloc(NMEM n, int size)
+#endif
 {
     struct nmem_block *p;
     char *r;
 
+#if NMEM_DEBUG
+    logf (LOG_DEBUG, "%s:%d: nmem_malloc p=%p size=%d", file, line,
+                     n, size);
+#endif
     if (!n)
 	return xmalloc(size);
     NMEM_ENTER;