/*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2000, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: xmalloc.c,v $
- * Revision 1.7 1999-07-13 13:24:53 adam
+ * Revision 1.13 2001-09-30 20:10:28 adam
+ * TRACE_MALLOC=1.
+ *
+ * Revision 1.12 2001/09/24 21:51:56 adam
+ * New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
+ * and yaz_z3950oid_to_str.
+ *
+ * Revision 1.11 2000/02/29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.10 1999/11/30 13:47:12 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.9 1999/09/10 08:58:32 adam
+ * Set TRACE_XMALLOC to 1.
+ *
+ * Revision 1.8 1999/08/27 09:40:32 adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.7 1999/07/13 13:24:53 adam
* Updated memory debugging memory allocatation routines.
*
* Revision 1.6 1998/02/11 11:53:36 adam
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <log.h>
-#include <xmalloc.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
-#define TRACE_XMALLOC 0
+#define TRACE_XMALLOC 1
#if TRACE_XMALLOC > 1
((char*)ptr - 4*sizeof(char) - sizeof(*dinfo));
if (memcmp(head, (char*) ptr - 4*sizeof(char), 4*sizeof(char)))
{
- logf(LOG_FATAL, "xfree_d bad head, %s:%d, %p", file, line, ptr);
+ yaz_log(LOG_FATAL, "xfree_d bad head, %s:%d, %p", file, line, ptr);
abort();
}
if (memcmp((char*) ptr + dinfo->len, tail, 4*sizeof(char)))
{
- logf(LOG_FATAL, "xfree_d bad tail, %s:%d, %p", file, line, ptr);
+ yaz_log(LOG_FATAL, "xfree_d bad tail, %s:%d, %p", file, line, ptr);
abort();
}
if (dinfo->prev)
{
if (memcmp(head, ptr - 4*sizeof(char), 4*sizeof(char)))
{
- logf(LOG_FATAL, "xrealloc_d bad head, %s:%d, %p", file, line, ptr);
+ yaz_log(LOG_FATAL, "xrealloc_d bad head, %s:%d, %p",
+ file, line, ptr);
abort();
}
dinfo = (struct dmalloc_info *) (ptr-4*sizeof(char) - sizeof(*dinfo));
if (memcmp(ptr + dinfo->len, tail, 4*sizeof(char)))
{
- logf(LOG_FATAL, "xrealloc_d bad tail, %s:%d, %p", file, line, ptr);
+ yaz_log(LOG_FATAL, "xrealloc_d bad tail, %s:%d, %p",
+ file, line, ptr);
abort();
}
if (dinfo->prev)
size_t size = 0;
struct dmalloc_info *dinfo = dmalloc_list;
- logf (LOG_LOG, "malloc_trav %s:%d", file, line);
+ yaz_log (LOG_LOG, "malloc_trav %s:%d", file, line);
while (dinfo)
{
- logf (LOG_LOG, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
- dinfo+sizeof(*dinfo)+4*sizeof(char), dinfo->len);
+ yaz_log (LOG_LOG, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
+ ((char*) dinfo)+sizeof(*dinfo)+4*sizeof(char), dinfo->len);
size += dinfo->len;
dinfo = dinfo->next;
}
- logf (LOG_LOG, "total bytes %ld", (long) size);
+ yaz_log (LOG_LOG, "total bytes %ld", (long) size);
}
#else
-/* ! TRACE_XMALLOC */
+/* TRACE_XMALLOC <= 1 */
#define xrealloc_d(o, x, f, l) realloc(o, x)
#define xmalloc_d(x, f, l) malloc(x)
#define xcalloc_d(x,y, f, l) calloc(x,y)
void *p = xrealloc_d (o, size, file, line);
#if TRACE_XMALLOC
- logf (LOG_DEBUG,
+ yaz_log (LOG_DEBUG,
"%s:%d: xrealloc(s=%d) %p -> %p", file, line, size, o, p);
#endif
if (!p)
{
- logf (LOG_FATAL|LOG_ERRNO, "Out of memory, realloc (%d bytes)", size);
+ yaz_log (LOG_FATAL|LOG_ERRNO, "Out of memory, realloc (%d bytes)",
+ size);
exit(1);
}
return p;
void *p = xmalloc_d (size, file, line);
#if TRACE_XMALLOC
- logf (LOG_DEBUG, "%s:%d: xmalloc(s=%d) %p", file, line, size, p);
+ yaz_log (LOG_DEBUG, "%s:%d: xmalloc(s=%d) %p", file, line, size, p);
#endif
if (!p)
{
- logf (LOG_FATAL, "Out of memory - malloc (%d bytes)", size);
+ yaz_log (LOG_FATAL, "Out of memory - malloc (%d bytes)", size);
exit (1);
}
return p;
{
void *p = xcalloc_d (nmemb, size, file, line);
#if TRACE_XMALLOC
- logf (LOG_DEBUG, "%s:%d: xcalloc(s=%d) %p", file, line, size, p);
+ yaz_log (LOG_DEBUG, "%s:%d: xcalloc(s=%d) %p", file, line, size, p);
#endif
if (!p)
{
- logf (LOG_FATAL, "Out of memory - calloc (%d, %d)", nmemb, size);
+ yaz_log (LOG_FATAL, "Out of memory - calloc (%d, %d)", nmemb, size);
exit (1);
}
return p;
{
char *p = (char *)xmalloc_d (strlen(s)+1, file, line);
#if TRACE_XMALLOC
- logf (LOG_DEBUG, "%s:%d: xstrdup(s=%d) %p", file, line, strlen(s)+1, p);
+ yaz_log (LOG_DEBUG, "%s:%d: xstrdup(s=%d) %p", file, line, strlen(s)+1, p);
#endif
strcpy (p, s);
return p;
return ;
#if TRACE_XMALLOC
if (p)
- logf (LOG_DEBUG, "%s:%d: xfree %p", file, line, p);
+ yaz_log (LOG_DEBUG, "%s:%d: xfree %p", file, line, p);
#endif
xfree_d(p, file, line);
}