aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-11-27 12:12:01 +0100
committerSverker Eriksson <[email protected]>2015-11-27 12:12:01 +0100
commitb916edc72a8eb82068229222abde1b9ff43dbad2 (patch)
tree2c8647bdecb229bd430066507e00e1ac710e7109 /erts/etc/common
parenta838b671ef9cc7582f0768778a0447df614b71dd (diff)
parent64d1a7397c53d6cca32c49af9f833cdf6d26fc6e (diff)
downloadotp-b916edc72a8eb82068229222abde1b9ff43dbad2.tar.gz
otp-b916edc72a8eb82068229222abde1b9ff43dbad2.tar.bz2
otp-b916edc72a8eb82068229222abde1b9ff43dbad2.zip
Merge branch 'sverk/cpool_fetch-dc_list-fix' into maint
OTP-13147 * sverk/cpool_fetch-dc_list-fix: erts: Reduce alloc_SUITE:rbtree runtime for valgrind erts: Remove double free in efile_drv erts: Improve alloc_SUITE:migration test erts: Pass free mem and build type to alloc_SUITE tests erts: Fix snprintf in alloc_SUITE for windows erts: Workaround for strange crash on win64 in alloc_SUITE test code erts: Refactor alloc_SUITE to use NIFs instead of drivers erts: Add enif_getenv erts: Make key argument constant for erl_drv_{get|put}env erts: Add alloc_SUITE:migration erts: Add TEST allocator erts: Fix confusion of callbacks destroying_mbc() vs remove_mbc() erts: Fix resurrection of carriers from dc_list
Diffstat (limited to 'erts/etc/common')
-rw-r--r--erts/etc/common/erlexec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 1e7c56dd8e..af1c198281 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -73,6 +73,7 @@ static const char plusM_au_allocs[]= {
'R', /* driver_alloc */
'S', /* sl_alloc */
'T', /* temp_alloc */
+ 'Z', /* test_alloc */
'\0'
};