projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MEMDEBUG turned off by default.
[idzebra-moved-to-github.git]
/
dfa
/
imalloc.c
diff --git
a/dfa/imalloc.c
b/dfa/imalloc.c
index
a0a98f1
..
952eb7a
100644
(file)
--- a/
dfa/imalloc.c
+++ b/
dfa/imalloc.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1996, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: imalloc.c,v $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: imalloc.c,v $
- * Revision 1.3 1994-09-27 16:31:19 adam
+ * Revision 1.5 1996-05-14 11:33:41 adam
+ * MEMDEBUG turned off by default.
+ *
+ * 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
* First version of grepper: grep with error correction.
*
* Revision 1.2 1994/09/26 16:30:56 adam
@@
-19,10
+25,10
@@
#include <assert.h>
#include <stdlib.h>
#include <assert.h>
#include <stdlib.h>
-#include <util.h>
+#include <alexutil.h>
#include "imalloc.h"
#include "imalloc.h"
-#ifdef MEMDEBUG
+#if MEMDEBUG
#define MAG1 0x8fe1
#define MAG2 0x91
#define MAG3 0xee
#define MAG1 0x8fe1
#define MAG2 0x91
#define MAG3 0xee
@@
-35,11
+41,11
@@
int free_calls = 0;
void *imalloc (size_t size)
{
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 )
size_t words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
char *p = (char *)xmalloc( words*sizeof(unsigned) );
if( !p )
- log (LOG_FATAL, "No memory: imalloc(%u); c/f %d/%d; %ld/%ld",
+ logf (LOG_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;
size, alloc_calls, free_calls, alloc, max_alloc );
*((unsigned *)p) = size;
((unsigned *)p)[1] = MAG1;
@@
-53,18
+59,18
@@
void *imalloc (size_t size)
#else
void *p = (void *)xmalloc( size );
if( !p )
#else
void *p = (void *)xmalloc( size );
if( !p )
- log (LOG_FATAL, "Out of memory (imalloc)" );
+ logf (LOG_FATAL, "Out of memory (imalloc)" );
return p;
#endif
}
void *icalloc (size_t size)
{
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 )
unsigned words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
char *p = (char *) xcalloc( words*sizeof(unsigned), 1 );
if( !p )
- log (LOG_FATAL, "No memory: icalloc(%u); c/f %d/%d; %ld/%ld",
+ logf (LOG_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;
size, alloc_calls, free_calls, alloc, max_alloc );
((unsigned *)p)[0] = size;
((unsigned *)p)[1] = MAG1;
@@
-76,14
+82,14
@@
void *icalloc (size_t size)
++alloc_calls;
return (void *)p;
#else
++alloc_calls;
return (void *)p;
#else
- void *p = (void) xcalloc( size, 1 );
+ void *p = (void *) xcalloc( size, 1 );
if( !p )
if( !p )
- log (LOG_FATAL, "Out of memory (icalloc)" );
+ logf (LOG_FATAL, "Out of memory (icalloc)" );
return p;
#endif
}
return p;
#endif
}
-#ifdef MEMDEBUG
+#if MEMDEBUG
void i_free (void *p)
{
size_t size;
void i_free (void *p)
{
size_t size;
@@
-92,27
+98,19
@@
void i_free (void *p)
++free_calls;
size = (-2)[(unsigned *) p];
if( (-1)[(unsigned *) p] != MAG1 )
++free_calls;
size = (-2)[(unsigned *) p];
if( (-1)[(unsigned *) p] != MAG1 )
- log (LOG_FATAL,"Internal: ifree(%u) magic 1 corrupted", size );
+ logf (LOG_FATAL,"Internal: ifree(%u) magic 1 corrupted", size );
if( size[(unsigned char *) p] != MAG2 )
if( size[(unsigned char *) p] != MAG2 )
- log (LOG_FATAL,"Internal: ifree(%u) magic 2 corrupted", size );
+ logf (LOG_FATAL,"Internal: ifree(%u) magic 2 corrupted", size );
if( (size+1)[(unsigned char *) p] != MAG3 )
if( (size+1)[(unsigned char *) p] != MAG3 )
- log (LOG_FATAL,"Internal: ifree(%u) magic 3 corrupted", size );
+ logf (LOG_FATAL,"Internal: ifree(%u) magic 3 corrupted", size );
alloc -= size;
if( alloc < 0L )
alloc -= size;
if( alloc < 0L )
- log (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
+ logf (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
xfree( (unsigned *) p-2 );
}
xfree( (unsigned *) p-2 );
}
-#else
-#ifndef ANSI
-void i_free (void *p)
-{
- if (p)
- xfree( p );
-}
-#endif
#endif
#endif
-#ifdef MEMDEBUG
+#if MEMDEBUG
void imemstat (void)
{
fprintf( stdout, "imalloc: calls malloc/free %d/%d, ",
void imemstat (void)
{
fprintf( stdout, "imalloc: calls malloc/free %d/%d, ",