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/erl_bif_info.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/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 8b2b1a58c7..5789fa8e71 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -3129,6 +3129,9 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) else if (ERTS_IS_ATOM_STR("ets_limit",BIF_ARG_1)) { BIF_RET(make_small(erts_db_get_max_tabs())); } + else if (ERTS_IS_ATOM_STR("ets_count",BIF_ARG_1)) { + BIF_RET(make_small(erts_ets_table_count())); + } else if (ERTS_IS_ATOM_STR("atom_limit",BIF_ARG_1)) { BIF_RET(make_small(erts_get_atom_limit())); } |