aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-09-02 18:35:29 +0200
committerRickard Green <[email protected]>2015-11-12 15:25:46 +0100
commit63466c5522ed58b6e73e35dc29c7c7584f073768 (patch)
treed90a663072c40e31b82597dbeb19745ba15fc631 /erts/emulator/beam/erl_alloc.c
parentada8342bedf8d4b84d4c3c10fcfc7919e532fd8c (diff)
downloadotp-63466c5522ed58b6e73e35dc29c7c7584f073768.tar.gz
otp-63466c5522ed58b6e73e35dc29c7c7584f073768.tar.bz2
otp-63466c5522ed58b6e73e35dc29c7c7584f073768.zip
erts: Refactor erl_mmap to allow several mapper instances
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
-rw-r--r--erts/emulator/beam/erl_alloc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index d83a2930d6..bb3998769c 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -2668,7 +2668,7 @@ erts_allocator_info(int to, void *arg)
erts_mseg_info(i, &to, arg, 0, NULL, NULL);
}
erts_print(to, arg, "=allocator:mseg_alloc.erts_mmap\n");
- erts_mmap_info(&to, arg, NULL, NULL, &emis);
+ erts_mmap_info(&erts_dflt_mmapper, &to, arg, NULL, NULL, &emis);
}
#endif
@@ -3020,7 +3020,8 @@ reply_alloc_info(void *vair)
ai_list = erts_bld_cons(hpp, szp,
ainfo, ai_list);
- ainfo = (air->only_sz ? NIL : erts_mmap_info(NULL, NULL, hpp, szp, &emis));
+ ainfo = (air->only_sz ? NIL :
+ erts_mmap_info(&erts_dflt_mmapper, NULL, NULL, hpp, szp, &emis));
ainfo = erts_bld_tuple3(hpp, szp,
alloc_atom,
erts_bld_atom(hpp,szp,"erts_mmap"),