X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fnmem.c;h=5f55cee7acd9d003dfa3c46931c10434673a5cf9;hp=244dc6b11ab83ed2f43db3adb3effaec7dbc2d75;hb=a49837cbe6fcbeeb9ce857b0eeb942619ba80b5e;hpb=81503ca4c08bfaf4eb6782a9207cc33fa941a442 diff --git a/util/nmem.c b/util/nmem.c index 244dc6b..5f55cee 100644 --- a/util/nmem.c +++ b/util/nmem.c @@ -4,7 +4,23 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: nmem.c,v $ - * Revision 1.8 1998-07-03 14:21:27 adam + * Revision 1.13 1998-10-19 15:24:21 adam + * New nmem utility, nmem_transfer, that transfer blocks from one + * NMEM to another. + * + * 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 +62,23 @@ #ifdef WINDOWS #include #elif _REENTRANT + +#if HAVE_PTHREAD_H #include +#elif HAVE_THREAD_H +#include #endif -#define NMEM_CHUNK (10*1024) +#endif + +#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 +94,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 +106,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 +142,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; @@ -115,15 +154,23 @@ void nmem_reset(NMEM n) n->blocks = n->blocks->next; free_block(t); } - NMEM_LEAVE; 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 { 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 +241,29 @@ void nmem_destroy(NMEM n) #endif } +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; + } + dst->total += src->total; + src->total = 0; +} + +void nmem_critical_enter (void) +{ + NMEM_ENTER; +} + +void nmem_critical_leave (void) +{ + NMEM_LEAVE; +} + void nmem_init (void) { #ifdef WINDOWS