X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fxmalloc.c;h=cc5fe3edc49759f5c7b521f2c041c7480f5e449f;hp=4264b24104635eeb05c7757b558c7c47c93146cc;hb=ce8f5caa5af3f70ce86985b384c0c8be156437b9;hpb=044d170f0a963555486df54653cd2fdc5815928b diff --git a/util/xmalloc.c b/util/xmalloc.c index 4264b24..cc5fe3e 100644 --- a/util/xmalloc.c +++ b/util/xmalloc.c @@ -1,10 +1,32 @@ /* - * 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.6 1998-02-11 11:53:36 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 @@ -44,77 +66,270 @@ * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include -#include -#include -#include +#include +#include + +#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 *xcalloc_d(size_t nmemb, size_t size, const char *file, int line) +{ + 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; +} + +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, char *file, int line) +void *xrealloc_f (void *o, size_t size, const char *file, int line) { - void *p = realloc (o, size); + 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 *xmalloc_f (size_t size, char *file, int line) +void *xmalloc_f (size_t size, const char *file, int line) { - void *p = malloc (size); - + 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 *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); + 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 *xstrdup_f (const char *s, char *file, int line) +char *xstrdup_f (const char *s, const char *file, int line) { - char *p = (char *)xmalloc (strlen(s)+1); + 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; } - -void xfree_f(void *p, char *file, int line) +void xfree_f(void *p, const char *file, int line) { if (!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 - free(p); + xfree_d(p, file, line); }