File 2201-Add-system_info-atom_limit.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2201-Add-system_info-atom_limit.patch of Package erlang (Revision ac8eee046d90e3601c6b140b4880b66c)

Currently displaying revision ac8eee046d90e3601c6b140b4880b66c , Show latest

From 2dfca60a24c2c6728a4b8431f37aeee05212a4ac Mon Sep 17 00:00:00 2001
From: Gabriele Santomaggio <gabriele.santomaggio@erlang-solutions.com>
Date: Thu, 13 Oct 2016 21:17:10 +0200
Subject: [PATCH] Add system_info(atom_limit)

Add system_info(atom_limit) to provide a way to retrieve the maximum
number of atoms allowed. Add tests and documentation for it too.

Also split system_info_SUITE:start_node/2 to start_node_ets/2 and
start_node_atm/2 to avoid code duplication.
---
 erts/doc/src/erlang.xml                  | 24 +++++++++----
 erts/emulator/beam/atom.c                |  6 ++++
 erts/emulator/beam/atom.h                |  1 +
 erts/emulator/beam/erl_bif_info.c        |  3 ++
 erts/emulator/test/system_info_SUITE.erl | 59 +++++++++++++++++++++++++-------
 erts/preloaded/src/erlang.erl            |  1 +
 6 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index b0d25389f..43a348135 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -7185,13 +7185,14 @@ ok
 <c>erlang:system_info({allocator,
 <anno>Alloc</anno>})</c></seealso>.
 </item>
+ 
 </taglist>
 </desc>
 </func>
 
 <func>
- <name name="system_info" arity="1" clause_i="10"/>
 <name name="system_info" arity="1" clause_i="11"/>
+ <name name="system_info" arity="1" clause_i="12"/>
 <fsummary>Information about the CPU topology of the system.</fsummary>
 <type name="cpu_topology"/>
 <type name="level_entry"/>
@@ -7291,12 +7292,12 @@ ok
 </func>
 
 <func>
- <name name="system_info" arity="1" clause_i="27"/>
 <name name="system_info" arity="1" clause_i="28"/>
- <name name="system_info" arity="1" clause_i="36"/>
+ <name name="system_info" arity="1" clause_i="29"/>
 <name name="system_info" arity="1" clause_i="37"/>
 <name name="system_info" arity="1" clause_i="38"/>
 <name name="system_info" arity="1" clause_i="39"/>
+ <name name="system_info" arity="1" clause_i="40"/>
 <fsummary>Information about the default process heap settings.</fsummary>
 <type name="message_queue_data"/>
 <type name="max_heap_size"/>
@@ -7373,7 +7374,7 @@ ok
 <name name="system_info" arity="1" clause_i="7"/>
 <name name="system_info" arity="1" clause_i="8"/>
 <name name="system_info" arity="1" clause_i="9"/>
- <name name="system_info" arity="1" clause_i="12"/>
+ <name name="system_info" arity="1" clause_i="10"/>
 <name name="system_info" arity="1" clause_i="13"/>
 <name name="system_info" arity="1" clause_i="14"/>
 <name name="system_info" arity="1" clause_i="15"/>
@@ -7388,14 +7389,14 @@ ok
 <name name="system_info" arity="1" clause_i="24"/>
 <name name="system_info" arity="1" clause_i="25"/>
 <name name="system_info" arity="1" clause_i="26"/>
- <name name="system_info" arity="1" clause_i="29"/>
+ <name name="system_info" arity="1" clause_i="27"/>
 <name name="system_info" arity="1" clause_i="30"/>
 <name name="system_info" arity="1" clause_i="31"/>
 <name name="system_info" arity="1" clause_i="32"/>
 <name name="system_info" arity="1" clause_i="33"/>
 <name name="system_info" arity="1" clause_i="34"/>
 <name name="system_info" arity="1" clause_i="35"/>
- <name name="system_info" arity="1" clause_i="40"/>
+ <name name="system_info" arity="1" clause_i="36"/>
 <name name="system_info" arity="1" clause_i="41"/>
 <name name="system_info" arity="1" clause_i="42"/>
 <name name="system_info" arity="1" clause_i="43"/>
@@ -7425,6 +7426,7 @@ ok
 <name name="system_info" arity="1" clause_i="67"/>
 <name name="system_info" arity="1" clause_i="68"/>
 <name name="system_info" arity="1" clause_i="69"/>
+ <name name="system_info" arity="1" clause_i="70"/>
 <fsummary>Information about the system.</fsummary>
 <desc>
 Returns various information about the current system
@@ -7436,6 +7438,16 @@ ok
 See <seealso marker="#system_info_allocator_tags">
 above</seealso>.
 </item>
+ <tag><c>atom_limit</c></tag>
+ <item>
+ <marker id="system_info_atom_limit"></marker>
+ Returns the maximum number of atoms allowed.
+ This limit can be increased at startup by passing
+ command-line flag
+ <seealso marker="erts:erl#+t"><c>+t</c></seealso> to
+ <c>erl(1)</c>. 
+ 
+ </item>
 <tag><c>build_type</c></tag>
 <item>
 Returns an atom describing the build type of the runtime
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c
index a5e778e4a..d2fad2480 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 ae6090478..0d34c47a5 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(fmtfn_t, void *);
 void dump_atoms(fmtfn_t, 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 29ba12dfd..cfe01f244 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -2859,6 +2859,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) {
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index a4aedb31f..3d9e74472 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -36,7 +36,7 @@
 -export([all/0, suite/0]).
 
 -export([process_count/1, system_version/1, misc_smoke_tests/1,
- heap_size/1, wordsize/1, memory/1, ets_limit/1]).
+ heap_size/1, wordsize/1, memory/1, ets_limit/1, atom_limit/1]).
 
 suite() ->
 [{ct_hooks,[ts_install_cth]},
@@ -44,7 +44,7 @@ suite() ->
 
 all() -> 
 [process_count, system_version, misc_smoke_tests,
- heap_size, wordsize, memory, ets_limit].
+ heap_size, wordsize, memory, ets_limit, atom_limit].
 
 %%%
 %%% The test cases -------------------------------------------------------------
@@ -472,6 +472,17 @@ mapn(_Fun, 0) ->
 mapn(Fun, N) ->
 [Fun(N) | mapn(Fun, N-1)].
 
+
+get_node_name(Config) ->
+ list_to_atom(atom_to_list(?MODULE)
+		 ++ "-"
+		 ++ atom_to_list(proplists:get_value(testcase, Config))
+		 ++ "-"
+		 ++ integer_to_list(erlang:system_time(second))
+		 ++ "-"
+		 ++ integer_to_list(erlang:unique_integer([positive]))).
+
+
 %% Verify system_info(ets_limit) reflects max ETS table settings.
 ets_limit(Config0) when is_list(Config0) ->
 Config = [{testcase,ets_limit}|Config0],
@@ -486,7 +497,7 @@ get_ets_limit(Config, EtsMax) ->
 0 -> [];
 _ -> [{"ERL_MAX_ETS_TABLES", integer_to_list(EtsMax)}]
 end,
- {ok, Node} = start_node(Config, Envs),
+ {ok, Node} = start_node_ets(Config, Envs),
 Me = self(),
 Ref = make_ref(),
 spawn_link(Node,
@@ -502,16 +513,40 @@ get_ets_limit(Config, EtsMax) ->
 stop_node(Node),
 Res.
 
-start_node(Config, Envs) when is_list(Config) ->
+start_node_ets(Config, Envs) when is_list(Config) ->
+ Pa = filename:dirname(code:which(?MODULE)),
+ test_server:start_node(get_node_name(Config), peer,
+			 [{args, "-pa "++Pa}, {env, Envs}]).
+
+start_node_atm(Config, AtomsMax) when is_list(Config) ->
 Pa = filename:dirname(code:which(?MODULE)),
- Name = list_to_atom(atom_to_list(?MODULE)
- ++ "-"
- ++ atom_to_list(proplists:get_value(testcase, Config))
- ++ "-"
- ++ integer_to_list(erlang:system_time(second))
- ++ "-"
- ++ integer_to_list(erlang:unique_integer([positive]))),
- test_server:start_node(Name, peer, [{args, "-pa "++Pa}, {env, Envs}]).
+ test_server:start_node(get_node_name(Config), peer,
+			 [{args, "-pa "++ Pa ++ AtomsMax}]).
 
 stop_node(Node) ->
 test_server:stop_node(Node).
+
+
+%% Verify system_info(atom_limit) reflects max atoms settings
+%% (using " +t").
+atom_limit(Config0) when is_list(Config0) ->
+ Config = [{testcase,atom_limit}|Config0],
+ 2186042 = get_atom_limit(Config, " +t 2186042 "),
+ ok.
+
+get_atom_limit(Config, AtomsMax) ->
+ {ok, Node} = start_node_atm(Config, AtomsMax),
+ Me = self(),
+ Ref = make_ref(),
+ spawn_link(Node,
+ fun() ->
+ Res = erlang:system_info(atom_limit),
+ unlink(Me),
+ Me ! {Ref, Res}
+ end),
+ receive
+ {Ref, Res} ->
+ Res
+ end,
+ stop_node(Node),
+ Res.
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 652a95480..59a924980 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2508,6 +2508,7 @@ tuple_to_list(_Tuple) ->
 Alloc :: atom();
 ({allocator_sizes, Alloc}) -> [_] when %% More or less anything
 Alloc :: atom();
+ (atom_limit) -> pos_integer();
 (build_type) -> opt | debug | purify | quantify | purecov |
 gcov | valgrind | gprof | lcnt | frmptr;
 (c_compiler_used) -> {atom(), term()};
-- 
2.11.0

Places

File 2201-Add-system_info-atom_limit.patch of Package erlang (Revision ac8eee046d90e3601c6b140b4880b66c)

Places