/*
- * 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,
* 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.
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 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_malloc(x, y) nmem_malloc_f(__FILE__, __LINE__, (x), (y))
#else
YAZ_EXPORT NMEM nmem_create(void);
YAZ_EXPORT void nmem_destroy(NMEM n);
+YAZ_EXPORT void *nmem_malloc(NMEM n, int size);
#endif
* 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
{
p->next = freelist;
freelist = p;
+#if NMEM_DEBUG
+ logf (LOG_DEBUG, "nmem free_block p=%p", p);
+#endif
}
/*
{
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
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);
}
{
nmem_block *t;
+#if NMEM_DEBUG
+ logf (LOG_DEBUG, "nmem_reset p=%p", n);
+#endif
if (!n)
return;
NMEM_ENTER;
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)
+#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;