diff options
| author | Rickard Green <[email protected]> | 2013-05-17 09:36:44 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-04 11:34:51 +0200 |
| commit | 32a73196379a8c3e6083104e2d235f35b5bcbbbf (patch) | |
| tree | 4b5e51280b8b6b68b341cce9ee794e4f409206a8 /erts/emulator/beam/erl_bif_info.c | |
| parent | 6aa140d2e9c0a810e057a140a3fdc252acf658d1 (diff) | |
| download | otp-32a73196379a8c3e6083104e2d235f35b5bcbbbf.tar.gz otp-32a73196379a8c3e6083104e2d235f35b5bcbbbf.tar.bz2 otp-32a73196379a8c3e6083104e2d235f35b5bcbbbf.zip | |
erts: Use carrier pool for migration of carriers
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rwxr-xr-x | erts/emulator/beam/erl_bif_info.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 1744afbae1..74a37f374d 100755 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -1671,13 +1671,22 @@ info_1_tuple(Process* BIF_P, /* Pointer to current process. */ sel = *tp++; - if (sel == am_allocator_sizes) { + if (sel == am_memory_internal) { + switch (arity) { + case 3: + if (erts_request_alloc_info(BIF_P, tp[0], tp[1], 1, 1)) + return am_true; + default: + goto badarg; + } + } + else if (sel == am_allocator_sizes) { switch (arity) { case 2: ERTS_BIF_PREP_TRAP1(ret, alloc_sizes_trap, BIF_P, *tp); return ret; case 3: - if (erts_request_alloc_info(BIF_P, tp[0], tp[1], 1)) + if (erts_request_alloc_info(BIF_P, tp[0], tp[1], 1, 0)) return am_true; default: goto badarg; @@ -1736,7 +1745,7 @@ info_1_tuple(Process* BIF_P, /* Pointer to current process. */ ERTS_BIF_PREP_TRAP1(ret, alloc_info_trap, BIF_P, *tp); return ret; case 3: - if (erts_request_alloc_info(BIF_P, tp[0], tp[1], 0)) + if (erts_request_alloc_info(BIF_P, tp[0], tp[1], 0, 0)) return am_true; default: goto badarg; |