Merge branch 'sverker/ets-table-identifiers/OTP-14094'

* sverker/ets-table-identifiers:
  observer: Polish crashdump viewer for ETS
  observer: Polish Table Viewer tab
  stdlib: Remove ets_SUITE:memory_check_summary
  erts: Improve reduction count during table cleanup
  erts: Cleanup table status bits
  erts: Remove now redundant 'id' from DbTableCommon
  erts: Remove meta_main_tab
  erts: Pass tid argument down to trapping functions
  erts: Print table id as ref in crashdump and break menu
  erts: Replace meta_pid_to{_fixed}_tab with linked lists
  erts: Correct erl_rbtree comments about yielding
  erts: Add ERTS_RBT_YIELD_STAT_INIT to erl_rbtree
  Fix node_container_SUITE
  list_to_ref/1
  Implement ets:all() using scheduler specific data
  Rename fixation count in ets table to avoid confusion
  Introduce references as table identifiers

4 files changed, 18 insertions, 16 deletions

diff --git a/lib/observer/src/cdv_ets_cb.erl b/lib/observer/src/cdv_ets_cb.erl
index ddd2d42df6..18f0c86fd3 100644
--- a/lib/observer/src/cdv_ets_cb.erl
+++ b/lib/observer/src/cdv_ets_cb.erl
@@ -30,26 +30,23 @@
 -include("crashdump_viewer.hrl").
 
 %% Defines
--define(COL_ID,    0).
--define(COL_NAME,  ?COL_ID+1).
--define(COL_SLOT,  ?COL_NAME+1).
--define(COL_OWNER, ?COL_SLOT+1).
+-define(COL_NAME,  0).
+-define(COL_IS_NAMED,  ?COL_NAME+1).
+-define(COL_OWNER, ?COL_IS_NAMED+1).
 -define(COL_OBJ,   ?COL_OWNER+1).
 -define(COL_MEM,   ?COL_OBJ+1).
 
 %% Callbacks for cdv_virtual_list_wx
-col_to_elem(id) -> col_to_elem(?COL_ID);
-col_to_elem(?COL_ID)    -> #ets_table.id;
+col_to_elem(id) -> col_to_elem(?COL_NAME);
+col_to_elem(?COL_IS_NAMED) -> #ets_table.is_named;
 col_to_elem(?COL_NAME)  -> #ets_table.name;
-col_to_elem(?COL_SLOT)  -> #ets_table.slot;
 col_to_elem(?COL_OWNER) -> #ets_table.pid;
 col_to_elem(?COL_OBJ)   -> #ets_table.size;
 col_to_elem(?COL_MEM)   -> #ets_table.memory.
 
 col_spec() ->
-    [{"Id",      ?wxLIST_FORMAT_LEFT,   200},
-     {"Name",    ?wxLIST_FORMAT_LEFT,   200},
-     {"Slot",    ?wxLIST_FORMAT_RIGHT,  50},
+    [{"Name",    ?wxLIST_FORMAT_LEFT,   200},
+     {"Is Named", ?wxLIST_FORMAT_CENTRE, 70},
      {"Owner",   ?wxLIST_FORMAT_CENTRE, 120},
      {"Objects", ?wxLIST_FORMAT_RIGHT,  80},
      {"Memory",  ?wxLIST_FORMAT_RIGHT,  80}
@@ -68,7 +65,7 @@ get_details(Id, Data) ->
     {ok,{"Table:" ++ Id,Proplist,""}}.
 
 get_detail_cols(all) ->
-    {[{ets, ?COL_ID}, {process, ?COL_OWNER}],true};
+    {[{ets, ?COL_NAME}, {process, ?COL_OWNER}],true};
 get_detail_cols(_W) ->
     {[],true}.
 
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index 13e73f027d..e21f1c501b 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -1555,10 +1555,14 @@ split_pid_list_no_space([],[],Pids) ->
 %% Page with external ets tables
 get_ets_tables(File,Pid,WS) ->
     ParseFun = fun(Fd,Id) ->
-		       get_etsinfo(Fd,#ets_table{pid=list_to_pid(Id)},WS)
+		       ET = get_etsinfo(Fd,#ets_table{pid=list_to_pid(Id)},WS),
+                       ET#ets_table{is_named=tab_is_named(ET)}
 	       end,
     lookup_and_parse_index(File,{?ets,Pid},ParseFun,"ets").
 
+tab_is_named(#ets_table{id=Name,name=Name}) -> "yes";
+tab_is_named(#ets_table{}) -> "no".
+
 get_etsinfo(Fd,EtsTable = #ets_table{details=Ds},WS) ->
     case line_head(Fd) of
 	"Slot" ->
diff --git a/lib/observer/src/crashdump_viewer.hrl b/lib/observer/src/crashdump_viewer.hrl
index a08659efd6..742e145641 100644
--- a/lib/observer/src/crashdump_viewer.hrl
+++ b/lib/observer/src/crashdump_viewer.hrl
@@ -118,6 +118,7 @@
 	 slot,
 	 id,
 	 name,
+         is_named,
 	 data_type="hash",
 	 buckets="-",
 	 size,
diff --git a/lib/observer/src/observer_tv_wx.erl b/lib/observer/src/observer_tv_wx.erl
index 4356cb890c..d04fb839c8 100644
--- a/lib/observer/src/observer_tv_wx.erl
+++ b/lib/observer/src/observer_tv_wx.erl
@@ -78,11 +78,11 @@ init([Notebook, Parent]) ->
 			   Col + 1
 		   end,
     ListItems = [{"Table Name", ?wxLIST_FORMAT_LEFT,  200},
-		 {"Table Id",   ?wxLIST_FORMAT_RIGHT, 100},
 		 {"Objects",    ?wxLIST_FORMAT_RIGHT, 100},
 		 {"Size (kB)",  ?wxLIST_FORMAT_RIGHT, 100},
 		 {"Owner Pid",  ?wxLIST_FORMAT_CENTER, 150},
-		 {"Owner Name", ?wxLIST_FORMAT_LEFT,  200}
+		 {"Owner Name", ?wxLIST_FORMAT_LEFT,  200},
+		 {"Table Id",   ?wxLIST_FORMAT_LEFT, 250}
 		],
     lists:foldl(AddListEntry, 0, ListItems),
     wxListItem:destroy(Li),
@@ -387,8 +387,8 @@ update_grid2(Grid, #opt{sort_key=Sort,sort_incr=Dir}, Tables) ->
 				 ({Col, Val}) ->
 				      wxListCtrl:setItem(Grid, Row, Col, observer_lib:to_str(Val))
 			      end,
-			      [{0,Name}, {1,Id}, {2,Size}, {3, Memory div 1024},
-			       {4,Owner}, {5,RegName}]),
+			      [{0,Name}, {1,Size}, {2, Memory div 1024},
+			       {3,Owner}, {4,RegName}, {5,Id}]),
 		Row + 1
 	end,
     ProcInfo = case Dir of