/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-2000, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: xmalloc.c,v $
- * Revision 1.2 1995-12-05 11:08:37 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
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.5 1997/10/31 12:20:09 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.
+ *
+ * Revision 1.4 1996/07/03 13:21:36 adam
+ * Function xfree_f checks for NULL pointer.
+ *
+ * Revision 1.3 1995/12/05 15:08:44 adam
+ * Fixed verbose of xrealloc.
+ *
+ * Revision 1.2 1995/12/05 11:08:37 adam
* More verbose malloc routines.
*
* Revision 1.1 1995/11/01 11:56:53 quinn
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <log.h>
-#include <xmalloc.h>
-#include <dmalloc.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
+
+#define TRACE_XMALLOC 1
+
+#if TRACE_XMALLOC > 1
+
+static const unsigned char head[] = {44, 33, 22, 11};
+static const unsigned char tail[] = {11, 22, 33, 44};
+static const unsigned char freed[] = {11, 22, 33, 44};
+
+struct dmalloc_info {
+ int len;
+ char file[16];
+ int line;
+ struct dmalloc_info *next;
+ struct dmalloc_info *prev;
+};
+
+struct dmalloc_info *dmalloc_list = 0;
+
+void *xmalloc_d(size_t nbytes, const char *file, int line)
+{
+ char *res;
+ struct dmalloc_info *dinfo;
+
+ if (!(res = (char*) malloc(nbytes + sizeof(*dinfo)+8*sizeof(char))))
+ return 0;
+ dinfo = (struct dmalloc_info *) res;
+ strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
+ dinfo->file[sizeof(dinfo->file)-1] = '\0';
+ dinfo->line = line;
+ dinfo->len = nbytes;
+
+ dinfo->prev = 0;
+ dinfo->next = dmalloc_list;
+ if (dinfo->next)
+ dinfo->next->prev = dinfo;
+ dmalloc_list = dinfo;
+
+ memcpy(res + sizeof(*dinfo), head, 4*sizeof(char));
+ res += sizeof(*dinfo) + 4*sizeof(char);
+ memcpy(res + nbytes, tail, 4*sizeof(char));
+ return res;
+}
+
+void xfree_d(void *ptr, const char *file, int line)
+{
+ struct dmalloc_info *dinfo;
+
+ if (!ptr)
+ return;
+ dinfo = (struct dmalloc_info *)
+ ((char*)ptr - 4*sizeof(char) - sizeof(*dinfo));
+ if (memcmp(head, (char*) ptr - 4*sizeof(char), 4*sizeof(char)))
+ {
+ 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)))
+ {
+ yaz_log(LOG_FATAL, "xfree_d bad tail, %s:%d, %p", file, line, ptr);
+ abort();
+ }
+ if (dinfo->prev)
+ dinfo->prev->next = dinfo->next;
+ else
+ dmalloc_list = dinfo->next;
+ if (dinfo->next)
+ dinfo->next->prev = dinfo->prev;
+ memcpy ((char*) ptr - 4*sizeof(char), freed, 4*sizeof(char));
+ free(dinfo);
+ return;
+}
+
+void *xrealloc_d(void *p, size_t nbytes, const char *file, int line)
+{
+ struct dmalloc_info *dinfo;
+ char *ptr = (char*) p;
+ char *res;
+
+ if (!ptr)
+ {
+ if (!nbytes)
+ return 0;
+ res = (char *) malloc(nbytes + sizeof(*dinfo) + 8*sizeof(char));
+ }
+ else
+ {
+ if (memcmp(head, ptr - 4*sizeof(char), 4*sizeof(char)))
+ {
+ 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)))
+ {
+ yaz_log(LOG_FATAL, "xrealloc_d bad tail, %s:%d, %p",
+ file, line, ptr);
+ abort();
+ }
+ if (dinfo->prev)
+ dinfo->prev->next = dinfo->next;
+ else
+ dmalloc_list = dinfo->next;
+ if (dinfo->next)
+ dinfo->next->prev = dinfo->prev;
+
+ if (!nbytes)
+ {
+ free (dinfo);
+ return 0;
+ }
+ res = (char *)
+ realloc(dinfo, nbytes + sizeof(*dinfo) + 8*sizeof(char));
+ }
+ if (!res)
+ return 0;
+ dinfo = (struct dmalloc_info *) res;
+ strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
+ dinfo->file[sizeof(dinfo->file)-1] = '\0';
+ dinfo->line = line;
+ dinfo->len = nbytes;
+
+ dinfo->prev = 0;
+ dinfo->next = dmalloc_list;
+ if (dmalloc_list)
+ dmalloc_list->prev = dinfo;
+ dmalloc_list = dinfo;
+
+ memcpy(res + sizeof(*dinfo), head, 4*sizeof(char));
+ res += sizeof(*dinfo) + 4*sizeof(char);
+ memcpy(res + nbytes, tail, 4*sizeof(char));
+ return res;
+}
-void *xrealloc_f (void *o, size_t size, char *file, int line)
+void *xcalloc_d(size_t nmemb, size_t size, const char *file, int line)
{
- void *p;
+ char *res;
+ struct dmalloc_info *dinfo;
+ size_t nbytes = nmemb * size;
+
+ if (!(res = (char*) calloc(1, nbytes+sizeof(*dinfo)+8*sizeof(char))))
+ return 0;
+ dinfo = (struct dmalloc_info *) res;
+ strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
+ dinfo->file[sizeof(dinfo->file)-1] = '\0';
+ dinfo->line = line;
+ dinfo->len = nbytes;
+
+ dinfo->prev = 0;
+ dinfo->next = dmalloc_list;
+ if (dinfo->next)
+ dinfo->next->prev = dinfo;
+ dmalloc_list = dinfo;
+
+ memcpy(res + sizeof(*dinfo), head, 4*sizeof(char));
+ res += sizeof(*dinfo) + 4*sizeof(char);
+ memcpy(res + nbytes, tail, 4*sizeof(char));
+ return res;
+}
-#ifdef TRACE_XMALLOC
- fprintf(stderr, "%s:%d: xrealloc(s=%d) %p", file, line, size, p);
+void xmalloc_trav_d(const char *file, int line)
+{
+ size_t size = 0;
+ struct dmalloc_info *dinfo = dmalloc_list;
+
+ yaz_log (LOG_LOG, "malloc_trav %s:%d", file, line);
+ while (dinfo)
+ {
+ 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;
+ }
+ yaz_log (LOG_LOG, "total bytes %ld", (long) size);
+}
+
+#else
+/* 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)
+#define xfree_d(x, f, l) free(x)
+#define xmalloc_trav_d(f, l)
+#endif
+
+void xmalloc_trav_f(const char *s, const char *file, int line)
+{
+ xmalloc_trav_d(file, line);
+}
+
+void *xrealloc_f (void *o, size_t size, const char *file, int line)
+{
+ void *p = xrealloc_d (o, size, file, line);
+
+#if TRACE_XMALLOC
+ yaz_log (LOG_DEBUG,
+ "%s:%d: xrealloc(s=%d) %p -> %p", file, line, size, o, p);
#endif
- p = realloc (o, size);
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);
}
-#ifdef TRACE_XMALLOC
- fprintf(stderr, " -> %p\n", p);
-#endif
return p;
}
-void *xmalloc_f (size_t size, char *file, int line)
+void *xmalloc_f (size_t size, const char *file, int line)
{
- void *p = malloc (size);
-
-#ifdef TRACE_XMALLOC
- fprintf(stderr, "%s:%d: xmalloc(s=%d) %p\n", file, line, size, p);
+ void *p = xmalloc_d (size, file, line);
+
+#if TRACE_XMALLOC
+ 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 *xcalloc_f (size_t nmemb, size_t size, char *file, int line)
+void *xcalloc_f (size_t nmemb, size_t size, const char *file, int line)
{
- void *p = calloc (nmemb, size);
-#ifdef TRACE_XMALLOC
- fprintf(stderr, "%s:%d: xcalloc(s=%d) %p\n", file, line, size, p);
+ void *p = xcalloc_d (nmemb, size, file, line);
+#if TRACE_XMALLOC
+ 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 *xstrdup_f (const char *s, char *file, int line)
+char *xstrdup_f (const char *s, const char *file, int line)
{
- char *p = xmalloc (strlen(s)+1);
-#ifdef TRACE_XMALLOC
- fprintf(stderr, "%s:%d: xstrdup(s=%d) %p\n", file, line, strlen(s)+1, p);
+ char *p = (char *)xmalloc_d (strlen(s)+1, file, line);
+#if TRACE_XMALLOC
+ yaz_log (LOG_DEBUG, "%s:%d: xstrdup(s=%d) %p", file, line, strlen(s)+1, p);
#endif
strcpy (p, s);
return p;
}
-
-void xfree_f(void *p, char *file, int line)
+void xfree_f(void *p, const char *file, int line)
{
-#ifdef TRACE_XMALLOC
+ if (!p)
+ return ;
+#if TRACE_XMALLOC
if (p)
- fprintf(stderr, "%s:%d: xfree %p\n", file, line, p);
+ yaz_log (LOG_DEBUG, "%s:%d: xfree %p", file, line, p);
#endif
- free(p);
+ xfree_d(p, file, line);
}
projects / yaz-moved-to-github.git / blobdiff