Merge branch 'siri/wx-cdv/OTP-11179'

* siri/wx-cdv/OTP-11179:
  observer: cosmetic gui tweaks
  observer: Fix progress dialog creation
  observer: renamed crashdump_viewer files and fixed makefiles
  observer: improve wx version of crashdump_viewer
  observer: Use crashdump_viewer's term viewer to display large terms and binaries
  observer: Fix memory and scheduler info and handle missing fields
  observer: Optimize row lookups
  observer: improve wx version of crashdump_viewer
  observer: Consolidate the view of process information
  observer: add wx version of crashdump_viewer

1 files changed, 84 insertions, 0 deletions

diff --git a/lib/observer/src/cdv_mem_cb.erl b/lib/observer/src/cdv_mem_cb.erl
new file mode 100644
index 0000000000..2b0809df13
--- /dev/null
+++ b/lib/observer/src/cdv_mem_cb.erl
@@ -0,0 +1,84 @@
+%%
+%% %CopyrightBegin%
+%%
+%% 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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+-module(cdv_mem_cb).
+
+-export([get_info/0]).
+
+-include("crashdump_viewer.hrl").
+-include_lib("wx/include/wx.hrl").
+
+get_info() ->
+    observer_lib:report_progress({ok,"Processing memory info"}),
+    MemInfo = get_mem_info(),
+    observer_lib:report_progress({ok,33}),
+    {AllocInfo,AllocTW} = get_alloc_info(),
+    observer_lib:report_progress({ok,66}),
+    AreaInfo = get_area_info(),
+    observer_lib:report_progress({ok,100}),
+    [{"Memory",cdv_info_wx,MemInfo}
+     | [{Title,cdv_table_wx,{Cols,Data,AllocTW}} ||
+	   {Title,Cols,Data} <- AllocInfo]] ++
+	[{"Allocated Areas",cdv_table_wx,AreaInfo}].
+
+
+%%%-----------------------------------------------------------------
+%%% Memory page
+get_mem_info() ->
+    {ok,Info,TW} = crashdump_viewer:memory(),
+    {[{"Memory Information",gen_mem_info_fields(Info)}],Info,TW}.
+
+gen_mem_info_fields([{Key,_}|T]) ->
+    [{upper(atom_to_list(Key)),{bytes,Key}}|gen_mem_info_fields(T)];
+gen_mem_info_fields([]) ->
+    [].
+
+upper(Key) ->
+    string:join([string:to_upper([H]) ++ T || 
+		    [H|T] <- string:tokens(Key,"_")]," ").
+
+
+%%%-----------------------------------------------------------------
+%%% Allocated areas page
+get_area_info() ->
+    {ok,Info0,TW} = crashdump_viewer:allocated_areas(),
+    Info = [tuple_to_list(R) || R <- Info0],
+    {area_columns(),Info,TW}.
+
+area_columns() ->
+    [{"",                 ?wxLIST_FORMAT_LEFT,  150},
+     {"Allocated (bytes)",?wxLIST_FORMAT_RIGHT, 150},
+     {"Used (bytes)",     ?wxLIST_FORMAT_RIGHT, 150}].
+
+%%%-----------------------------------------------------------------
+%%% Allocator page
+get_alloc_info() ->
+    {ok,Info,TW} = crashdump_viewer:allocator_info(),
+    {fix_alloc(Info),TW}.
+
+fix_alloc([{Title,Columns,Data}|Tables]) ->
+    [{Title,alloc_columns(Columns),
+     [[Key|Values] || {Key,Values} <- Data]} |
+     fix_alloc(Tables)];
+fix_alloc([{Title,[{_,V}|_]=Data}|Tables]) ->
+    fix_alloc([{Title,lists:duplicate(length(V),[]),Data}|Tables]);
+fix_alloc([]) ->
+    [].
+
+alloc_columns(Columns) ->
+    [{"",   ?wxLIST_FORMAT_LEFT,  180} |
+     [{Column, ?wxLIST_FORMAT_RIGHT, 140} || Column <- Columns]].