diff options
| author | Lukas Larsson <[email protected]> | 2016-10-19 10:03:02 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-10-19 10:03:02 +0200 |
| commit | 8aed60e7ad127f1189f308b8f9926ac7b24532e3 (patch) | |
| tree | 7046b0ff9a397754b80a5d945aa578c4feda80aa /erts/emulator/beam | |
| parent | bce68cd6ecbdbf04ea6af367f0795d83826420d5 (diff) | |
| parent | 37384d3e68b3558e7cd48646a8acf4b74e6bc1c3 (diff) | |
| download | otp-8aed60e7ad127f1189f308b8f9926ac7b24532e3.tar.gz otp-8aed60e7ad127f1189f308b8f9926ac7b24532e3.tar.bz2 otp-8aed60e7ad127f1189f308b8f9926ac7b24532e3.zip | |
Merge branch 'gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976'
* gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976:
erts: Fix some system_info docs inconsistencies
Add system_info(atom_limit)
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/atom.c | 6 | ||||
| -rw-r--r-- | erts/emulator/beam/atom.h | 1 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c index a5e778e4aa..d2fad24805 100644 --- a/erts/emulator/beam/atom.c +++ b/erts/emulator/beam/atom.c @@ -483,3 +483,9 @@ dump_atoms(int to, void *to_arg) } } } + +Uint +erts_get_atom_limit(void) +{ + return erts_atom_table.limit; +}
\ No newline at end of file diff --git a/erts/emulator/beam/atom.h b/erts/emulator/beam/atom.h index ae60904785..0d34c47a55 100644 --- a/erts/emulator/beam/atom.h +++ b/erts/emulator/beam/atom.h @@ -138,6 +138,7 @@ int atom_static_put(byte*, int); void init_atom_table(void); void atom_info(int, void *); void dump_atoms(int, void *); +Uint erts_get_atom_limit(void); int erts_atom_get(const char* name, int len, Eterm* ap, ErtsAtomEncoding enc); void erts_atom_get_text_space_sizes(Uint *reserved, Uint *used); #endif diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index dfc4beb719..81a72cc4e1 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -2860,6 +2860,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("atom_limit",BIF_ARG_1)) { + BIF_RET(make_small(erts_get_atom_limit())); + } else if (ERTS_IS_ATOM_STR("tolerant_timeofday",BIF_ARG_1)) { if (erts_has_time_correction() && erts_time_offset_state() == ERTS_TIME_OFFSET_FINAL) { |