diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-10-31 16:46:38 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-10-31 16:46:38 +0100 |
| commit | 8d4210b25a791c37deca8a37b14565fd6fad2d1f (patch) | |
| tree | 0ad2e59b0282af47b8d956da0f2ca0669aeb3139 | |
| parent | c16c80532af30922cb222f75971cd2aecdb9e36c (diff) | |
| download | otp-8d4210b25a791c37deca8a37b14565fd6fad2d1f.tar.gz otp-8d4210b25a791c37deca8a37b14565fd6fad2d1f.tar.bz2 otp-8d4210b25a791c37deca8a37b14565fd6fad2d1f.zip | |
erts: Remove faked MSEG_ALLOC
* Not used except in valgrind but there mseg is disabled completely
via Meamin.
| -rw-r--r-- | erts/emulator/Makefile.in | 4 | ||||
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.c | 24 |
2 files changed, 5 insertions, 23 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 7e966c81bb..dfb35ec996 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -61,7 +61,7 @@ else ifeq ($(TYPE),purify) PURIFY = purify $(PURIFY_BUILD_OPTIONS) TYPEMARKER = .purify -TYPE_FLAGS = $(DEBUG_CFLAGS) -DPURIFY -DNO_JUMP_TABLE -DERTS_MSEG_FAKE_SEGMENTS +TYPE_FLAGS = $(DEBUG_CFLAGS) -DPURIFY -DNO_JUMP_TABLE ENABLE_ALLOC_TYPE_VARS += purify else @@ -92,7 +92,7 @@ else ifeq ($(TYPE),valgrind) PURIFY = TYPEMARKER = .valgrind -TYPE_FLAGS = $(DEBUG_CFLAGS) -DVALGRIND -DNO_JUMP_TABLE -DERTS_MSEG_FAKE_SEGMENTS +TYPE_FLAGS = $(DEBUG_CFLAGS) -DVALGRIND -DNO_JUMP_TABLE ENABLE_ALLOC_TYPE_VARS += valgrind else diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c index db2854fa40..1235a32e8c 100644 --- a/erts/emulator/sys/common/erl_mseg.c +++ b/erts/emulator/sys/common/erl_mseg.c @@ -116,15 +116,6 @@ static int mmap_fd; #error "Not supported" #endif /* #if HAVE_MMAP */ -#if defined(ERTS_MSEG_FAKE_SEGMENTS) && HALFWORD_HEAP -# warning "ERTS_MSEG_FAKE_SEGMENTS will only be used for high memory segments" -#endif - -#if defined(ERTS_MSEG_FAKE_SEGMENTS) -#undef CAN_PARTLY_DESTROY -#define CAN_PARTLY_DESTROY 0 -#endif - const ErtsMsegOpt_t erts_mseg_default_opt = { 1, /* Use cache */ 1, /* Preserv data */ @@ -349,9 +340,7 @@ mseg_create(ErtsMsegAllctr_t *ma, MemKind* mk, Uint size) else #endif { -#if defined(ERTS_MSEG_FAKE_SEGMENTS) - seg = erts_sys_alloc(ERTS_ALC_N_INVALID, NULL, size); -#elif HAVE_MMAP +#if HAVE_MMAP { seg = (void *) mmap((void *) 0, (size_t) size, MMAP_PROT, MMAP_FLAGS, MMAP_FD, 0); @@ -385,12 +374,7 @@ mseg_destroy(ErtsMsegAllctr_t *ma, MemKind* mk, void *seg, Uint size) else #endif { -#ifdef ERTS_MSEG_FAKE_SEGMENTS - erts_sys_free(ERTS_ALC_N_INVALID, NULL, seg); -#ifdef DEBUG - res = 0; -#endif -#elif HAVE_MMAP +#ifdef HAVE_MMAP #ifdef DEBUG res = #endif @@ -426,9 +410,7 @@ mseg_recreate(ErtsMsegAllctr_t *ma, MemKind* mk, void *old_seg, Uint old_size, U else #endif { -#if defined(ERTS_MSEG_FAKE_SEGMENTS) - new_seg = erts_sys_realloc(ERTS_ALC_N_INVALID, NULL, old_seg, new_size); -#elif HAVE_MREMAP +#if HAVE_MREMAP #if defined(__NetBSD__) new_seg = (void *) mremap((void *) old_seg, |