* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: xmalloc.c,v 1.18 2003-01-06 08:20:28 adam Exp $
+ * $Id: xmalloc.c,v 1.19 2003-05-16 13:14:26 adam Exp $
*/
#if HAVE_CONFIG_H
#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};
+static const unsigned char head[] = {88, 77, 66, 55, 44, 33, 22, 11};
+static const unsigned char tail[] = {11, 22, 33, 44, 55, 66, 77, 88};
+static const unsigned char freed[] = {11, 22, 33, 44, 55, 66, 77, 88};
struct dmalloc_info {
int len;
char *res;
struct dmalloc_info *dinfo;
- if (!(res = (char*) malloc(nbytes + sizeof(*dinfo)+8*sizeof(char))))
+ if (!(res = (char*) malloc(nbytes + sizeof(*dinfo)+16*sizeof(char))))
return 0;
dinfo = (struct dmalloc_info *) res;
strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
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));
+ memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
+ res += sizeof(*dinfo) + 8*sizeof(char);
+ memcpy(res + nbytes, tail, 8*sizeof(char));
return res;
}
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)))
+ ((char*)ptr - 8*sizeof(char) - sizeof(*dinfo));
+ if (memcmp(head, (char*) ptr - 8*sizeof(char), 8*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)))
+ if (memcmp((char*) ptr + dinfo->len, tail, 8*sizeof(char)))
{
yaz_log(LOG_FATAL, "xfree_d bad tail, %s:%d, %p", file, line, ptr);
abort();
dmalloc_list = dinfo->next;
if (dinfo->next)
dinfo->next->prev = dinfo->prev;
- memcpy ((char*) ptr - 4*sizeof(char), freed, 4*sizeof(char));
+ memcpy ((char*) ptr - 8*sizeof(char), freed, 8*sizeof(char));
free(dinfo);
return;
}
{
if (!nbytes)
return 0;
- res = (char *) malloc(nbytes + sizeof(*dinfo) + 8*sizeof(char));
+ res = (char *) malloc(nbytes + sizeof(*dinfo) + 16*sizeof(char));
}
else
{
- if (memcmp(head, ptr - 4*sizeof(char), 4*sizeof(char)))
+ if (memcmp(head, ptr - 8*sizeof(char), 8*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)))
+ dinfo = (struct dmalloc_info *) (ptr-8*sizeof(char) - sizeof(*dinfo));
+ if (memcmp(ptr + dinfo->len, tail, 8*sizeof(char)))
{
yaz_log(LOG_FATAL, "xrealloc_d bad tail, %s:%d, %p",
file, line, ptr);
return 0;
}
res = (char *)
- realloc(dinfo, nbytes + sizeof(*dinfo) + 8*sizeof(char));
+ realloc(dinfo, nbytes + sizeof(*dinfo) + 16*sizeof(char));
}
if (!res)
return 0;
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));
+ memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
+ res += sizeof(*dinfo) + 8*sizeof(char);
+ memcpy(res + nbytes, tail, 8*sizeof(char));
return res;
}
struct dmalloc_info *dinfo;
size_t nbytes = nmemb * size;
- if (!(res = (char*) calloc(1, nbytes+sizeof(*dinfo)+8*sizeof(char))))
+ if (!(res = (char*) calloc(1, nbytes+sizeof(*dinfo)+16*sizeof(char))))
return 0;
dinfo = (struct dmalloc_info *) res;
strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
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));
+ memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
+ res += sizeof(*dinfo) + 8*sizeof(char);
+ memcpy(res + nbytes, tail, 8*sizeof(char));
return res;
}
while (dinfo)
{
yaz_log (LOG_MALLOC, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
- ((char*) dinfo)+sizeof(*dinfo)+4*sizeof(char), dinfo->len);
+ ((char*) dinfo)+sizeof(*dinfo)+8*sizeof(char), dinfo->len);
size += dinfo->len;
dinfo = dinfo->next;
}