diff options
| author | Sverker Eriksson <[email protected]> | 2016-04-29 16:37:35 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-04-29 17:04:28 +0200 |
| commit | c2c47441ddc436a6d36aa1264ed6f198a9e0c3e0 (patch) | |
| tree | 75980331e25f293a4eb768cd97d76072e3c984a2 /erts/emulator/sys/common/erl_mmap.c | |
| parent | 4319cd608063e3612c74b534180b19ab29173667 (diff) | |
| download | otp-c2c47441ddc436a6d36aa1264ed6f198a9e0c3e0.tar.gz otp-c2c47441ddc436a6d36aa1264ed6f198a9e0c3e0.tar.bz2 otp-c2c47441ddc436a6d36aa1264ed6f198a9e0c3e0.zip | |
erts: Move option info for erts_mmap
from {allocator,mseg_alloc} to {allocator,erts_mmap}
Diffstat (limited to 'erts/emulator/sys/common/erl_mmap.c')
| -rw-r--r-- | erts/emulator/sys/common/erl_mmap.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/erts/emulator/sys/common/erl_mmap.c b/erts/emulator/sys/common/erl_mmap.c index a7e710070b..bf675cf1ab 100644 --- a/erts/emulator/sys/common/erl_mmap.c +++ b/erts/emulator/sys/common/erl_mmap.c @@ -2099,6 +2099,7 @@ int erts_mmap_in_supercarrier(ErtsMemMapper* mm, void *ptr) } static struct { + Eterm options; Eterm total; Eterm total_sa; Eterm total_sua; @@ -2132,6 +2133,7 @@ static void init_atoms(void) erts_mtx_lock(&am.init_mutex); if (!am.is_initialized) { + AM_INIT(options); AM_INIT(total); AM_INIT(total_sa); AM_INIT(total_sua); @@ -2387,9 +2389,9 @@ Eterm erts_mmap_info(ErtsMemMapper* mm, Eterm seg_tags[] = { am.used, am.max, am.allocated, am.reserved, am.used_sa, am.used_sua }; Eterm group[2]; Eterm group_tags[] = { am.sizes, am.free_segs }; - Eterm list[2]; - Eterm list_tags[2]; /* { am.supercarrier, am.os } */ - int lix; + Eterm list[3]; + Eterm list_tags[3]; /* { am.options, am.supercarrier, am.os } */ + int lix = 0; Eterm res = THE_NON_VALUE; if (!hpp) { @@ -2412,6 +2414,12 @@ Eterm erts_mmap_info(ErtsMemMapper* mm, erts_smp_mtx_unlock(&mm->mtx); } + list[lix] = erts_mmap_info_options(mm, "option ", print_to_p, print_to_arg, + hpp, szp); + list_tags[lix] = am.options; + lix++; + + if (print_to_p) { int to = *print_to_p; void *arg = print_to_arg; @@ -2441,7 +2449,6 @@ Eterm erts_mmap_info(ErtsMemMapper* mm, init_atoms(); } - lix = 0; if (mm->supercarrier) { group[0] = erts_bld_atom_uword_2tup_list(hpp, szp, sizeof(size_tags)/sizeof(Eterm), |