-/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: imalloc.c,v $
- * Revision 1.4 1995-09-04 12:33:26 adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.3 1994/09/27 16:31:19 adam
- * First version of grepper: grep with error correction.
- *
- * Revision 1.2 1994/09/26 16:30:56 adam
- * Minor changes. imalloc uses xmalloc now.
- *
- * Revision 1.1 1994/09/26 10:16:54 adam
- * First version of dfa module in alex. This version uses yacc to parse
- * regular expressions. This should be hand-made instead.
- *
- */
+/* $Id: imalloc.c,v 1.13 2005-04-15 10:47:47 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
-#include <alexutil.h>
+#include <idzebra/util.h>
+#include <yaz/xmalloc.h>
#include "imalloc.h"
-#ifdef MEMDEBUG
+#if MEMDEBUG
#define MAG1 0x8fe1
#define MAG2 0x91
#define MAG3 0xee
void *imalloc (size_t size)
{
-#ifdef MEMDEBUG
+#if MEMDEBUG
size_t words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
char *p = (char *)xmalloc( words*sizeof(unsigned) );
if( !p )
- logf (LOG_FATAL, "No memory: imalloc(%u); c/f %d/%d; %ld/%ld",
+ yaz_log (YLOG_FATAL, "No memory: imalloc(%u); c/f %d/%d; %ld/%ld",
size, alloc_calls, free_calls, alloc, max_alloc );
*((unsigned *)p) = size;
((unsigned *)p)[1] = MAG1;
#else
void *p = (void *)xmalloc( size );
if( !p )
- logf (LOG_FATAL, "Out of memory (imalloc)" );
+ yaz_log (YLOG_FATAL, "Out of memory (imalloc)" );
return p;
#endif
}
void *icalloc (size_t size)
{
-#ifdef MEMDEBUG
+#if MEMDEBUG
unsigned words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
char *p = (char *) xcalloc( words*sizeof(unsigned), 1 );
if( !p )
- logf (LOG_FATAL, "No memory: icalloc(%u); c/f %d/%d; %ld/%ld",
+ yaz_log (YLOG_FATAL, "No memory: icalloc(%u); c/f %d/%d; %ld/%ld",
size, alloc_calls, free_calls, alloc, max_alloc );
((unsigned *)p)[0] = size;
((unsigned *)p)[1] = MAG1;
++alloc_calls;
return (void *)p;
#else
- void *p = (void) xcalloc( size, 1 );
+ void *p = (void *) xcalloc( size, 1 );
if( !p )
- logf (LOG_FATAL, "Out of memory (icalloc)" );
+ yaz_log (YLOG_FATAL, "Out of memory (icalloc)" );
return p;
#endif
}
-#ifdef MEMDEBUG
-void i_free (void *p)
+void ifree (void *p)
{
+#if MEMDEBUG
size_t size;
if( !p )
return;
++free_calls;
size = (-2)[(unsigned *) p];
if( (-1)[(unsigned *) p] != MAG1 )
- logf (LOG_FATAL,"Internal: ifree(%u) magic 1 corrupted", size );
+ yaz_log (YLOG_FATAL,"Internal: ifree(%u) magic 1 corrupted", size );
if( size[(unsigned char *) p] != MAG2 )
- logf (LOG_FATAL,"Internal: ifree(%u) magic 2 corrupted", size );
+ yaz_log (YLOG_FATAL,"Internal: ifree(%u) magic 2 corrupted", size );
if( (size+1)[(unsigned char *) p] != MAG3 )
- logf (LOG_FATAL,"Internal: ifree(%u) magic 3 corrupted", size );
+ yaz_log (YLOG_FATAL,"Internal: ifree(%u) magic 3 corrupted", size );
alloc -= size;
if( alloc < 0L )
- logf (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
+ yaz_log (YLOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
xfree( (unsigned *) p-2 );
-}
#else
-#ifndef ANSI
-void i_free (void *p)
-{
- if (p)
- xfree( p );
-}
-#endif
+ xfree (p);
#endif
+}
-#ifdef MEMDEBUG
+#if MEMDEBUG
void imemstat (void)
{
fprintf( stdout, "imalloc: calls malloc/free %d/%d, ",