From 772f04770bdec7341f63bf4fddb7b893b4ffdd27 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 16 Mar 2017 19:01:08 +0100
Subject: observer: Polish crashdump viewer for ETS

Replaced "Id" column with "Is Named".
Removed "Slot" column.
Sort by name instead if id.
Use name in right-click menu instead of id.
---
 lib/observer/src/cdv_ets_cb.erl       | 19 ++++++++-----------
 lib/observer/src/crashdump_viewer.erl |  6 +++++-
 lib/observer/src/crashdump_viewer.hrl |  1 +
 3 files changed, 14 insertions(+), 12 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,
-- 
cgit v1.2.3