Use dmalloc instead of EFence when available (dmalloc has lot of improvements

over EFence and also hopefully smaller memory overhead, but sadly it's non-free
for commercial use).

If the DMALLOC_OPTIONS environment variable is not set, switch on `reasonable'
checks by default.

Also introduced mb_allocz() for cleared mb_alloc().
This commit is contained in:
Martin Mares 1999-03-04 11:36:26 +00:00
parent aa64578641
commit 7a2105becd
8 changed files with 47 additions and 5 deletions

View file

@ -109,7 +109,10 @@ BIRD_CHECK_TIME_T
if test "$enable_debug" = yes ; then if test "$enable_debug" = yes ; then
AC_DEFINE(PATH_CONFIG_DIR, ".") AC_DEFINE(PATH_CONFIG_DIR, ".")
AC_DEFINE(DEBUGGING) AC_DEFINE(DEBUGGING)
AC_CHECK_LIB(dmalloc, dmalloc_debug)
if test $ac_cv_lib_dmalloc_dmalloc_debug != yes ; then
AC_CHECK_LIB(efence, malloc) AC_CHECK_LIB(efence, malloc)
fi
else else
AC_DEFINE_UNQUOTED(PATH_CONFIG_DIR, "$sysconfdir") AC_DEFINE_UNQUOTED(PATH_CONFIG_DIR, "$sysconfdir")
fi fi

View file

@ -8,6 +8,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "nest/bird.h" #include "nest/bird.h"
#include "lib/resource.h" #include "lib/resource.h"
@ -156,6 +157,14 @@ mb_alloc(pool *p, unsigned size)
return b->data; return b->data;
} }
void *
mb_allocz(pool *p, unsigned size)
{
void *x = mb_alloc(p, size);
bzero(x, size);
return x;
}
void void
mb_free(void *m) mb_free(void *m)
{ {

View file

@ -43,6 +43,7 @@ extern pool root_pool;
/* Normal memory blocks */ /* Normal memory blocks */
void *mb_alloc(pool *, unsigned size); void *mb_alloc(pool *, unsigned size);
void *mb_allocz(pool *, unsigned size);
void mb_free(void *); void mb_free(void *);
/* Memory pools with linear allocation */ /* Memory pools with linear allocation */
@ -62,9 +63,24 @@ slab *sl_new(pool *, unsigned size);
void *sl_alloc(slab *); void *sl_alloc(slab *);
void sl_free(slab *, void *); void sl_free(slab *, void *);
/* Low-level memory allocation functions, please don't use */ /*
* Low-level memory allocation functions, please don't use
* outside resource manager and possibly sysdep code.
*/
#ifdef HAVE_LIBDMALLOC
/*
* The standard dmalloc macros tend to produce lots of namespace
* conflicts and we use only xmalloc and xfree, so we can define
* the stubs ourselves.
*/
#define DMALLOC_DISABLE
#include <dmalloc.h>
#define xmalloc(size) _xmalloc_leap(__FILE__, __LINE__, size)
#define xfree(ptr) _xfree_leap(__FILE__, __LINE__, ptr)
#else
void *xmalloc(unsigned); void *xmalloc(unsigned);
#define xfree(x) free(x) #define xfree(x) free(x)
#endif
#endif #endif

View file

@ -1,7 +1,7 @@
/* /*
* BIRD Library -- malloc() With Checking * BIRD Library -- malloc() With Checking
* *
* (c) 1998 Martin Mares <mj@ucw.cz> * (c) 1998--1999 Martin Mares <mj@ucw.cz>
* *
* Can be freely distributed and used under the terms of the GNU GPL. * Can be freely distributed and used under the terms of the GNU GPL.
*/ */
@ -11,6 +11,8 @@
#include "nest/bird.h" #include "nest/bird.h"
#include "lib/resource.h" #include "lib/resource.h"
#ifndef HAVE_LIBDMALLOC
void * void *
xmalloc(unsigned size) xmalloc(unsigned size)
{ {
@ -19,3 +21,5 @@ xmalloc(unsigned size)
return p; return p;
die("Unable to allocate %d bytes of memory", size); die("Unable to allocate %d bytes of memory", size);
} }
#endif

View file

@ -40,3 +40,6 @@
/* Path to configuration files */ /* Path to configuration files */
#define PATH_CONFIG_DIR ? #define PATH_CONFIG_DIR ?
/* Are we using dmalloc? */
#undef HAVE_LIBDMALLOC

View file

@ -8,6 +8,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/signal.h> #include <sys/signal.h>
@ -186,6 +187,11 @@ parse_args(int argc, char **argv)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
#ifdef HAVE_LIBDMALLOC
if (!getenv("DMALLOC_OPTIONS"))
dmalloc_debug(0x2f03d00);
#endif
log_init_debug(NULL); log_init_debug(NULL);
parse_args(argc, argv); parse_args(argc, argv);

View file

@ -14,7 +14,7 @@ subdir depend:
set -e ; for a in $(static-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done set -e ; for a in $(static-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
$(exedir)/bird: $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a $(exedir)/bird: $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
$(CC) $(LDFLAGS) -o $@ $^ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
.dir-stamp: .dir-stamp:
mkdir -p $(static-dirs) mkdir -p $(static-dirs)

View file

@ -18,7 +18,8 @@ dir-objs:=$(addprefix $(objdir)/,$(all-dirs))
CPPFLAGS=-I$(root-rel) -I$(srcdir) CPPFLAGS=-I$(root-rel) -I$(srcdir)
CFLAGS=$(CPPFLAGS) @CFLAGS@ CFLAGS=$(CPPFLAGS) @CFLAGS@
LDFLAGS=@LIBS@ LDFLAGS=
LIBS=@LIBS@
CC=@CC@ CC=@CC@
M4=@M4@ M4=@M4@
BISON=@BISON@ BISON=@BISON@