X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fnmem.c;h=233abcc6bebbed33783914113eab787432b5ce49;hp=123d284719f73050389c287cc9e9ddb2f097e14e;hb=428847338cc5b48d012b3b724c1d4ecefdc5614e;hpb=a97174e3c213916ba968c8922ec69e9101badb2d

diff --git a/src/nmem.c b/src/nmem.c
index 123d284..233abcc 100644
--- a/src/nmem.c
+++ b/src/nmem.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: nmem.c,v 1.16 2005-06-03 20:30:30 adam Exp $
+ * $Id: nmem.c,v 1.23 2006-08-09 14:00:18 adam Exp $
  */
 
 /**
@@ -46,8 +46,8 @@
 struct nmem_block
 {
     char *buf;              /* memory allocated in this block */
-    int size;               /* size of buf */
-    int top;                /* top of buffer */
+    size_t size;            /* size of buf */
+    size_t top;             /* top of buffer */
     struct nmem_block *next;
 };
 
@@ -61,15 +61,15 @@ struct nmem_control
 struct align {
     char x;
     union {
-	char c;
-	short s;
-	int i;
-	long l;
+        char c;
+        short s;
+        int i;
+        long l;
 #if HAVE_LONG_LONG
-	long long ll;
+        long long ll;
 #endif
-	float f;
-	double d;
+        float f;
+        double d;
     } u;
 };
 
@@ -109,17 +109,19 @@ struct nmem_mutex {
 
 YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *p)
 {
+    NMEM_ENTER;
     if (!*p)
     {
-	*p = (NMEM_MUTEX) malloc (sizeof(**p));
+        *p = (NMEM_MUTEX) malloc(sizeof(**p));
 #ifdef WIN32
-	InitializeCriticalSection(&(*p)->m_handle);
+        InitializeCriticalSection(&(*p)->m_handle);
 #elif YAZ_POSIX_THREADS
-	pthread_mutex_init (&(*p)->m_handle, 0);
+        pthread_mutex_init(&(*p)->m_handle, 0);
 #elif YAZ_GNU_THREADS
-        pth_mutex_init (&(*p)->m_handle);
+        pth_mutex_init(&(*p)->m_handle);
 #endif
     }
+    NMEM_LEAVE;
     if (!log_level_initialized)
     {
         log_level_initialized = 1;
@@ -133,9 +135,9 @@ YAZ_EXPORT void nmem_mutex_enter(NMEM_MUTEX p)
     if (p)
     {
 #ifdef WIN32
-	EnterCriticalSection(&p->m_handle);
+        EnterCriticalSection(&p->m_handle);
 #elif YAZ_POSIX_THREADS
-	pthread_mutex_lock(&p->m_handle);
+        pthread_mutex_lock(&p->m_handle);
 #endif
     }
 }
@@ -145,9 +147,9 @@ YAZ_EXPORT void nmem_mutex_leave(NMEM_MUTEX p)
     if (p)
     {
 #ifdef WIN32
-	LeaveCriticalSection(&p->m_handle);
+        LeaveCriticalSection(&p->m_handle);
 #elif YAZ_POSIX_THREADS
-	pthread_mutex_unlock(&p->m_handle);
+        pthread_mutex_unlock(&p->m_handle);
 #endif
     }
 }
@@ -157,18 +159,21 @@ YAZ_EXPORT void nmem_mutex_destroy(NMEM_MUTEX *p)
     if (*p)
     {
 #ifdef WIN32
-	DeleteCriticalSection(&(*p)->m_handle);
+        DeleteCriticalSection(&(*p)->m_handle);
 #endif
-	free (*p);
-	*p = 0;
+        free(*p);
+        *p = 0;
     }
 }
 
-static nmem_block *freelist = NULL;        /* "global" freelists */
+static nmem_block *freelist = NULL;       /* "global" freelists */
 static nmem_control *cfreelist = NULL;
 static int nmem_active_no = 0;
 static int nmem_init_flag = 0;
 
+/** \brief whether nmem blocks should be reassigned to heap */
+static int nmem_release_in_heap = 0;
+
 #if NMEM_DEBUG
 struct nmem_debug_info {
     void *p;
@@ -182,9 +187,17 @@ struct nmem_debug_info *nmem_debug_list = 0;
 
 static void free_block(nmem_block *p)
 {  
-    memset(p->buf, 'Y', p->size);
-    p->next = freelist;
-    freelist = p;
+    if (nmem_release_in_heap)
+    {
+        xfree(p->buf);
+        xfree(p);
+    }
+    else
+    {
+        memset(p->buf, 'Y', p->size);
+        p->next = freelist;
+        freelist = p;
+    }
     if (log_level)
         yaz_log (log_level, "nmem free_block p=%p", p);
 }
@@ -192,7 +205,7 @@ static void free_block(nmem_block *p)
 #if NMEM_DEBUG
 void nmem_print_list (void)
 {
-    if(log_level)
+    if (log_level)
         nmem_print_list_l(log_level);
 }
 
@@ -203,44 +216,45 @@ void nmem_print_list_l (int level)
     yaz_log (level, "nmem print list");
     NMEM_ENTER;
     for (p = nmem_debug_list; p; p = p->next)
-	yaz_log (level, " %s:%d p=%p size=%d", p->file, p->line, p->p,
-		 nmem_total(p->p));
+        yaz_log (level, " %s:%d p=%p size=%d", p->file, p->line, p->p,
+                 nmem_total(p->p));
     NMEM_LEAVE;
 }
 #endif
 /*
  * acquire a block with a minimum of size free bytes.
  */
-static nmem_block *get_block(int size)
+static nmem_block *get_block(size_t size)
 {
     nmem_block *r, *l;
 
     if (log_level)
-        yaz_log (log_level, "nmem get_block size=%d", size);
+        yaz_log (log_level, "nmem get_block size=%ld", (long) size);
 
     for (r = freelist, l = 0; r; l = r, r = r->next)
-    	if (r->size >= size)
-	    break;
+        if (r->size >= size)
+            break;
     if (r)
     {
         if (log_level)
-	    yaz_log (log_level, "nmem get_block found free block p=%p", r);
-    	if (l)
-	    l->next = r->next;
-	else
-	    freelist = r->next;
+            yaz_log (log_level, "nmem get_block found free block p=%p", r);
+        if (l)
+            l->next = r->next;
+        else
+            freelist = r->next;
     }
     else
     {
-    	int get = NMEM_CHUNK;
+        size_t get = NMEM_CHUNK;
 
-	if (get < size)
-	    get = size;
+        if (get < size)
+            get = size;
         if(log_level)
-	    yaz_log (log_level, "nmem get_block alloc new block size=%d", get);
+            yaz_log (log_level, "nmem get_block alloc new block size=%ld",
+                     (long) get);
 
-	r = (nmem_block *)xmalloc(sizeof(*r));
-	r->buf = (char *)xmalloc(r->size = get);
+        r = (nmem_block *)xmalloc(sizeof(*r));
+        r->buf = (char *)xmalloc(r->size = get);
     }
     r->top = 0;
     return r;
@@ -252,13 +266,13 @@ void nmem_reset(NMEM n)
     
     yaz_log (log_level, "nmem_reset p=%p", n);
     if (!n)
-	return;
+        return;
     NMEM_ENTER;
     while (n->blocks)
     {
-    	t = n->blocks;
-	n->blocks = n->blocks->next;
-	free_block(t);
+        t = n->blocks;
+        n->blocks = n->blocks->next;
+        free_block(t);
     }
     n->total = 0;
     NMEM_LEAVE;
@@ -288,11 +302,11 @@ void *nmem_malloc(NMEM n, int size)
 #endif
     NMEM_ENTER;
     p = n->blocks;
-    if (!p || p->size - p->top < size)
+    if (!p || p->size < size + p->top)
     {
-    	p = get_block(size);
-	p->next = n->blocks;
-	n->blocks = p;
+        p = get_block(size);
+        p->next = n->blocks;
+        n->blocks = p;
     }
     r = p->buf + p->top;
     /* align size */
@@ -327,9 +341,9 @@ NMEM nmem_create(void)
     nmem_active_no++;
     r = cfreelist;
     if (r)
-	cfreelist = cfreelist->next;
+        cfreelist = cfreelist->next;
     else
-	r = (nmem_control *)xmalloc(sizeof(*r));
+        r = (nmem_control *)xmalloc(sizeof(*r));
     NMEM_LEAVE;
 
 #if NMEM_DEBUG
@@ -342,11 +356,11 @@ NMEM nmem_create(void)
 
 #if NMEM_DEBUG
     for (debug_p = nmem_debug_list; debug_p; debug_p = debug_p->next)
-	if (debug_p->p == r)
-	{
-	    yaz_log (YLOG_FATAL, "multi used block in nmem");
-	    abort ();
-	}
+        if (debug_p->p == r)
+        {
+            yaz_log (YLOG_FATAL, "multi used block in nmem");
+            abort ();
+        }
     debug_p = xmalloc (sizeof(*debug_p));
     strncpy (debug_p->file, file, sizeof(debug_p->file)-1);
     debug_p->file[sizeof(debug_p->file)-1] = '\0';
@@ -371,35 +385,42 @@ void nmem_destroy(NMEM n)
     int ok = 0;
 #endif
     if (!n)
-	return;
+        return;
     
 #if NMEM_DEBUG
     yaz_log (log_level, "%s:%d: nmem_destroy %d p=%p", file, line,
                      nmem_active_no-1, n);
     NMEM_ENTER;
     for (debug_p = &nmem_debug_list; *debug_p; debug_p = &(*debug_p)->next)
-	if ((*debug_p)->p == n)
-	{
-	    struct nmem_debug_info *debug_save = *debug_p;
-	    *debug_p = (*debug_p)->next;
-	    xfree (debug_save);
-	    ok = 1;
-	    break;
-	}
+        if ((*debug_p)->p == n)
+        {
+            struct nmem_debug_info *debug_save = *debug_p;
+            *debug_p = (*debug_p)->next;
+            xfree (debug_save);
+            ok = 1;
+            break;
+        }
     NMEM_LEAVE;
     nmem_print_list();
     if (!ok)
     {
-	yaz_log (YLOG_WARN, "%s:%d destroying unallocated nmem block p=%p",
-		 file, line, n);
-	return;
+        yaz_log (YLOG_WARN, "%s:%d destroying unallocated nmem block p=%p",
+                 file, line, n);
+        return;
     }
 #endif
     nmem_reset(n);
     NMEM_ENTER;
     nmem_active_no--;
-    n->next = cfreelist;
-    cfreelist = n;
+    if (nmem_release_in_heap)
+    {
+        xfree(n);
+    }
+    else
+    {
+        n->next = cfreelist;
+        cfreelist = n;
+    }
     NMEM_LEAVE;
 }
 
@@ -408,9 +429,9 @@ 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;
+        src->blocks = t->next;
+        t->next = dst->blocks;
+        dst->blocks = t;
     }
     dst->total += src->total;
     src->total = 0;
@@ -432,13 +453,13 @@ void nmem_init (void)
     if (++nmem_init_flag == 1)
     {
 #ifdef WIN32
-	InitializeCriticalSection(&critical_section);
+        InitializeCriticalSection(&critical_section);
 #elif YAZ_GNU_THREADS
         pth_init ();
 #endif
-	nmem_active_no = 0;
-	freelist = NULL;
-	cfreelist = NULL;
+        nmem_active_no = 0;
+        freelist = NULL;
+        cfreelist = NULL;
     }
     if (!log_level_initialized)
     {
@@ -452,21 +473,21 @@ void nmem_exit (void)
     if (--nmem_init_flag == 0)
     {
         oid_exit();
-	while (freelist)
-	{
-	    struct nmem_block *fl = freelist;
-	    freelist = freelist->next;
-	    xfree (fl->buf);
-	    xfree (fl);
-	}
-	while (cfreelist)
-	{
-	    struct nmem_control *cfl = cfreelist;
-	    cfreelist = cfreelist->next;
-	    xfree (cfl);
-	}
+        while (freelist)
+        {
+            struct nmem_block *fl = freelist;
+            freelist = freelist->next;
+            xfree (fl->buf);
+            xfree (fl);
+        }
+        while (cfreelist)
+        {
+            struct nmem_control *cfl = cfreelist;
+            cfreelist = cfreelist->next;
+            xfree (cfl);
+        }
 #ifdef WIN32
-	DeleteCriticalSection(&critical_section);
+        DeleteCriticalSection(&critical_section);
 #endif
     }
 }
@@ -474,16 +495,16 @@ void nmem_exit (void)
 
 #ifdef WIN32
 BOOL WINAPI DllMain (HINSTANCE hinstDLL,
-		     DWORD reason,
-		     LPVOID reserved)
+                     DWORD reason,
+                     LPVOID reserved)
 {
     switch (reason)
     {
     case DLL_PROCESS_ATTACH:
-	nmem_init ();
-	break;
+        nmem_init ();
+        break;
     case DLL_PROCESS_DETACH:
-	nmem_exit ();
+        nmem_exit ();
     }
     return TRUE;
 }
@@ -516,16 +537,16 @@ void yaz_strerror(char *buf, int max)
     if (err)
     {
         FormatMessage(
-		FORMAT_MESSAGE_FROM_SYSTEM,
-		NULL,
-		err,
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default lang */
-		(LPTSTR) buf,
-		max-1,
-		NULL);
+                FORMAT_MESSAGE_FROM_SYSTEM,
+                NULL,
+                err,
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default lang */
+                (LPTSTR) buf,
+                max-1,
+                NULL);
     }
     else
-	*buf = '\0';
+        *buf = '\0';
 #else
 /* UNIX */
 #if HAVE_STRERROR_R
@@ -544,7 +565,15 @@ void yaz_strerror(char *buf, int max)
 /* UNIX */
 #endif
     if ((cp = strrchr(buf, '\n')))
-	*cp = '\0';
+        *cp = '\0';
     if ((cp = strrchr(buf, '\r')))
-	*cp = '\0';
+        *cp = '\0';
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+