aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-07-06 12:23:31 +0200
committerSverker Eriksson <[email protected]>2017-07-06 12:23:31 +0200
commit5e0019ebb29a9fd88e0b04f0bd0b0d722e3f189e (patch)
treeb01a7de4d7b3dfb72d67f6250d8278cd6deee4b7
parent049c6f000e283c78838f00ced2acda3d8f6985a7 (diff)
parent28b43fc941659a8283693b0f5de107610ad0dc1b (diff)
downloadotp-5e0019ebb29a9fd88e0b04f0bd0b0d722e3f189e.tar.gz
otp-5e0019ebb29a9fd88e0b04f0bd0b0d722e3f189e.tar.bz2
otp-5e0019ebb29a9fd88e0b04f0bd0b0d722e3f189e.zip
Merge branch 'sverker/prealloc-race-bug/maint' into maint
* sverker/prealloc-race-bug/maint: erts: Increase pre-allocated blocks #ifdef DEBUG
-rw-r--r--erts/emulator/beam/erl_alloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index 7b5cbe2178..ee2d73afed 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -448,7 +448,7 @@ NAME##_free(TYPE *p) \
}
#ifdef DEBUG
-#define ERTS_PRE_ALLOC_SIZE(SZ) 2
+#define ERTS_PRE_ALLOC_SIZE(SZ) ((SZ) < 1000 ? (SZ)/10 + 10 : 100)
#define ERTS_PRE_ALLOC_CLOBBER(P, T) memset((void *) (P), 0xfd, sizeof(T))
#else
#define ERTS_PRE_ALLOC_SIZE(SZ) ((SZ) > 1 ? (SZ) : 1)