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

15 files changed, 112 insertions, 75 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 74654a295d..4cf0066999 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -631,14 +631,16 @@
           of process heaps is destroyed by the crash dump generation.</p>
         <p>Option <c>+d</c> instructs the emulator to produce only a
           core dump and no crash dump if an internal error is detected.</p>
-        <p>Calling <seealso marker="erlang:halt/1">
+        <p>Calling <seealso marker="erlang#halt/1">
           <c>erlang:halt/1</c></seealso> with a string argument still
           produces a crash dump. On Unix systems, sending an emulator process
           a <c>SIGUSR1</c> signal also forces a crash dump.</p>
       </item>
       <tag><marker id="+e"/><c><![CDATA[+e Number]]></c></tag>
       <item>
-        <p>Sets the maximum number of ETS tables.</p>
+        <p>Sets the maximum number of ETS tables. This limit is
+	<seealso marker="stdlib:ets#max_ets_tables">partially obsolete</seealso>.
+	</p>
       </item>
       <tag><c><![CDATA[+ec]]></c></tag>
       <item>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 80d40b285a..15bd80e72f 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -8166,16 +8166,18 @@ ok
             <c>erl(1)</c>.
             </p>
           </item>
+	  <tag><marker id="system_info_ets_count"/>
+            <c>ets_count</c></tag>
+          <item>
+            <p>Returns the number of ETS tables currently existing at the
+            local node.</p>
+          </item>
           <tag><marker id="system_info_ets_limit"/>
             <c>ets_limit</c></tag>
           <item>
-            <p>Returns the maximum number of ETS tables allowed. This
-              limit can be increased at startup by passing
-              command-line flag
-              <seealso marker="erts:erl#+e"><c>+e</c></seealso> to
-              <c>erl(1)</c> or by setting environment variable
-              <c>ERL_MAX_ETS_TABLES</c> before starting the Erlang
-              runtime system.</p>
+            <p>Returns the limit for number of ETS tables. This limit is
+	    <seealso marker="stdlib:ets#max_ets_tables">partially obsolete</seealso>
+	    and number of tables are only limited by available memory.</p>
           </item>
           <tag><marker id="system_info_port_count"/><c>port_count</c></tag>
           <item>
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index d99d2ea57b..575d6ca867 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -2821,20 +2821,20 @@ erts_allocator_options(void *proc)
 		Eterm as[4];
 		Eterm ts[4];
 
-		as[l] = am_atom_put("e", 1);
+		as[l] = ERTS_MAKE_AM("e");
 		ts[l++] = am_true;
 
 		switch (a) {
 		case ERTS_ALC_A_SYSTEM:
-		    as[l] = am_atom_put("m", 1);
-		    ts[l++] = am_atom_put("libc", 4);
+		    as[l] = ERTS_MAKE_AM("m");
+		    ts[l++] = ERTS_MAKE_AM("libc");
 		    if(sas.trim_threshold >= 0) {
-			as[l] = am_atom_put("tt", 2);
+			as[l] = ERTS_MAKE_AM("tt");
 			ts[l++] = erts_bld_uint(hpp, szp,
 						(Uint) sas.trim_threshold);
 		    }
 		    if(sas.top_pad >= 0) {
-			as[l] = am_atom_put("tp", 2);
+			as[l] = ERTS_MAKE_AM("tp");
 			ts[l++] = erts_bld_uint(hpp, szp, (Uint) sas.top_pad);
 		    }
 		    break;
@@ -2848,7 +2848,7 @@ erts_allocator_options(void *proc)
 
 	}
 	else {
-	    Eterm atom = am_atom_put("e", 1);
+	    Eterm atom = ERTS_MAKE_AM("e");
 	    Eterm term = am_false;
 	    tmp = erts_bld_2tup_list(hpp, szp, 1, &atom, &term);
 	}
@@ -2859,12 +2859,12 @@ erts_allocator_options(void *proc)
 
 #if HAVE_ERTS_MSEG
     if (use_mseg) {
-	atoms[length] = am_atom_put("mseg_alloc", 10);
+	atoms[length] = ERTS_MAKE_AM("mseg_alloc");
 	terms[length++] = erts_mseg_info_options(0, NULL, NULL, hpp, szp);
     }
 #endif
 
-    atoms[length] = am_atom_put("alloc_util", 10); 
+    atoms[length] = ERTS_MAKE_AM("alloc_util");
     terms[length++] = erts_alcu_au_info_options(NULL, NULL, hpp, szp);
 
 #if HAVE_ERTS_MMAP
@@ -2874,17 +2874,15 @@ erts_allocator_options(void *proc)
 #endif
     {
 	Eterm o[1], v[1];
-	o[0] = am_atom_put("t", 1);
+	o[0] = ERTS_MAKE_AM("t");
 	v[0] = erts_mtrace_enabled ? am_true : am_false;
 
-	atoms[length] = am_atom_put("instr", 5); 
+	atoms[length] = ERTS_MAKE_AM("instr");
 	terms[length++] = erts_bld_2tup_list(hpp, szp, 1, o, v);
     }
 
-    atoms[length] = am_atom_put("lock_physical_memory", 20);
-    terms[length++] = (lock_all_physical_memory
-		       ? am_atom_put("all", 3)
-		       : am_atom_put("no", 2));
+    atoms[length] = ERTS_MAKE_AM("lock_physical_memory");
+    terms[length++] = (lock_all_physical_memory ? am_all : am_no);
 
     settings = erts_bld_2tup_list(hpp, szp, length, atoms, terms);
 
@@ -2899,10 +2897,10 @@ erts_allocator_options(void *proc)
 
 #if HAVE_ERTS_MSEG
     if (use_mseg)
-	terms[length++] = am_atom_put("mseg_alloc", 10);
+	terms[length++] = ERTS_MAKE_AM("mseg_alloc");
 #endif
 #if ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC
-    terms[length++] = am_atom_put("sys_aligned_alloc", 17);
+    terms[length++] = ERTS_MAKE_AM("sys_aligned_alloc");
 #endif
 #if defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
     terms[length++] = ERTS_MAKE_AM("literal_mmap");
@@ -2911,7 +2909,7 @@ erts_allocator_options(void *proc)
 
 #if defined(__GLIBC__)
     {
-	Eterm AM_glibc = am_atom_put("glibc", 5);
+	Eterm AM_glibc = ERTS_MAKE_AM("glibc");
 	Eterm version;
 
 	version = erts_bld_cons(hpp,
diff --git a/erts/emulator/beam/erl_bif_chksum.c b/erts/emulator/beam/erl_bif_chksum.c
index 9095bcd380..cf92687595 100644
--- a/erts/emulator/beam/erl_bif_chksum.c
+++ b/erts/emulator/beam/erl_bif_chksum.c
@@ -44,7 +44,7 @@ void erts_init_bif_chksum(void)
 {
     /* Non visual BIF to trap to. */
     erts_init_trap_export(&chksum_md5_2_exp,
-			  am_erlang, am_atom_put("md5_trap",8), 2,
+			  am_erlang, ERTS_MAKE_AM("md5_trap"), 2,
 			  &md5_2);
 }
     
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()));
     }
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 3a29f8cf56..5bae1730e4 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -322,10 +322,10 @@ erts_db_make_tid(Process *c_p, DbTableCommon *tb)
 /* 
 ** The meta hash table of all NAMED ets tables
 */
-#  define META_NAME_TAB_LOCK_CNT 16
+#  define META_NAME_TAB_LOCK_CNT 256
 union {
     erts_rwmtx_t lck;
-    byte _cache_line_alignment[64];
+    byte align[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(erts_rwmtx_t))];
 }meta_name_tab_rwlocks[META_NAME_TAB_LOCK_CNT];
 static struct meta_name_tab_entry {
     union {
@@ -450,7 +450,7 @@ save_sched_table(Process *c_p, DbTable *tb)
     DbTable *first;
 
     ASSERT(esdp);
-    esdp->ets_tables.count++;
+    erts_atomic_inc_nob(&esdp->ets_tables.count);
     erts_refc_inc(&tb->common.refc, 1);
 
     first = esdp->ets_tables.clist;
@@ -474,8 +474,8 @@ remove_sched_table(ErtsSchedulerData *esdp, DbTable *tb)
     ASSERT(erts_get_ref_numbers_thr_id(ERTS_MAGIC_BIN_REFN(tb->common.btid))
            == (Uint32) esdp->no);
 
-    ASSERT(esdp->ets_tables.count > 0);
-    esdp->ets_tables.count--;
+    ASSERT(erts_atomic_read_nob(&esdp->ets_tables.count) > 0);
+    erts_atomic_dec_nob(&esdp->ets_tables.count);
 
     eaydp = ERTS_SCHED_AUX_YIELD_DATA(esdp, ets_all);
     if (eaydp->ongoing) {
@@ -1776,9 +1776,11 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
         ret = make_tid(BIF_P, tb);
 
     save_sched_table(BIF_P, tb);
+    save_owned_table(BIF_P, tb);
 
     if (is_named && !insert_named_tab(BIF_ARG_1, tb, 0)) {
         tid_clear(BIF_P, tb);
+        delete_owned_table(BIF_P, tb);
 
 	db_lock(tb,LCK_WRITE);
 	free_heir_data(tb);
@@ -1789,7 +1791,6 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     }
     
     BIF_P->flags |= F_USING_DB; /* So we can remove tb if p dies */
-    save_owned_table(BIF_P, tb);
 
 #ifdef HARDDEBUG
     erts_fprintf(stderr,
@@ -2445,7 +2446,7 @@ ets_all_reply(ErtsSchedulerData *esdp, ErtsEtsAllReq **reqpp,
         ASSERT(!*tablepp);
 
         /* Max heap size needed... */
-        sz = esdp->ets_tables.count;
+        sz = erts_atomic_read_nob(&esdp->ets_tables.count);
         sz *= ERTS_MAGIC_REF_THING_SIZE + 2;
         sz += 3 + ERTS_REF_THING_SIZE;
         hfragp = new_message_buffer(sz);
@@ -2529,7 +2530,8 @@ erts_handle_yielded_ets_all_request(ErtsSchedulerData *esdp,
             if (!eaydp->queue)
                 return 0; /* All work completed! */
 
-            if (yc < ERTS_ETS_ALL_TB_YCNT_START && yc > esdp->ets_tables.count)
+            if (yc < ERTS_ETS_ALL_TB_YCNT_START &&
+                yc > erts_atomic_read_nob(&esdp->ets_tables.count))
                 return 1; /* Yield! */
 
             eaydp->ongoing = ongoing = eaydp->queue;
@@ -2608,7 +2610,6 @@ BIF_RETTYPE ets_internal_request_all_0(BIF_ALIST_0)
     BIF_RET(ref);
 }
 
-
 /*
 ** db_slot(Db, Slot) -> [Items].
 */
@@ -3490,7 +3491,11 @@ void init_db(ErtsDbSpinCount db_spin_count)
 		 db_max_tabs, ((Uint)1)<<SMALL_BITS);
     }
 
-    meta_name_tab_mask = (((Uint) 1)<<(bits-1)) - 1; /* At least half the size of main tab */
+    /*
+     * We don't have ony hard limit for number of tables anymore,                                                                            .
+     * but we use 'db_max_tabs' to determine size of name hash table.
+     */
+    meta_name_tab_mask = (((Uint) 1)<<bits) - 1;
     size = sizeof(struct meta_name_tab_entry)*(meta_name_tab_mask+1);
     meta_name_tab = erts_db_alloc_nt(ERTS_ALC_T_DB_TABLES, size);
     ERTS_ETS_MISC_MEM_ADD(size);
@@ -3505,27 +3510,27 @@ void init_db(ErtsDbSpinCount db_spin_count)
 
     /* Non visual BIF to trap to. */
     erts_init_trap_export(&ets_select_delete_continue_exp,
-			  am_ets, am_atom_put("delete_trap",11), 1,
+			  am_ets, ERTS_MAKE_AM("select_delete_trap"), 1,
 			  &ets_select_delete_trap_1);
 
     /* Non visual BIF to trap to. */
     erts_init_trap_export(&ets_select_count_continue_exp,
-			  am_ets, am_atom_put("count_trap",11), 1,
+			  am_ets, ERTS_MAKE_AM("count_trap"), 1,
 			  &ets_select_count_1);
 
     /* Non visual BIF to trap to. */
     erts_init_trap_export(&ets_select_replace_continue_exp,
-                          am_ets, am_atom_put("replace_trap",11), 1,
+                          am_ets, ERTS_MAKE_AM("replace_trap"), 1,
                           &ets_select_replace_1);
 
     /* Non visual BIF to trap to. */
     erts_init_trap_export(&ets_select_continue_exp,
-			  am_ets, am_atom_put("select_trap",11), 1,
+			  am_ets, ERTS_MAKE_AM("select_trap"), 1,
 			  &ets_select_trap_1);
 
     /* Non visual BIF to trap to. */
     erts_init_trap_export(&ets_delete_continue_exp,
-			  am_ets, am_atom_put("delete_trap",11), 1,
+			  am_ets, ERTS_MAKE_AM("delete_trap"), 1,
 			  &ets_delete_trap);
 }
 
@@ -3538,7 +3543,7 @@ erts_ets_sched_spec_data_init(ErtsSchedulerData *esdp)
     eaydp->tab = NULL;
     eaydp->queue = NULL;
     esdp->ets_tables.clist = NULL;
-    esdp->ets_tables.count = 0;
+    erts_atomic_init_nob(&esdp->ets_tables.count, 0);
 }
 
 
@@ -4154,7 +4159,7 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
     else if (What == am_data) {
 	print_table(ERTS_PRINT_STDOUT, NULL, 1, tb);
 	ret = am_true;
-    } else if (What == am_atom_put("fixed",5)) { 
+    } else if (ERTS_IS_ATOM_STR("fixed",What)) {
 	if (IS_FIXED(tb))
 	    ret = am_true;
 	else
@@ -4206,7 +4211,7 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	    ret = am_false;
 	}
 	erts_mtx_unlock(&tb->common.fixlock);
-    } else if (What == am_atom_put("stats",5)) {
+    } else if (ERTS_IS_ATOM_STR("stats",What)) {
 	if (IS_HASH_TABLE(tb->common.status)) {
 	    FloatDef f;
 	    DbHashStats stats;
@@ -4346,6 +4351,18 @@ erts_db_get_max_tabs()
     return db_max_tabs;
 }
 
+Uint erts_ets_table_count(void)
+{
+    Uint tb_count = 0;
+    Uint six;
+
+    for (six = 0; six < erts_no_schedulers; six++) {
+        ErtsSchedulerData *esdp = &erts_aligned_scheduler_data[six].esd;
+        tb_count += erts_atomic_read_nob(&esdp->ets_tables.count);
+    }
+    return tb_count;
+}
+
 /*
  * For testing of meta tables only.
  *
diff --git a/erts/emulator/beam/erl_db.h b/erts/emulator/beam/erl_db.h
index db86c81914..db1dec015c 100644
--- a/erts/emulator/beam/erl_db.h
+++ b/erts/emulator/beam/erl_db.h
@@ -45,7 +45,7 @@ typedef struct {
 } ErtsEtsAllYieldData;
 
 typedef struct {
-    Uint count;
+    erts_atomic_t count;
     DbTable *clist;
 } ErtsEtsTables;
 
@@ -69,6 +69,7 @@ typedef struct {
 /*TT*/
 
 Uint erts_get_ets_misc_mem_size(void);
+Uint erts_ets_table_count(void);
 
 typedef struct {
     DbTableCommon common;
@@ -93,7 +94,7 @@ union db_table {
     /*TT*/
 };
 
-#define DB_DEF_MAX_TABS 2053 /* Superseeded by environment variable 
+#define DB_DEF_MAX_TABS 8192 /* Superseeded by environment variable
 				"ERL_MAX_ETS_TABLES" */
 #define ERL_MAX_ETS_TABLES_ENV "ERL_MAX_ETS_TABLES"
 
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 37d261d0df..f1d47326b4 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -2770,9 +2770,7 @@ Eterm db_format_dmc_err_info(Process *p, DMCErrInfo *ei)
 	    sys_strcpy(buff,tmp->error_string);
 	sl = sys_strlen(buff);
 	shp = HAlloc(p, sl * 2 + 5);
-	sev = (tmp->severity == dmcWarning) ? 
-	    am_atom_put("warning",7) :
-	    am_error;
+	sev = (tmp->severity == dmcWarning) ? am_warning : am_error;
 	tlist = buf_to_intlist(&shp, buff, sl, NIL);
 	tpl = TUPLE2(shp, sev, tlist);
 	shp += 3;
@@ -5180,7 +5178,7 @@ BIF_RETTYPE match_spec_test_3(BIF_ALIST_3)
 {
     Eterm res;
 #ifdef DMC_DEBUG
-    if (BIF_ARG_3 == am_atom_put("dis",3)) {
+    if (BIF_ARG_3 == ERTS_MAKE_AM("dis")) {
 	test_disassemble_next = 1;
 	BIF_RET(am_true);
     } else
@@ -5291,7 +5289,7 @@ static Eterm match_spec_test(Process *p, Eterm against, Eterm spec, int trace)
 	    erts_free(ERTS_ALC_T_DB_TMP, arr);
 	}
 	erts_bin_free(mps);
-	ret = TUPLE4(hp, am_atom_put("ok",2), res, flg, lint_res);
+	ret = TUPLE4(hp, am_ok, res, flg, lint_res);
     }
     return ret;
 }
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c
index 8673e029e6..d225916ac5 100644
--- a/erts/emulator/beam/erl_unicode.c
+++ b/erts/emulator/beam/erl_unicode.c
@@ -79,23 +79,23 @@ void erts_init_unicode(void)
     max_loop_limit = CONTEXT_REDS * LOOP_FACTOR;
     /* Non visual BIFs to trap to. */
     erts_init_trap_export(&characters_to_utf8_trap_exp,
-			  am_erlang, am_atom_put("characters_to_utf8_trap",23), 3,
+			  am_erlang, ERTS_MAKE_AM("characters_to_utf8_trap"), 3,
 			  &characters_to_utf8_trap);
 
     erts_init_trap_export(&characters_to_list_trap_1_exp,
-			  am_erlang, am_atom_put("characters_to_list_trap_1",25), 3,
+			  am_erlang, ERTS_MAKE_AM("characters_to_list_trap_1"), 3,
 			  &characters_to_list_trap_1);
 
     erts_init_trap_export(&characters_to_list_trap_2_exp,
-			  am_erlang, am_atom_put("characters_to_list_trap_2",25), 3,
+			  am_erlang, ERTS_MAKE_AM("characters_to_list_trap_2"), 3,
 			  &characters_to_list_trap_2);
 
     erts_init_trap_export(&characters_to_list_trap_3_exp,
-			  am_erlang, am_atom_put("characters_to_list_trap_3",25), 3,
+			  am_erlang, ERTS_MAKE_AM("characters_to_list_trap_3"), 3,
 			  &characters_to_list_trap_3);
 
     erts_init_trap_export(&characters_to_list_trap_4_exp,
-			  am_erlang, am_atom_put("characters_to_list_trap_4",25), 1,
+			  am_erlang, ERTS_MAKE_AM("characters_to_list_trap_4"), 1,
 			  &characters_to_list_trap_4);
 
     c_to_b_int_trap_exportp =  erts_export_put(am_unicode,am_characters_to_binary_int,2);
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;
diff --git a/erts/emulator/sys/common/erl_mmap.c b/erts/emulator/sys/common/erl_mmap.c
index 5dadd8a5a6..145503bea7 100644
--- a/erts/emulator/sys/common/erl_mmap.c
+++ b/erts/emulator/sys/common/erl_mmap.c
@@ -2514,8 +2514,8 @@ Eterm erts_mmap_debug_info(Process* p)
                                             sizeof(values)/sizeof(*values),
                                             tags, values);
 
-        sa_list = TUPLE2(hp, am_atom_put("sa_free_segs",12), sa_list); hp+=3;
-        sua_list = TUPLE2(hp, am_atom_put("sua_free_segs",13), sua_list); hp+=3;
+        sa_list = TUPLE2(hp, ERTS_MAKE_AM("sa_free_segs"), sa_list); hp+=3;
+        sua_list = TUPLE2(hp, ERTS_MAKE_AM("sua_free_segs"), sua_list); hp+=3;
         list = CONS(hp, sua_list, list); hp+=2;
         list = CONS(hp, sa_list, list); hp+=2;
 
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index fdf4aab24d..7309908337 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -37,6 +37,7 @@
 
 -export([process_count/1, system_version/1, misc_smoke_tests/1,
          heap_size/1, wordsize/1, memory/1, ets_limit/1, atom_limit/1,
+         ets_count/1,
          atom_count/1]).
 
 suite() ->
@@ -45,6 +46,7 @@ suite() ->
 
 all() -> 
     [process_count, system_version, misc_smoke_tests,
+     ets_count,
      heap_size, wordsize, memory, ets_limit, atom_limit, atom_count].
 
 %%%
@@ -478,6 +480,21 @@ get_node_name(Config) ->
 		 ++ "-"
 		 ++ integer_to_list(erlang:unique_integer([positive]))).
 
+ets_count(Config) when is_list(Config) ->
+    [ets_count_do([Type | Named])
+     || Type <- [set, bag, duplicate_bag, ordered_set],
+        Named <- [[named_table], []]
+    ],
+    ok.
+
+ets_count_do(Opts) ->
+    Before = erlang:system_info(ets_count),
+    T = ets:new(?MODULE, Opts),
+    After = erlang:system_info(ets_count),
+    After = Before + 1,
+    ets:delete(T),
+    Before = erlang:system_info(ets_count).
+
 
 %% Verify system_info(ets_limit) reflects max ETS table settings.
 ets_limit(Config0) when is_list(Config0) ->
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 305376a425..1995262145 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -49,14 +49,16 @@
       associated with each key. A <c>bag</c> or <c>duplicate_bag</c> table can
       have many objects associated with each key.</p>
 
+   <marker id="max_ets_tables"></marker>
    <note>
      <p>
        The number of tables stored at one Erlang node <em>used</em> to
        be limited. This is no longer the case (except by memory usage).
        The previous default limit was about 1400 tables and
        could be increased by setting the environment variable
-       <c>ERL_MAX_ETS_TABLES</c> before starting the Erlang runtime
-       system. This hard limit has been removed, but it is currently
+       <c>ERL_MAX_ETS_TABLES</c> or the command line option
+       <seealso marker="erts:erl#+e"><c>+e</c></seealso> before starting the
+       Erlang runtime system. This hard limit has been removed, but it is currently
        useful to set the <c>ERL_MAX_ETS_TABLES</c> anyway. It should be
        set to an approximate of the maximum amount of tables used. This since
        an internal table for named tables is sized using this value. If
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 574aac96c8..a97fe4a5d9 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -6209,20 +6209,23 @@ spawn_logger(Procs) ->
 				  ok;
 			      (Proc) ->
 				  Mon = erlang:monitor(process, Proc),
-				  receive
+				  ok = receive
 				      {'DOWN', Mon, _, _, _} ->
 					  ok
 				  after 0 ->
 					  case Kill of
 					      true -> exit(Proc, kill);
-					      _ ->
-						  erlang:display({"Waiting for 'DOWN' from", Proc,
-								  process_info(Proc),
-								  pid_status(Proc)})
+					      _ -> ok
 					  end,
 					  receive
 					      {'DOWN', Mon, _, _, _} ->
 						  ok
+                                          after 5000 ->
+						  io:format("Waiting for 'DOWN' from ~w, status=~w\n"
+                                                            "info = ~p\n", [Proc,
+                                                                            pid_status(Proc),
+                                                                            process_info(Proc)]),
+                                                  timeout
 					  end
 				  end
 			  end, Procs),
diff --git a/system/doc/efficiency_guide/advanced.xml b/system/doc/efficiency_guide/advanced.xml
index 83b87a3641..fe77ce8ea4 100644
--- a/system/doc/efficiency_guide/advanced.xml
+++ b/system/doc/efficiency_guide/advanced.xml
@@ -188,11 +188,6 @@
 	limit can be raised or lowered using the <c>+t</c> option.</cell>
       </row>
       <row>
-	<cell>Ets tables</cell>
-	<cell>Default is 1400. It can be changed with the environment
-	variable <c>ERL_MAX_ETS_TABLES</c>.</cell>
-      </row>
-      <row>
 	<cell>Elements in a tuple</cell>
 	<cell>The maximum number of elements in a tuple is 16,777,215
 	(24-bit unsigned integer).</cell>