projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added more memory diagnostics (when NMEM_DEBUG is 1).
[yaz-moved-to-github.git]
/
util
/
nmem.c
diff --git
a/util/nmem.c
b/util/nmem.c
index
244dc6b
..
418962a
100644
(file)
--- a/
util/nmem.c
+++ b/
util/nmem.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: nmem.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: nmem.c,v $
- * Revision 1.8 1998-07-03 14:21:27 adam
+ * 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.
*
* Added critical sections for pthreads-library. Thanks to Ian Ibbotson,
* Fretwell Downing Informatics.
*
@@
-49,7
+55,7
@@
#include <pthread.h>
#endif
#include <pthread.h>
#endif
-#define NMEM_CHUNK (10*1024)
+#define NMEM_CHUNK (4*1024)
#ifdef WINDOWS
static CRITICAL_SECTION critical_section;
#ifdef WINDOWS
static CRITICAL_SECTION critical_section;
@@
-72,6
+78,9
@@
static void free_block(nmem_block *p)
{
p->next = freelist;
freelist = p;
{
p->next = freelist;
freelist = p;
+#if NMEM_DEBUG
+ logf (LOG_DEBUG, "nmem free_block p=%p", p);
+#endif
}
/*
}
/*
@@
-81,20
+90,31
@@
static nmem_block *get_block(int size)
{
nmem_block *r, *l;
{
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)
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;
if (l)
l->next = r->next;
else
freelist = r->next;
+ }
else
{
int get = NMEM_CHUNK;
if (get < size)
get = size;
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);
}
r = (nmem_block *)xmalloc(sizeof(*r));
r->buf = (char *)xmalloc(r->size = get);
}
@@
-106,6
+126,9
@@
void nmem_reset(NMEM n)
{
nmem_block *t;
{
nmem_block *t;
+#if NMEM_DEBUG
+ logf (LOG_DEBUG, "nmem_reset p=%p", n);
+#endif
if (!n)
return;
NMEM_ENTER;
if (!n)
return;
NMEM_ENTER;
@@
-119,11
+142,19
@@
void nmem_reset(NMEM n)
n->total = 0;
}
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)
void *nmem_malloc(NMEM n, int size)
+#endif
{
struct nmem_block *p;
char *r;
{
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;
if (!n)
return xmalloc(size);
NMEM_ENTER;