File 0147-observer-Fix-words-to-bytes.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0147-observer-Fix-words-to-bytes.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Currently displaying revision 6a6e740c0161086d7407fd293e77c355 , Show latest

From e23b80fede0ff210841bb774874aa9529249fa4d Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Thu, 18 May 2017 11:50:30 +0200
Subject: [PATCH] observer: Fix words to bytes

heap and stack size in erlang:process_info/2 are reported as words
not as bytes.
---
 lib/observer/src/observer_lib.erl      |  6 ++++--
 lib/observer/src/observer_procinfo.erl | 15 ++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 4145a8d96..7352af936 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -173,13 +173,13 @@ fill_info([{Str,Attrib,Key}|Rest], Data) when is_atom(Key); is_function(Key) ->
 	Value -> [{Str,Attrib,Value} | fill_info(Rest, Data)]
     end;
 fill_info([{Str, {Format, Key}}|Rest], Data)
-  when is_atom(Key); is_function(Key), is_atom(Format) ->
+  when is_atom(Key); is_function(Key) ->
     case get_value(Key, Data) of
 	undefined -> [undefined | fill_info(Rest, Data)];
 	Value -> [{Str, {Format, Value}} | fill_info(Rest, Data)]
     end;
 fill_info([{Str, Attrib, {Format, Key}}|Rest], Data)
-  when is_atom(Key); is_function(Key), is_atom(Format) ->
+  when is_atom(Key); is_function(Key) ->
     case get_value(Key, Data) of
 	undefined -> [undefined | fill_info(Rest, Data)];
 	Value -> [{Str, Attrib, {Format, Value}} | fill_info(Rest, Data)]
@@ -252,6 +252,8 @@ to_str({bytes, B}) ->
 	KB >  0 -> integer_to_list(KB) ++ " kB";
 	true -> integer_to_list(B) ++ " B"
     end;
+to_str({{words,WSz}, Sz}) ->
+    to_str({bytes, WSz*Sz});
 to_str({time_ms, MS}) ->
     S = MS div 1000,
     Min = S div 60,
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index 8d19d7748..10decd8b6 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -198,10 +198,11 @@ code_change(_, _, State) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 init_process_page(Panel, Pid) ->
-    Fields0 = process_info_fields(Pid),
+    WSz = observer_wx:try_rpc(node(Pid), erlang, system_info,[wordsize]),
+    Fields0 = process_info_fields(Pid, WSz),
     {FPanel, _, UpFields} = observer_lib:display_info(Panel, Fields0),
     {FPanel, fun() ->
-		     Fields = process_info_fields(Pid),
+		     Fields = process_info_fields(Pid, WSz),
 		     observer_lib:update_info(UpFields, Fields)
 	     end}.
 
@@ -359,7 +360,7 @@ create_menus(MenuBar) ->
 	     {"View", [#create_menu{id=?REFRESH, text="Refresh\tCtrl-R"}]}],
     observer_lib:create_menus(Menus, MenuBar, new_window).
 
-process_info_fields(Pid) ->
+process_info_fields(Pid, WSz) ->
     Struct = [{"Overview",
 	       [{"Initial Call",     initial_call},
 		{"Current Function", current_function},
@@ -383,10 +384,10 @@ process_info_fields(Pid) ->
 		{"Monitored by",     {click, monitored_by}}]},
 	      {"Memory and Garbage Collection", right,
 	       [{"Memory",           {bytes, memory}},
-		{"Stack and Heaps",  {bytes, total_heap_size}},
-		{"Heap Size",        {bytes, heap_size}},
-		{"Stack Size",       {bytes, stack_size}},
-		{"GC Min Heap Size", {bytes, get_gc_info(min_heap_size)}},
+		{"Stack and Heaps",  {{words,WSz}, total_heap_size}},
+		{"Heap Size",        {{words,WSz}, heap_size}},
+		{"Stack Size",       {{words,WSz}, stack_size}},
+		{"GC Min Heap Size", {{words,WSz}, get_gc_info(min_heap_size)}},
 		{"GC FullSweep After", get_gc_info(fullsweep_after)}
 	       ]}],
     case observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, item_list()]) of
-- 
2.13.0

Places

File 0147-observer-Fix-words-to-bytes.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Places