X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=util%2Fnmem.c;h=72fc0a888aaacd12b26fc8e72362f600fab87f2a;hb=853b3f256a6753ea6dc26f6123a4956740ed82b4;hp=244dc6b11ab83ed2f43db3adb3effaec7dbc2d75;hpb=81503ca4c08bfaf4eb6782a9207cc33fa941a442;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index 244dc6b..72fc0a8 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.8  1998-07-03 14:21:27  adam
+ * 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
+ * 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.
  *
@@ -46,17 +58,23 @@
 #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;
+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
@@ -72,6 +90,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
 }
 
 /*
@@ -81,20 +102,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);
     }
@@ -106,6 +138,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;
@@ -119,11 +154,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;
@@ -194,6 +237,16 @@ void nmem_destroy(NMEM n)
 #endif
 }
 
+void nmem_critical_enter (void)
+{
+    NMEM_ENTER;
+}
+
+void nmem_critical_leave (void)
+{
+    NMEM_LEAVE;
+}
+
 void nmem_init (void)
 {
 #ifdef WINDOWS