diff options
author | Sverker Eriksson <[email protected]> | 2018-06-04 16:40:29 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2018-06-04 16:40:29 +0200 |
commit | e5ee505f2177121ad237f931b7c95b5e77f90360 (patch) | |
tree | 3a927d1672192d9004a74cda608bb5acd95e1c74 /erts/emulator/beam/utils.c | |
parent | 8b86ae989276fca95d7eb917446d8301af751a51 (diff) | |
parent | b8631ef58c94507d876155ac92335fd9606b259f (diff) | |
download | otp-e5ee505f2177121ad237f931b7c95b5e77f90360.tar.gz otp-e5ee505f2177121ad237f931b7c95b5e77f90360.tar.bz2 otp-e5ee505f2177121ad237f931b7c95b5e77f90360.zip |
Merge branch 'sverker/ets-count/OTP-14987'
* sverker/ets-count/OTP-14987:
erts,stdlib: Improve docs about obsolete ets_limit
erts: Reduce test log noise from ets_SUITE
erts: Increase scalability of ets name lookup
erts: Rename one of delete_trap to select_delete_trap
erts: Refactor usage of am_atom_put to ERTS_MAKE_AM
erts: Add system_info(ets_count)
erts: Fix narrow race between ets:new and ets:delete
Diffstat (limited to 'erts/emulator/beam/utils.c')
-rw-r--r-- | erts/emulator/beam/utils.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index d74052d8b2..87709edc15 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -1972,8 +1972,7 @@ static void do_send_logger_message(Eterm gl, Eterm tag, Eterm format, Eterm args break; } - md = MAP2(hp, am_emulator, am_true, - am_atom_put("tag", 3), el_tag); + md = MAP2(hp, am_emulator, am_true, ERTS_MAKE_AM("tag"), el_tag); hp += MAP2_SZ; if (is_nil(gl) && is_non_value(pid)) { @@ -1994,14 +1993,14 @@ static void do_send_logger_message(Eterm gl, Eterm tag, Eterm format, Eterm args /* no gl */ md = MAP3(hp, am_error_logger, md, - am_atom_put("gl", 2), gl, + ERTS_MAKE_AM("gl"), gl, am_time, time); hp += MAP3_SZ; pid = NIL; } else { md = MAP4(hp, am_error_logger, md, - am_atom_put("gl", 2), gl, + ERTS_MAKE_AM("gl"), gl, am_pid, pid, am_time, time); hp += MAP4_SZ; |