Added more memory diagnostics (when NMEM_DEBUG is 1).

diff --git a/include/nmem.h b/include/nmem.h
index bd3581a..6ae6ee4 100644 (file)
--- a/include/nmem.h
+++ b/include/nmem.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.

  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,

@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: nmem.h,v $
  * OF THIS SOFTWARE.
  *
  * $Log: nmem.h,v $

- * Revision 1.7  1997-10-31 12:20:08  adam
+ * Revision 1.8  1998-07-20 12:35:59  adam
+ * Added more memory diagnostics (when NMEM_DEBUG is 1).
+ *
+ * Revision 1.7  1997/10/31 12:20:08  adam

  * Improved memory debugging for xmalloc/nmem.c. References to NMEM
  * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
  * Bug fix: missing fclose in data1_read_espec1.
  * Improved memory debugging for xmalloc/nmem.c. References to NMEM
  * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
  * Bug fix: missing fclose in data1_read_espec1.

@@ -63,7 +66,6 @@ typedef struct nmem_control
 typedef struct nmem_control *NMEM;
 
 YAZ_EXPORT void nmem_reset(NMEM n);
 typedef struct nmem_control *NMEM;
 
 YAZ_EXPORT void nmem_reset(NMEM n);

-YAZ_EXPORT void *nmem_malloc(NMEM n, int size);

 YAZ_EXPORT int nmem_total(NMEM n);
 YAZ_EXPORT char *nmem_strdup (NMEM mem, const char *src);
 
 YAZ_EXPORT int nmem_total(NMEM n);
 YAZ_EXPORT char *nmem_strdup (NMEM mem, const char *src);
 

@@ -71,13 +73,16 @@ YAZ_EXPORT char *nmem_strdup (NMEM mem, const char *src);
 
 YAZ_EXPORT NMEM nmem_create_f(const char *file, int line);
 YAZ_EXPORT void nmem_destroy_f(const char *file, int line, NMEM n);
 
 YAZ_EXPORT NMEM nmem_create_f(const char *file, int line);
 YAZ_EXPORT void nmem_destroy_f(const char *file, int line, NMEM n);

+YAZ_EXPORT void *nmem_malloc_f(const char *file, int line, NMEM n, int size);

 #define nmem_create() nmem_create_f(__FILE__, __LINE__)
 #define nmem_destroy(x) nmem_destroy_f(__FILE__, __LINE__, (x))
 #define nmem_create() nmem_create_f(__FILE__, __LINE__)
 #define nmem_destroy(x) nmem_destroy_f(__FILE__, __LINE__, (x))

+#define nmem_malloc(x, y) nmem_malloc_f(__FILE__, __LINE__, (x), (y))

 
 #else
 
 YAZ_EXPORT NMEM nmem_create(void);
 YAZ_EXPORT void nmem_destroy(NMEM n);
 
 #else
 
 YAZ_EXPORT NMEM nmem_create(void);
 YAZ_EXPORT void nmem_destroy(NMEM n);

+YAZ_EXPORT void *nmem_malloc(NMEM n, int size);

 
 #endif
 
 
 #endif
 

diff --git a/util/nmem.c b/util/nmem.c
index 981c22c..418962a 100644 (file)
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $

- * Revision 1.9  1998-07-07 15:49:01  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
  * Reduced chunk size.
  *
  * Revision 1.8  1998/07/03 14:21:27  adam

@@ -75,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

 }
 
 /*
 }
 
 /*

@@ -84,11 +90,17 @@ 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
        if (l)
            l->next = r->next;
        else

@@ -100,6 +112,9 @@ static nmem_block *get_block(int size)
 
        if (get < size)
            get = size;
 
        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);
     }

@@ -111,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;

@@ -124,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;