X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fnmem.c;h=508cc6a920b75aa9b957bff583124e1e654c94d5;hp=b76c555d0dea540840128a376be4faaa2749499f;hb=2e7534d6db2aa45913384abf945475ebb08a021f;hpb=f25338b01de9ab9fb8dcc952b70b7b12b1e71c00

diff --git a/src/nmem.c b/src/nmem.c
index b76c555..508cc6a 100644
--- a/src/nmem.c
+++ b/src/nmem.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: nmem.c,v 1.26 2006-12-13 15:28:28 adam Exp $
  */
 
 /**
@@ -10,10 +8,8 @@
  * \brief Implements Nibble Memory
  *
  * This is a simple and fairly wasteful little module for nibble memory
- * allocation. Evemtually we'll put in something better.
+ * allocation.
  *
- * FIXME - it also has some semaphore stuff, and stuff to handle errno.
- *         These should be moved to some other place!
  */
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -27,19 +23,6 @@
 #include <yaz/xmalloc.h>
 #include <yaz/nmem.h>
 #include <yaz/log.h>
-#include <yaz/oid.h>
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#if YAZ_POSIX_THREADS
-#include <pthread.h>
-#endif
-
-#if YAZ_GNU_THREADS
-#include <pth.h>
-#endif
 
 #define NMEM_CHUNK (4*1024)
 
@@ -53,7 +36,7 @@ struct nmem_block
 
 struct nmem_control
 {
-    int total;
+    size_t total;
     struct nmem_block *blocks;
     struct nmem_control *next;
 };
@@ -78,198 +61,33 @@ struct align {
 static int log_level = 0;
 static int log_level_initialized = 0;
 
-#ifdef WIN32
-static CRITICAL_SECTION critical_section;
-#define NMEM_ENTER EnterCriticalSection(&critical_section)
-#define NMEM_LEAVE LeaveCriticalSection(&critical_section)
-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
-
-size_t nmem_memory_in_use = 0;
-size_t nmem_memory_free = 0;
-
-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;
-    if (!log_level_initialized)
-    {
-        log_level_initialized = 1;
-        log_level = yaz_log_module_level("nmem");
-    }
-
-}
-
-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)
-{
-    if (*p)
-    {
-#ifdef WIN32
-        DeleteCriticalSection(&(*p)->m_handle);
-#endif
-        free(*p);
-        *p = 0;
-    }
-}
-
-/** \brief free NMEM memory blocks . Reused in get_block */
-static struct nmem_block *freelist = NULL;
-
-/** \brief free NMEM control blocks. Reused in nmem_create */
-static struct nmem_control *cfreelist = NULL;
-
-/** \brief number NMEM's in use (number of nmem_controls not in free list) */
-static int nmem_active_no = 0;
-
-/** \brief NMEM usage counter */
-static int nmem_init_flag = 0;
-
-/** \brief whether nmem blocks should be reassigned to heap */
-static int nmem_release_in_heap = 1;
-
-#if NMEM_DEBUG
-struct nmem_debug_info {
-    void *p;
-    char file[40];
-    int line;
-    struct nmem_debug_info *next;
-};
-  
-struct nmem_debug_info *nmem_debug_list = 0;  
-#endif
-
 static void free_block(struct nmem_block *p)
 {  
-    nmem_memory_in_use -= p->size;
-    if (nmem_release_in_heap)
-    {
-        xfree(p->buf);
-        xfree(p);
-    }
-    else
-    {
-        memset(p->buf, 'Y', p->size);
-        p->next = freelist;
-        freelist = p;
-        nmem_memory_free += p->size;
-    }
-    if (log_level)
-        yaz_log (log_level, "nmem free_block p=%p", p);
-}
-
-#if NMEM_DEBUG
-void nmem_print_list (void)
-{
+    xfree(p->buf);
+    xfree(p);
     if (log_level)
-        nmem_print_list_l(log_level);
+        yaz_log(log_level, "nmem free_block p=%p", p);
 }
 
-void nmem_print_list_l (int level)
-{
-    struct nmem_debug_info *p;
-
-    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));
-    NMEM_LEAVE;
-}
-#endif
 /*
  * acquire a block with a minimum of size free bytes.
  */
 static struct nmem_block *get_block(size_t size)
 {
-    struct nmem_block *r, *l;
+    struct nmem_block *r;
+    size_t get = NMEM_CHUNK;
 
     if (log_level)
-        yaz_log (log_level, "nmem get_block size=%ld", (long) 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)
-    {
-        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;
-        nmem_memory_free -= r->size;
-    }
-    else
-    {
-        size_t get = NMEM_CHUNK;
-
-        if (get < size)
-            get = size;
-        if(log_level)
-            yaz_log (log_level, "nmem get_block alloc new block size=%ld",
-                     (long) get);
-
-        r = (struct nmem_block *) xmalloc(sizeof(*r));
-        r->buf = (char *)xmalloc(r->size = get);
-    }
-    nmem_memory_in_use += r->size;
+    if (get < size)
+        get = size;
+    if (log_level)
+        yaz_log(log_level, "nmem get_block alloc new block size=%ld",
+                (long) get);
+    
+    r = (struct nmem_block *) xmalloc(sizeof(*r));
+    r->buf = (char *)xmalloc(r->size = get);
     r->top = 0;
     return r;
 }
@@ -278,10 +96,9 @@ void nmem_reset(NMEM n)
 {
     struct nmem_block *t;
     
-    yaz_log (log_level, "nmem_reset p=%p", n);
+    yaz_log(log_level, "nmem_reset p=%p", n);
     if (!n)
         return;
-    NMEM_ENTER;
     while (n->blocks)
     {
         t = n->blocks;
@@ -289,32 +106,18 @@ void nmem_reset(NMEM n)
         free_block(t);
     }
     n->total = 0;
-    NMEM_LEAVE;
 }
 
-#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
+void *nmem_malloc(NMEM n, size_t size)
 {
     struct nmem_block *p;
     char *r;
 
-#if NMEM_DEBUG
-    if (log_level)
-        yaz_log (log_level, "%s:%d: nmem_malloc p=%p size=%d", 
-                file, line, n, size);
-#endif
     if (!n)
     {
-        yaz_log (YLOG_FATAL, "calling nmem_malloc with an null pointer");
-        abort ();
+        yaz_log(YLOG_FATAL, "calling nmem_malloc with an null pointer");
+        abort();
     }
-#ifdef WIN32
-    assert (nmem_init_flag);
-#endif
-    NMEM_ENTER;
     p = n->blocks;
     if (!p || p->size < size + p->top)
     {
@@ -326,119 +129,42 @@ void *nmem_malloc(NMEM n, int size)
     /* align size */
     p->top += (size + (NMEM_ALIGN - 1)) & ~(NMEM_ALIGN - 1);
     n->total += size;
-    NMEM_LEAVE;
     return r;
 }
 
-int nmem_total(NMEM n)
+size_t nmem_total(NMEM n)
 {
     return n->total;
 }
 
-#if NMEM_DEBUG
-NMEM nmem_create_f(const char *file, int line)
-#else
 NMEM nmem_create(void)
-#endif
 {
     NMEM r;
-#if NMEM_DEBUG
-    struct nmem_debug_info *debug_p;
-#endif
     if (!log_level_initialized)
     {
         log_level = yaz_log_module_level("nmem");
         log_level_initialized = 1;
     }
     
-    NMEM_ENTER;
-    nmem_active_no++;
-    r = cfreelist;
-    if (r)
-        cfreelist = cfreelist->next;
-    else
-        r = (struct nmem_control *)xmalloc(sizeof(*r));
-    NMEM_LEAVE;
+    r = (struct nmem_control *)xmalloc(sizeof(*r));
 
-#if NMEM_DEBUG
-    yaz_log (YLOG_DEBUG, "%s:%d: nmem_create %d p=%p", file, line,
-                     nmem_active_no, r);
-#endif
     r->blocks = 0;
     r->total = 0;
     r->next = 0;
 
-#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 ();
-        }
-    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';
-    debug_p->line = line;
-    debug_p->p = r;
-    debug_p->next = nmem_debug_list;
-    nmem_debug_list = debug_p;
-
-    nmem_print_list();
-#endif
     return r;
 }
 
-#if NMEM_DEBUG
-void nmem_destroy_f(const char *file, int line, NMEM n)
-#else
 void nmem_destroy(NMEM n)
-#endif
 {
-#if NMEM_DEBUG
-    struct nmem_debug_info **debug_p;
-    int ok = 0;
-#endif
     if (!n)
         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;
-        }
-    NMEM_LEAVE;
-    nmem_print_list();
-    if (!ok)
-    {
-        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--;
-    if (nmem_release_in_heap)
-    {
-        xfree(n);
-    }
-    else
-    {
-        n->next = cfreelist;
-        cfreelist = n;
-    }
-    NMEM_LEAVE;
+    xfree(n);
 }
 
-void nmem_transfer (NMEM dst, NMEM src)
+void nmem_transfer(NMEM dst, NMEM src)
 {
     struct nmem_block *t;
     while ((t = src->blocks))
@@ -451,155 +177,10 @@ void nmem_transfer (NMEM dst, NMEM src)
     src->total = 0;
 }
 
-void nmem_get_memory_in_use(size_t *p)
-{
-    NMEM_ENTER;
-    *p = nmem_memory_in_use;
-    NMEM_LEAVE;
-}
-
-void nmem_get_memory_free(size_t *p)
-{
-    NMEM_ENTER;
-    *p = nmem_memory_free;
-    NMEM_LEAVE;
-}
-
-void nmem_critical_enter (void)
-{
-    NMEM_ENTER;
-}
-
-void nmem_critical_leave (void)
-{
-    NMEM_LEAVE;
-}
-
-void nmem_init (void)
-{
-    if (++nmem_init_flag == 1)
-    {
-#ifdef WIN32
-        InitializeCriticalSection(&critical_section);
-#elif YAZ_GNU_THREADS
-        pth_init ();
-#endif
-        nmem_active_no = 0;
-        freelist = NULL;
-        cfreelist = NULL;
-    }
-    if (!log_level_initialized)
-    {
-        log_level = yaz_log_module_level("nmem");
-        log_level_initialized = 1;
-    }
-}
-
-void nmem_exit (void)
-{
-    if (--nmem_init_flag == 0)
-    {
-        oid_exit();
-        while (freelist)
-        {
-            struct nmem_block *fl = freelist;
-            nmem_memory_free -= fl->size;
-            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);
-#endif
-    }
-}
-
-
-#ifdef WIN32
-BOOL WINAPI DllMain (HINSTANCE hinstDLL,
-                     DWORD reason,
-                     LPVOID reserved)
-{
-    switch (reason)
-    {
-    case DLL_PROCESS_ATTACH:
-        nmem_init ();
-        break;
-    case DLL_PROCESS_DETACH:
-        nmem_exit ();
-    }
-    return TRUE;
-}
-#endif
-
-int yaz_errno(void)
-{
-    return errno;
-}
-
-void yaz_set_errno(int v)
-{
-    errno = v;
-}
-
-void yaz_strerror(char *buf, int max)
-{
-#ifdef WIN32
-    DWORD err;
-#endif
-    char *cp;
-    if (!log_level_initialized)
-    {
-        log_level = yaz_log_module_level("nmem");
-        log_level_initialized = 1;
-    }
-    
-#ifdef WIN32
-    err = GetLastError();
-    if (err)
-    {
-        FormatMessage(
-                FORMAT_MESSAGE_FROM_SYSTEM,
-                NULL,
-                err,
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default lang */
-                (LPTSTR) buf,
-                max-1,
-                NULL);
-    }
-    else
-        *buf = '\0';
-#else
-/* UNIX */
-#if HAVE_STRERROR_R
-#if YAZ_POSIX_THREADS
-    *buf = '\0';
-    strerror_r(errno, buf, max);
-    /* if buffer is unset - use strerror anyway (GLIBC bug) */
-    if (*buf == '\0')
-        strcpy(buf, strerror(yaz_errno()));
-#else
-    strcpy(buf, strerror(yaz_errno()));
-#endif
-#else
-    strcpy(buf, strerror(yaz_errno()));
-#endif
-/* UNIX */
-#endif
-    if ((cp = strrchr(buf, '\n')))
-        *cp = '\0';
-    if ((cp = strrchr(buf, '\r')))
-        *cp = '\0';
-}
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab