aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-12-05 12:12:05 +0100
committerSiri Hansen <[email protected]>2016-12-05 12:12:05 +0100
commit3271a4eed63efe6d218fb57e564914c82cae97a1 (patch)
treea7a4a56f75131d5fb9c13d52f6b0a108324557e9
parentc5fa3721bbe6ea3742703a4662f94a11c2a4d5c1 (diff)
parent1bbe6c28257a2951aaca8b4376d1014158b3f310 (diff)
downloadotp-3271a4eed63efe6d218fb57e564914c82cae97a1.tar.gz
otp-3271a4eed63efe6d218fb57e564914c82cae97a1.tar.bz2
otp-3271a4eed63efe6d218fb57e564914c82cae97a1.zip
Merge branch 'siri/cdv/faulty-column-vals/OTP-14064' into maint
* siri/cdv/faulty-column-vals/OTP-14064: [crashdump_viewer] Show correct values for 'Object' and 'Memory'
-rw-r--r--lib/observer/src/cdv_ets_cb.erl7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/observer/src/cdv_ets_cb.erl b/lib/observer/src/cdv_ets_cb.erl
index 52a90b093b..ddd2d42df6 100644
--- a/lib/observer/src/cdv_ets_cb.erl
+++ b/lib/observer/src/cdv_ets_cb.erl
@@ -34,10 +34,8 @@
-define(COL_NAME, ?COL_ID+1).
-define(COL_SLOT, ?COL_NAME+1).
-define(COL_OWNER, ?COL_SLOT+1).
--define(COL_BUCK, ?COL_OWNER+1).
--define(COL_OBJ, ?COL_BUCK+1).
+-define(COL_OBJ, ?COL_OWNER+1).
-define(COL_MEM, ?COL_OBJ+1).
--define(COL_TYPE, ?COL_MEM+1).
%% Callbacks for cdv_virtual_list_wx
col_to_elem(id) -> col_to_elem(?COL_ID);
@@ -45,8 +43,6 @@ col_to_elem(?COL_ID) -> #ets_table.id;
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_TYPE) -> #ets_table.data_type;
-col_to_elem(?COL_BUCK) -> #ets_table.buckets;
col_to_elem(?COL_OBJ) -> #ets_table.size;
col_to_elem(?COL_MEM) -> #ets_table.memory.
@@ -57,7 +53,6 @@ col_spec() ->
{"Owner", ?wxLIST_FORMAT_CENTRE, 120},
{"Objects", ?wxLIST_FORMAT_RIGHT, 80},
{"Memory", ?wxLIST_FORMAT_RIGHT, 80}
-% {"Type", ?wxLIST_FORMAT_LEFT, 50}
].
get_info(Owner) ->