root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Include not named_tables on top overview

This commit is contained in:
Diana Corbacho 2018-07-11 12:01:28 +01:00
parent 8355352a3d
commit 81c9829314
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbitmq_top/priv/www/js/tmpl/ets_tables.ejs vendored
View File

@ -29,6 +29,7 @@
<th><%= fmt_sort_desc_by_default('Memory', 'memory') %></th> <th><%= fmt_sort_desc_by_default('Memory', 'memory') %></th>
<th><%= fmt_sort_desc_by_default('Size', 'size') %></th> <th><%= fmt_sort_desc_by_default('Size', 'size') %></th>
<th><%= fmt_sort_desc_by_default('Type', 'type') %></th> <th><%= fmt_sort_desc_by_default('Type', 'type') %></th>
<th><%= fmt_sort_desc_by_default('Named', 'named_table') %></th>
<th>Protection</th> <th>Protection</th>
<th>Compressed</th> <th>Compressed</th>
</tr> </tr>
@ -44,6 +45,7 @@
<td><%= fmt_bytes(table.memory * 1.0) %></td> <td><%= fmt_bytes(table.memory * 1.0) %></td>
<td><%= table.size %></td> <td><%= table.size %></td>
<td><%= table.type %></td> <td><%= table.type %></td>
<td><%= table.named_table %></td>
<td><%= table.protection %></td> <td><%= table.protection %></td>
<td><%= table.compressed %></td> <td><%= table.compressed %></td>
</tr> </tr>

12
deps/rabbitmq_top/src/rabbit_top_wm_ets_tables.erl vendored
View File

@ -55,9 +55,9 @@ ets_tables(Node, Sort, Order, RowCount) ->
end. end.
fmt(Info) -> fmt(Info) ->
{owner, Pid} = lists:keyfind(owner, 1, Info), {owner, OPid} = lists:keyfind(owner, 1, Info),
%% OTP 21 introduced the 'id' element that contains a reference. {heir, HPid} = lists:keyfind(heir, 1, Info),
%% These cannot be serialised and must be removed from the proplist Info1 = lists:keydelete(owner, 1, Info),
Info1 = lists:keydelete(owner, 1, Info2 = lists:keydelete(heir, 1, Info1),
lists:keydelete(id, 1, Info)), [{owner, rabbit_top_util:fmt(OPid)},
[{owner, rabbit_top_util:fmt(Pid)} | Info1]. {heir, rabbit_top_util:fmt(HPid)} | Info2].

5
deps/rabbitmq_top/src/rabbit_top_worker.erl vendored
View File

@ -122,13 +122,12 @@ ets_tables(_OldTables) ->
end, end,
ets:all()). ets:all()).
table_info(Table) when not is_atom(Table) -> undefined; table_info(Table) ->
table_info(TableName) when is_atom(TableName) ->
Info = lists:map(fun Info = lists:map(fun
({memory, MemWords}) -> {memory, bytes(MemWords)}; ({memory, MemWords}) -> {memory, bytes(MemWords)};
(Other) -> Other (Other) -> Other
end, end,
ets:info(TableName)), ets:info(Table)),
{owner, OwnerPid} = lists:keyfind(owner, 1, Info), {owner, OwnerPid} = lists:keyfind(owner, 1, Info),
case process_info(OwnerPid, registered_name) of case process_info(OwnerPid, registered_name) of
[] -> Info; [] -> Info;