X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=131ab1e739103ed4e05bff37771b7656a4f02fd4;hb=9e1594c51c65fa993e9d69928c0ecabee8c2b862;hp=a9646fb737132a8f7b0306752b331480354213a4;hpb=f93804a685b51e2d724847d071d47c173c2c0ee6;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index a9646fb..131ab1e 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,10 +1,34 @@
 /*
- * Copyright (c) 1995-2000, Index Data.
+ * Copyright (c) 1995-2001, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.22  2000-05-03 22:00:00  adam
+ * Revision 1.30  2001-10-05 13:55:17  adam
+ * Added defines YAZ_GNU_THREADS, YAZ_POSIX_THREADS in code and yaz-config
+ *
+ * Revision 1.29  2001/10/04 00:37:58  adam
+ * Fixes for GNU threads (not working yet).
+ *
+ * Revision 1.28  2001/10/03 23:55:18  adam
+ * GNU threads support.
+ *
+ * Revision 1.27  2001/09/27 12:09:18  adam
+ * Function nmem_exit calls oid_exit (when reference is 0).
+ *
+ * Revision 1.26  2001/07/19 19:51:42  adam
+ * Added typecasts to make C++ happy.
+ *
+ * Revision 1.25  2001/06/26 14:11:27  adam
+ * Added MUTEX functions for NMEM module (used by OID utility).
+ *
+ * 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
@@ -92,16 +116,18 @@
 #include <yaz/xmalloc.h>
 #include <yaz/nmem.h>
 #include <yaz/log.h>
+#include <yaz/oid.h>
+
 #ifdef WIN32
 #include <windows.h>
-#elif _REENTRANT
+#endif
 
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
 #include <pthread.h>
-#elif HAVE_THREAD_H
-#include <thread.h>
 #endif
 
+#if YAZ_GNU_THREADS
+#include <pth.h>
 #endif
 
 #define NMEM_CHUNK (4*1024)
@@ -110,14 +136,85 @@
 static CRITICAL_SECTION critical_section;
 #define NMEM_ENTER EnterCriticalSection(&critical_section)
 #define NMEM_LEAVE LeaveCriticalSection(&critical_section)
-#elif _REENTRANT
+struct nmem_mutex {
+    CRITICAL_SECTION m_handle;
+};
+#elif YAZ_POSIX_THREADS
 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);
+struct nmem_mutex {
+    pthread_mutex_t m_handle;
+};
+#elif YAZ_GNU_THREADS
+static pth_mutex_t nmem_mutex = PTH_MUTEX_INIT;
+#define NMEM_ENTER pth_mutex_acquire(&nmem_mutex, 0, 0)
+#define NMEM_LEAVE pth_mutex_release(&nmem_mutex)
+struct nmem_mutex {
+    pth_mutex_t m_handle;
+};
 #else
 #define NMEM_ENTER
 #define NMEM_LEAVE
+struct nmem_mutex {
+    int dummy;
+};
+#endif
+
+YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *p)
+{
+    NMEM_ENTER;
+    if (!*p)
+    {
+	*p = (NMEM_MUTEX) malloc (sizeof(**p));
+#ifdef WIN32
+	InitializeCriticalSection(&(*p)->m_handle);
+#elif YAZ_POSIX_THREADS
+	pthread_mutex_init (&(*p)->m_handle, 0);
+#elif YAZ_GNU_THREADS
+        pth_mutex_init (&(*p)->m_handle);
+#endif
+    }
+    NMEM_LEAVE;
+}
+
+YAZ_EXPORT void nmem_mutex_enter(NMEM_MUTEX p)
+{
+    if (p)
+    {
+#ifdef WIN32
+	EnterCriticalSection(&p->m_handle);
+#elif YAZ_POSIX_THREADS
+	pthread_mutex_lock(&p->m_handle);
+#endif
+    }
+}
+
+YAZ_EXPORT void nmem_mutex_leave(NMEM_MUTEX p)
+{
+    if (p)
+    {
+#ifdef WIN32
+	LeaveCriticalSection(&p->m_handle);
+#elif YAZ_POSIX_THREADS
+	pthread_mutex_unlock(&p->m_handle);
 #endif
+    }
+}
+
+YAZ_EXPORT void nmem_mutex_destroy(NMEM_MUTEX *p)
+{
+    NMEM_ENTER;
+    if (*p)
+    {
+#ifdef WIN32
+	DeleteCriticalSection(&(*p)->m_handle);
+#endif
+	free (*p);
+	*p = 0;
+    }
+    NMEM_LEAVE;
+}
 
 static nmem_block *freelist = NULL;        /* "global" freelists */
 static nmem_control *cfreelist = NULL;
@@ -125,14 +222,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)
@@ -147,12 +244,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
@@ -265,7 +363,7 @@ NMEM nmem_create(void)
 {
     NMEM r;
 #if NMEM_DEBUG
-    struct nmem_debug *debug_p;
+    struct nmem_debug_info *debug_p;
 #endif
     
     NMEM_ENTER;
@@ -312,7 +410,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)
@@ -325,7 +423,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;
@@ -377,6 +475,9 @@ void nmem_init (void)
     {
 #ifdef WIN32
 	InitializeCriticalSection(&critical_section);
+#elif YAZ_GNU_THREADS
+	yaz_log (LOG_LOG, "pth_init");
+        pth_init ();
 #endif
 	nmem_active_no = 0;
 	freelist = NULL;
@@ -388,6 +489,7 @@ void nmem_exit (void)
 {
     if (--nmem_init_flag == 0)
     {
+        oid_exit();
 	while (freelist)
 	{
 	    struct nmem_block *fl = freelist;