aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-04-11 18:13:31 +0200
committerSverker Eriksson <[email protected]>2016-04-15 19:00:34 +0200
commit499a872d5f6ea09d23eb7b04ea5de2f6d3fabd98 (patch)
tree9d4c966a3dcf1f6618f3c72277404ff8e17b3652 /erts/emulator/beam/erl_alloc.c
parent6cbd63b281a9690b2db5fead3f756d34140f8fb5 (diff)
downloadotp-499a872d5f6ea09d23eb7b04ea5de2f6d3fabd98.tar.gz
otp-499a872d5f6ea09d23eb7b04ea5de2f6d3fabd98.tar.bz2
otp-499a872d5f6ea09d23eb7b04ea5de2f6d3fabd98.zip
erts: Refactor callbacks for literal mseg alloc
Make the callbacks more general to be usable for any allocator that that uses its own ErtsMemMapper.
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
-rw-r--r--erts/emulator/beam/erl_alloc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 6b5f5bd63e..efe31193b9 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -329,9 +329,10 @@ set_default_literal_alloc_opts(struct au_init *ip)
ip->init.util.sys_dealloc = &erts_alcu_literal_32_sys_dealloc;
#elif defined(ARCH_64)
# ifdef ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION
- ip->init.util.mseg_alloc = &erts_alcu_literal_64_mseg_alloc;
- ip->init.util.mseg_realloc = &erts_alcu_literal_64_mseg_realloc;
- ip->init.util.mseg_dealloc = &erts_alcu_literal_64_mseg_dealloc;
+ ip->init.util.mseg_alloc = &erts_alcu_mmapper_mseg_alloc;
+ ip->init.util.mseg_realloc = &erts_alcu_mmapper_mseg_realloc;
+ ip->init.util.mseg_dealloc = &erts_alcu_mmapper_mseg_dealloc;
+ ip->init.util.mseg_mmapper = &erts_literal_mmapper;
# endif
#else
# error Unknown architecture