Merge branch 'maint'

* maint:
  Update preloaded
  add system_info(ets_limit)

Conflicts:
	erts/preloaded/ebin/erlang.beam

4 files changed, 64 insertions, 2 deletions

diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 673dfc658c..3b25efd9af 100755
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -2636,6 +2636,9 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 
 	BIF_RET(res);
     }
+    else if (ERTS_IS_ATOM_STR("ets_limit",BIF_ARG_1)) {
+        BIF_RET(make_small(erts_db_get_max_tabs()));
+    }
 
     BIF_ERROR(BIF_P, BADARG);
 }
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 98c2988323..40b8eaf8fb 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -3811,6 +3811,13 @@ erts_db_foreach_offheap(DbTable *tb,
     tb->common.meth->db_foreach_offheap(tb, func, arg);
 }
 
+/* retrieve max number of ets tables */
+Uint
+erts_db_get_max_tabs()
+{
+    return db_max_tabs;
+}
+
 /*
  * For testing of meta tables only.
  *
diff --git a/erts/emulator/beam/erl_db.h b/erts/emulator/beam/erl_db.h
index 6b62e10eb7..5b4681fc90 100644
--- a/erts/emulator/beam/erl_db.h
+++ b/erts/emulator/beam/erl_db.h
@@ -79,6 +79,8 @@ extern erts_smp_atomic_t erts_ets_misc_mem_size;
 
 Eterm erts_ets_colliding_names(Process*, Eterm name, Uint cnt);
 
+Uint erts_db_get_max_tabs(void);
+
 #endif
 
 #if defined(ERTS_WANT_DB_INTERNAL__) && !defined(ERTS_HAVE_DB_INTERNAL__)
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index 0350eb671d..ceb4afb5cf 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -37,7 +37,8 @@
 	 init_per_group/2,end_per_group/2, 
 	 init_per_testcase/2, end_per_testcase/2]).
 
--export([process_count/1, system_version/1, misc_smoke_tests/1, heap_size/1, wordsize/1, memory/1]).
+-export([process_count/1, system_version/1, misc_smoke_tests/1, heap_size/1, wordsize/1, memory/1,
+         ets_limit/1]).
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(2)).
 
@@ -45,7 +46,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [process_count, system_version, misc_smoke_tests,
-     heap_size, wordsize, memory].
+     heap_size, wordsize, memory, ets_limit].
 
 groups() -> 
     [].
@@ -496,3 +497,52 @@ mapn(_Fun, 0) ->
     [];
 mapn(Fun, N) ->
     [Fun(N) | mapn(Fun, N-1)].
+
+ets_limit(doc) ->
+    "Verify system_info(ets_limit) reflects max ETS table settings.";
+ets_limit(suite) -> [];
+ets_limit(Config0) when is_list(Config0) ->
+    Config = [{testcase,ets_limit}|Config0],
+    true = is_integer(get_ets_limit(Config)),
+    12345 = get_ets_limit(Config, 12345),
+    ok.
+
+get_ets_limit(Config) ->
+    get_ets_limit(Config, 0).
+get_ets_limit(Config, EtsMax) ->
+    Envs = case EtsMax of
+               0 -> [];
+               _ -> [{"ERL_MAX_ETS_TABLES", integer_to_list(EtsMax)}]
+           end,
+    {ok, Node} = start_node(Config, Envs),
+    Me = self(),
+    Ref = make_ref(),
+    spawn_link(Node,
+               fun() ->
+                       Res = erlang:system_info(ets_limit),
+                       unlink(Me),
+                       Me ! {Ref, Res}
+               end),
+    receive
+        {Ref, Res} ->
+            Res
+    end,
+    stop_node(Node),
+    Res.
+
+start_node(Config, Envs) when is_list(Config) ->
+    Pa = filename:dirname(code:which(?MODULE)),
+    {A, B, C} = now(),
+    Name = list_to_atom(atom_to_list(?MODULE)
+                        ++ "-"
+                        ++ atom_to_list(?config(testcase, Config))
+                        ++ "-"
+                        ++ integer_to_list(A)
+                        ++ "-"
+                        ++ integer_to_list(B)
+                        ++ "-"
+                        ++ integer_to_list(C)),
+    ?t:start_node(Name, peer, [{args, "-pa "++Pa}, {env, Envs}]).
+
+stop_node(Node) ->
+    ?t:stop_node(Node).