observer: Add allocator info to gui

1 files changed, 83 insertions, 8 deletions

diff --git a/lib/observer/src/observer_sys_wx.erl b/lib/observer/src/observer_sys_wx.erl
index f00a666a35..54612b58ae 100644
--- a/lib/observer/src/observer_sys_wx.erl
+++ b/lib/observer/src/observer_sys_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -37,6 +37,7 @@
 	 parent_notebook,
 	 panel, sizer,
 	 menubar,
+	 alloc,
 	 fields,
 	 timer}).
 
@@ -47,22 +48,28 @@ start_link(Notebook, Parent) ->
 
 init([Notebook, Parent]) ->
     SysInfo = observer_backend:sys_info(),
+    AllocInfo = proplists:get_value(alloc_info, SysInfo, []),
     {Info, Stat} = info_fields(),
     Panel = wxPanel:new(Notebook),
-    Sizer = wxBoxSizer:new(?wxHORIZONTAL),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    TopSizer = wxBoxSizer:new(?wxHORIZONTAL),
     {FPanel0, _FSizer0, Fields0} =
 	observer_lib:display_info(Panel, observer_lib:fill_info(Info, SysInfo)),
     {FPanel1, _FSizer1, Fields1} =
 	observer_lib:display_info(Panel, observer_lib:fill_info(Stat, SysInfo)),
-    wxSizer:add(Sizer, FPanel0, [{flag, ?wxEXPAND bor ?wxTOP bor ?wxBOTTOM bor ?wxLEFT},
-				 {proportion, 1}, {border, 5}]),
-    wxSizer:add(Sizer, FPanel1, [{flag, ?wxEXPAND bor ?wxTOP bor ?wxBOTTOM bor ?wxRIGHT},
-				 {proportion, 1}, {border, 5}]),
+    wxSizer:add(TopSizer, FPanel0, [{flag, ?wxEXPAND}, {proportion, 1}]),
+    wxSizer:add(TopSizer, FPanel1, [{flag, ?wxEXPAND}, {proportion, 1}]),
+    BorderFlags = ?wxLEFT bor ?wxRIGHT,
+    MemoryInfo = create_mem_info(Panel, AllocInfo),
+    wxSizer:add(Sizer, TopSizer, [{flag, ?wxEXPAND bor BorderFlags bor ?wxTOP},
+				  {proportion, 0}, {border, 5}]),
+    wxSizer:add(Sizer, MemoryInfo, [{flag, ?wxEXPAND bor BorderFlags bor ?wxBOTTOM},
+				    {proportion, 1}, {border, 5}]),
     wxPanel:setSizer(Panel, Sizer),
     Timer = observer_lib:start_timer(10),
     {Panel, #sys_wx_state{parent=Parent,
 			  parent_notebook=Notebook,
-			  panel=Panel, sizer=Sizer,
+			  panel=Panel, sizer=Sizer, alloc=MemoryInfo,
 			  timer=Timer, fields=Fields0 ++ Fields1}}.
 
 create_sys_menu(Parent) ->
@@ -70,13 +77,81 @@ create_sys_menu(Parent) ->
 		     #create_menu{id = ?ID_REFRESH_INTERVAL, text = "Refresh interval"}]},
     observer_wx:create_menus(Parent, [View]).
 
-update_syspage(#sys_wx_state{node = Node, fields=Fields, sizer=Sizer}) ->
+update_syspage(#sys_wx_state{node = Node, fields=Fields, sizer=Sizer, alloc=AllocCtrl}) ->
     SysInfo = observer_wx:try_rpc(Node, observer_backend, sys_info, []),
+    AllocInfo = proplists:get_value(alloc_info, SysInfo, []),
     {Info, Stat} = info_fields(),
     observer_lib:update_info(Fields, observer_lib:fill_info(Info, SysInfo) ++
 				 observer_lib:fill_info(Stat, SysInfo)),
+    update_alloc(AllocCtrl, AllocInfo),
     wxSizer:layout(Sizer).
 
+create_mem_info(Panel, Fields) ->
+    Style = ?wxLC_REPORT bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES bor ?wxLC_VRULES,
+    Grid = wxListCtrl:new(Panel, [{style, Style}]),
+    Li = wxListItem:new(),
+    AddListEntry = fun({Name, Align, DefSize}, Col) ->
+			   wxListItem:setText(Li, Name),
+			   wxListItem:setAlign(Li, Align),
+			   wxListCtrl:insertColumn(Grid, Col, Li),
+			   wxListCtrl:setColumnWidth(Grid, Col, DefSize),
+			   Col + 1
+		   end,
+    ListItems = [{"Allocator Type",  ?wxLIST_FORMAT_LEFT,  200},
+		 {"Block size (kB)",  ?wxLIST_FORMAT_RIGHT, 150},
+		 {"Carrier size (kB)",?wxLIST_FORMAT_RIGHT, 150}],
+    lists:foldl(AddListEntry, 0, ListItems),
+    wxListItem:destroy(Li),
+    update_alloc(Grid, Fields),
+    Grid.
+
+update_alloc(Grid, AllocInfo) ->
+    Fields = alloc_info(AllocInfo, [], 0, 0, true),
+    wxListCtrl:deleteAllItems(Grid),
+    Update = fun({Name, BS, CS}, Row) ->
+		     wxListCtrl:insertItem(Grid, Row, ""),
+		     wxListCtrl:setItem(Grid, Row, 0, observer_lib:to_str(Name)),
+		     wxListCtrl:setItem(Grid, Row, 1, observer_lib:to_str(BS div 1024)),
+		     wxListCtrl:setItem(Grid, Row, 2, observer_lib:to_str(CS div 1024)),
+		     Row + 1
+	     end,
+    lists:foldl(Update, 0, Fields),
+    Fields.
+
+alloc_info([{Type,Instances}|Allocators],TypeAcc,TotalBS,TotalCS,IncludeTotal) ->
+    {BS,CS,NewTotalBS,NewTotalCS,NewIncludeTotal} =
+	sum_alloc_instances(Instances,0,0,TotalBS,TotalCS),
+    alloc_info(Allocators,[{Type,BS,CS}|TypeAcc],NewTotalBS,NewTotalCS,
+	       IncludeTotal andalso NewIncludeTotal);
+alloc_info([],TypeAcc,TotalBS,TotalCS,IncludeTotal) ->
+    Types = [X || X={_,BS,CS} <- TypeAcc, (BS>0 orelse CS>0)],
+    case IncludeTotal of
+	true ->
+	    [{total,TotalBS,TotalCS} | lists:reverse(Types)];
+	false ->
+	    lists:reverse(Types)
+    end.
+
+sum_alloc_instances(false,BS,CS,TotalBS,TotalCS) ->
+    {BS,CS,TotalBS,TotalCS,false};
+sum_alloc_instances([{_,_,Data}|Instances],BS,CS,TotalBS,TotalCS) ->
+    {NewBS,NewCS,NewTotalBS,NewTotalCS} =
+	sum_alloc_one_instance(Data,BS,CS,TotalBS,TotalCS),
+    sum_alloc_instances(Instances,NewBS,NewCS,NewTotalBS,NewTotalCS);
+sum_alloc_instances([],BS,CS,TotalBS,TotalCS) ->
+    {BS,CS,TotalBS,TotalCS,true}.
+
+sum_alloc_one_instance([{sbmbcs,[{blocks_size,BS,_,_},{carriers_size,CS,_,_}]}|
+			Rest],OldBS,OldCS,TotalBS,TotalCS) ->
+    sum_alloc_one_instance(Rest,OldBS+BS,OldCS+CS,TotalBS,TotalCS);
+sum_alloc_one_instance([{_,[{blocks_size,BS,_,_},{carriers_size,CS,_,_}]}|
+			Rest],OldBS,OldCS,TotalBS,TotalCS) ->
+    sum_alloc_one_instance(Rest,OldBS+BS,OldCS+CS,TotalBS+BS,TotalCS+CS);
+sum_alloc_one_instance([_|Rest],BS,CS,TotalBS,TotalCS) ->
+    sum_alloc_one_instance(Rest,BS,CS,TotalBS,TotalCS);
+sum_alloc_one_instance([],BS,CS,TotalBS,TotalCS) ->
+    {BS,CS,TotalBS,TotalCS}.
+
 info_fields() ->
     Info = [{"System and Architecture",
 	     [{"System Version", otp_release},