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, 75 insertions, 0 deletions

diff --git a/lib/observer/src/cdv_term_cb.erl b/lib/observer/src/cdv_term_cb.erl
new file mode 100644
index 0000000000..6426cc0803
--- /dev/null
+++ b/lib/observer/src/cdv_term_cb.erl
@@ -0,0 +1,75 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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_term_cb).
+
+-export([get_details/1,
+	 detail_pages/0]).
+
+%% Callbacks for cdv_detail_wx
+get_details({_, {T,Key}}) ->
+    [{Key,Term}] = ets:lookup(T,Key),
+    {ok,{"Expanded Term", [Term, T], []}}.
+
+detail_pages() ->
+    [{"Term", fun init_term_page/2}].
+
+init_term_page(ParentWin, [Term, Tab]) ->
+    Expanded = expand(Term, true),
+    BinSaved = expand(Term, Tab),
+    cdv_multi_wx:start_link(
+      ParentWin,
+      [{"Format \~p",cdv_html_wx,format_term_fun("~p",BinSaved,Tab)},
+       {"Format \~tp",cdv_html_wx,format_term_fun("~tp",BinSaved,Tab)},
+       {"Format \~w",cdv_html_wx,format_term_fun("~w",BinSaved,Tab)},
+       {"Format \~s",cdv_html_wx,format_term_fun("~s",Expanded,Tab)},
+       {"Format \~ts",cdv_html_wx,format_term_fun("~ts",Expanded,Tab)}]).
+
+format_term_fun(Format,Term,Tab) ->
+    fun() ->
+	    try io_lib:format(Format,[Term]) of
+		Str -> {expand, plain_html(Str), Tab}
+	    catch error:badarg ->
+		    Warning = "This term can not be formatted with " ++ Format,
+		    observer_html_lib:warning(Warning)
+	    end
+    end.
+
+plain_html(Text) ->
+    observer_html_lib:plain_page(Text).
+
+expand(['#CDVBin',Offset,Size,Pos], true) ->
+    {ok,Bin} = crashdump_viewer:expand_binary({Offset,Size,Pos}),
+    Bin;
+expand(Bin, Tab) when is_binary(Bin), not is_boolean(Tab) ->
+    <<Preview:80, _/binary>> = Bin,
+    Size = byte_size(Bin),
+    Hash = erlang:phash2(Bin),
+    Key = {Preview, Size, Hash},
+    ets:insert(Tab, {Key,Bin}),
+    ['#OBSBin',Preview,Size,Hash];
+expand([H|T], Expand) ->
+    case expand(T, Expand) of
+	ET when is_list(ET) ->
+	    [expand(H, Expand)|ET];
+        ET -> % The tail is an expanded binary - cannot append with |
+	    [expand(H, Expand),ET]
+    end;
+expand(Tuple, Expand) when is_tuple(Tuple) ->
+    list_to_tuple(expand(tuple_to_list(Tuple), Expand));
+expand(Term, _) ->
+    Term.