Merge branch 'dgud/observer_fixes'

* dgud/observer_fixes:
  observer: catch progressbar errors
  observer: Fix observer crash when closing crashdumpviewer
  observer: Fix binary links
  observer: Fix crash when clicking on pid inside a html-term

7 files changed, 103 insertions, 69 deletions

diff --git a/lib/observer/src/cdv_bin_cb.erl b/lib/observer/src/cdv_bin_cb.erl
index 0266047ee3..d5fbceff1e 100644
--- a/lib/observer/src/cdv_bin_cb.erl
+++ b/lib/observer/src/cdv_bin_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2014. 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
@@ -21,26 +21,26 @@
 	 detail_pages/0]).
 
 %% Callbacks for cdv_detail_wx
-get_details({_, {T,Key}}) ->
+get_details({Type, {T,Key}}) ->
     [{Key,Term}] = ets:lookup(T,Key),
-    {ok,{"Expanded Binary", Term, []}};
+    {ok,{"Expanded Binary", {Type, Term}, []}};
 get_details({cdv, Id}) ->
     {ok,Bin} = crashdump_viewer:expand_binary(Id),
-    {ok,{"Expanded Binary", Bin, []}}.
+    {ok,{"Expanded Binary", {cvd, Bin}, []}}.
 
 detail_pages() ->
     [{"Binary", fun init_bin_page/2}].
 
-init_bin_page(Parent,Bin) ->
+init_bin_page(Parent,{Type,Bin}) ->
     cdv_multi_wx:start_link(
       Parent,
-      [{"Format \~p",cdv_html_wx,format_bin_fun("~p",Bin)},
-       {"Format \~tp",cdv_html_wx,format_bin_fun("~tp",Bin)},
-       {"Format \~w",cdv_html_wx,format_bin_fun("~w",Bin)},
-       {"Format \~s",cdv_html_wx,format_bin_fun("~s",Bin)},
-       {"Format \~ts",cdv_html_wx,format_bin_fun("~ts",Bin)},
-       {"Hex",cdv_html_wx,hex_binary_fun(Bin)},
-       {"Term",cdv_html_wx,binary_to_term_fun(Bin)}]).
+      [{"Format \~p",cdv_html_wx,{Type,format_bin_fun("~p",Bin)}},
+       {"Format \~tp",cdv_html_wx,{Type,format_bin_fun("~tp",Bin)}},
+       {"Format \~w",cdv_html_wx,{Type,format_bin_fun("~w",Bin)}},
+       {"Format \~s",cdv_html_wx,{Type,format_bin_fun("~s",Bin)}},
+       {"Format \~ts",cdv_html_wx,{Type,format_bin_fun("~ts",Bin)}},
+       {"Hex",cdv_html_wx,{Type,hex_binary_fun(Bin)}},
+       {"Term",cdv_html_wx,{Type,binary_to_term_fun(Bin)}}]).
 
 format_bin_fun(Format,Bin) ->
     fun() ->
diff --git a/lib/observer/src/cdv_html_wx.erl b/lib/observer/src/cdv_html_wx.erl
index fe77a41f59..b79c647f63 100644
--- a/lib/observer/src/cdv_html_wx.erl
+++ b/lib/observer/src/cdv_html_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2014. 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
@@ -30,6 +30,7 @@
 %% Records
 -record(state,
 	{panel,
+	 app,         %% which tool is the user
 	 expand_table,
 	 expand_wins=[]}).
 
@@ -38,16 +39,21 @@ start_link(ParentWin, Info) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-init([ParentWin, Fun]) when is_function(Fun) ->
-    init([ParentWin, Fun()]);
+init([ParentWin, {App, Fun}]) when is_function(Fun) ->
+    init([ParentWin, {App, Fun()}]);
 init([ParentWin, {expand,HtmlText,Tab}]) ->
-    HtmlWin = observer_lib:html_window(ParentWin),
-    wxHtmlWindow:setPage(HtmlWin,HtmlText),
-    {HtmlWin, #state{panel=HtmlWin,expand_table=Tab}};
+    init(ParentWin, HtmlText, Tab, cdv);
+init([ParentWin, {App, {expand,HtmlText,Tab}}]) ->
+    init(ParentWin, HtmlText, Tab, App);
+init([ParentWin, {App,HtmlText}]) ->
+    init(ParentWin, HtmlText, undefined, App);
 init([ParentWin, HtmlText]) ->
+    init(ParentWin, HtmlText, undefined, cdv).
+
+init(ParentWin, HtmlText, Tab, App) ->
     HtmlWin = observer_lib:html_window(ParentWin),
     wxHtmlWindow:setPage(HtmlWin,HtmlText),
-    {HtmlWin, #state{panel=HtmlWin}}.
+    {HtmlWin, #state{panel=HtmlWin,expand_table=Tab,app=App}}.
 
 %%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -78,7 +84,7 @@ handle_cast(Msg, State) ->
 
 handle_event(#wx{event=#wxHtmlLink{type=command_html_link_clicked,
 				   linkInfo=#wxHtmlLinkInfo{href=Target}}},
-	     #state{expand_table=Tab}=State) ->
+	     #state{expand_table=Tab, app=App}=State) ->
     NewState=
 	case Target of
 	    "#Binary?" ++ BinSpec ->
@@ -102,10 +108,12 @@ handle_event(#wx{event=#wxHtmlLink{type=command_html_link_clicked,
 				 list_to_integer(Key2),
 				 list_to_integer(Key3)}}},
 		expand(Id,cdv_term_cb,State);
+	    _ when App =:= obs ->
+		observer ! {open_link, Target};
 	    _ ->
 		cdv_virtual_list_wx:start_detail_win(Target),
 		State
-    end,
+	end,
     {noreply, NewState};
 
 handle_event(Event, State) ->
diff --git a/lib/observer/src/cdv_term_cb.erl b/lib/observer/src/cdv_term_cb.erl
index 6426cc0803..4451045012 100644
--- a/lib/observer/src/cdv_term_cb.erl
+++ b/lib/observer/src/cdv_term_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2014. 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
@@ -21,23 +21,23 @@
 	 detail_pages/0]).
 
 %% Callbacks for cdv_detail_wx
-get_details({_, {T,Key}}) ->
+get_details({Type, {T,Key}}) ->
     [{Key,Term}] = ets:lookup(T,Key),
-    {ok,{"Expanded Term", [Term, T], []}}.
+    {ok,{"Expanded Term", {Type,[Term, T]}, []}}.
 
 detail_pages() ->
     [{"Term", fun init_term_page/2}].
 
-init_term_page(ParentWin, [Term, Tab]) ->
+init_term_page(ParentWin, {Type, [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 \~p",cdv_html_wx,{Type, format_term_fun("~p",BinSaved,Tab)}},
+       {"Format \~tp",cdv_html_wx,{Type,format_term_fun("~tp",BinSaved,Tab)}},
+       {"Format \~w",cdv_html_wx,{Type,format_term_fun("~w",BinSaved,Tab)}},
+       {"Format \~s",cdv_html_wx,{Type,format_term_fun("~s",Expanded,Tab)}},
+       {"Format \~ts",cdv_html_wx,{Type,format_term_fun("~ts",Expanded,Tab)}}]).
 
 format_term_fun(Format,Term,Tab) ->
     fun() ->
@@ -56,8 +56,9 @@ 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),
+    PrevSize = min(Size, 10) * 8,
+    <<Preview:PrevSize, _/binary>> = Bin,
     Hash = erlang:phash2(Bin),
     Key = {Preview, Size, Hash},
     ets:insert(Tab, {Key,Bin}),
diff --git a/lib/observer/src/observer_html_lib.erl b/lib/observer/src/observer_html_lib.erl
index 9f77891426..c279218707 100644
--- a/lib/observer/src/observer_html_lib.erl
+++ b/lib/observer/src/observer_html_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. 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
@@ -146,7 +146,8 @@ all_or_expand(Tab,Term) ->
     Check = io_lib:format("~P",[Term,100]),
     Exp = Preview=/=Check,
     all_or_expand(Tab,Term,Preview,Exp).
-all_or_expand(_Tab,_Term,Str,false) ->
+all_or_expand(_Tab,Term,Str,false)
+  when not is_binary(Term) ->
     href_proc_port(lists:flatten(Str));
 all_or_expand(Tab,Term,Preview,true)
   when not is_binary(Term) ->
@@ -158,20 +159,16 @@ all_or_expand(Tab,Term,Preview,true)
 	       "&key2="++integer_to_list(Key2)++
 	       "&key3="++integer_to_list(Key3)],
 	  "Click to expand above term")];
-all_or_expand(Tab,Bin,PreviewStr,true) when is_binary(Bin) ->
-    <<Preview:80, _/binary>> = Bin,
+all_or_expand(Tab,Bin,_PreviewStr,_Expand)
+  when is_binary(Bin) ->
     Size = byte_size(Bin),
+    PrevSize = min(Size, 10) * 8,
+    <<Preview:PrevSize, _/binary>> = Bin,
     Hash = erlang:phash2(Bin),
     Key = {Preview, Size, Hash},
     ets:insert(Tab,{Key,Bin}),
-    [href_proc_port(lists:flatten(PreviewStr), false), $\n,
-     href("TARGET=\"expanded\"",
-	  ["#OBSBinary?key1="++integer_to_list(Preview)++
-	       "&key2="++integer_to_list(Size)++
-	       "&key3="++integer_to_list(Hash)],
-	  "Click to expand above term")].
-
-
+    Term = io_lib:format("~p", [['#OBSBin',Preview,Size,Hash]]),
+    href_proc_port(lists:flatten(Term), true).
 
 color(true) -> io_lib:format("BGCOLOR=\"#~2.16.0B~2.16.0B~2.16.0B\"", tuple_to_list(?BG_EVEN));
 color(false) -> io_lib:format("BGCOLOR=\"#~2.16.0B~2.16.0B~2.16.0B\"", tuple_to_list(?BG_ODD)).
@@ -242,7 +239,7 @@ href(Args,Link,Text) ->
     ["<A HREF=\"",Link,"\" ",Args,">",Text,"</A>"].
 font(Args,Text) ->
     ["<FONT ",Args,">\n",Text,"\n</FONT>\n"].
-p(Text) ->    
+p(Text) ->
     ["<P>",Text,"</P>\n"].
 br() ->
     "<BR>\n".
@@ -336,34 +333,28 @@ href_proc_bin(From, T, Acc, LTB) ->
     {OffsetSizePos,Rest} = split($],T),
     BinStr =
 	case string:tokens(OffsetSizePos,",.| \n") of
-	    [Offset,Size,Pos] when From =:= cdv ->
+	    [Offset,SizeStr,Pos] when From =:= cdv ->
 		Id = {list_to_integer(Offset),10,list_to_integer(Pos)},
 		{ok,PreviewBin} = crashdump_viewer:expand_binary(Id),
-		PreviewStr = ["&lt;&lt;",
-			      [integer_to_list(X)++"," || <<X:8>> <= PreviewBin],
-			      "...(",
-			      observer_lib:to_str({bytes,Size}),
-			      ")&gt;&gt;"],
+		PreviewStr = preview_string(list_to_integer(SizeStr), PreviewBin),
 		if LTB ->
 			href("TARGET=\"expanded\"",
 			     ["#Binary?offset="++Offset++
-				  "&size="++Size++
+				  "&size="++SizeStr++
 				  "&pos="++Pos],
 			     PreviewStr);
 		   true ->
 			PreviewStr
 		end;
-	    [Preview,Size,Md5] when From =:= obs ->
-		PreviewBin = <<(list_to_integer(Preview)):80>>,
-		PreviewStr = ["&lt;&lt;",
-			      [integer_to_list(X)++"," || <<X:8>> <= PreviewBin],
-			      "...(",
-			      observer_lib:to_str({bytes,list_to_integer(Size)}),
-			      ")&gt;&gt;"],
+	    [Preview,SizeStr,Md5] when From =:= obs ->
+		Size = list_to_integer(SizeStr),
+		PrevSize =  min(Size, 10) * 8,
+		PreviewStr = preview_string(Size,
+					    <<(list_to_integer(Preview)):PrevSize>>),
 		if LTB ->
 			href("TARGET=\"expanded\"",
 			     ["#OBSBinary?key1="++Preview++
-				  "&key2="++Size++
+				  "&key2="++SizeStr++
 				  "&key3="++Md5],
 			     PreviewStr);
 		   true ->
@@ -374,6 +365,35 @@ href_proc_bin(From, T, Acc, LTB) ->
 	end,
     href_proc_port(Rest,[BinStr|Acc],LTB).
 
+preview_string(Size, PreviewBin) when Size > 10 ->
+    ["&lt;&lt;",
+     remove_lgt(io_lib:format("~p",[PreviewBin])),
+     "...(",
+     observer_lib:to_str({bytes,Size}),
+     ")",
+     "&gt;&gt"];
+preview_string(_, PreviewBin) ->
+    ["&lt;&lt;",
+     remove_lgt(io_lib:format("~p",[PreviewBin])),
+     "&gt;&gt"].
+
+remove_lgt(Deep) ->
+    remove_lgt_1(lists:flatten(Deep)).
+
+remove_lgt_1([$<,$<|Rest]) ->
+    [$>,$>|BinStr] = lists:reverse(Rest),
+    replace_lgt(lists:reverse(BinStr)).
+
+replace_lgt([$<|R]) ->
+    ["&lt;"|replace_lgt(R)];
+replace_lgt([$>|R]) ->
+    ["&gt;"|replace_lgt(R)];
+replace_lgt([L=[_|_]|R]) ->
+    [replace_lgt(L)|replace_lgt(R)];
+replace_lgt([A|R]) ->
+    [A|replace_lgt(R)];
+replace_lgt([]) -> [].
+
 split(Char,Str) ->
     split(Char,Str,[]).
 split(Char,[Char|Str],Acc) -> % match Char
@@ -381,7 +401,6 @@ split(Char,[Char|Str],Acc) -> % match Char
 split(Char,[H|T],Acc) ->
     split(Char,T,[H|Acc]).
 
-
 warn([]) ->
     [];
 warn(Warning) ->
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index e0f7bf482b..cedaf7d2b8 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -699,7 +699,9 @@ progress_handler(Caller,Env,Title,Str) ->
     register(?progress_handler,self()),
     wx:set_env(Env),
     PD = progress_dialog(Env,Title,Str),
-    progress_loop(Title,PD,Caller).
+    try progress_loop(Title,PD,Caller)
+    catch closed -> normal end.
+
 progress_loop(Title,PD,Caller) ->
     receive
 	{progress,{ok,done}} -> % to make wait_for_progress/0 return
@@ -738,8 +740,12 @@ progress_dialog(_Env,Title,Str) ->
     PD.
 
 update_progress(PD,Value) ->
-    wxProgressDialog:update(PD,Value).
+    try wxProgressDialog:update(PD,Value)
+    catch _:_ -> throw(closed) %% Port or window have died
+    end.
 update_progress_text(PD,Text) ->
-    wxProgressDialog:update(PD,0,[{newmsg,Text}]).
+    try wxProgressDialog:update(PD,0,[{newmsg,Text}])
+    catch _:_ -> throw(closed) %% Port or window have died
+    end.
 finish_progress(PD) ->
     wxProgressDialog:destroy(PD).
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index 988e04993c..3ffa5fc77d 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. 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
@@ -136,9 +136,9 @@ handle_event(#wx{event=#wxHtmlLink{linkInfo=#wxHtmlLinkInfo{href=Href}}},
 	    {noreply, State};
 	Callback ->
 	    [{"key1",Key1},{"key2",Key2},{"key3",Key3}] = httpd:parse_query(Rest),
-	    Id = {observer, {T,{list_to_integer(Key1),
-				list_to_integer(Key2),
-				list_to_integer(Key3)}}},
+	    Id = {obs, {T,{list_to_integer(Key1),
+			   list_to_integer(Key2),
+			   list_to_integer(Key3)}}},
 	    Opened =
 		case lists:keyfind(Id,1,Opened0) of
 		    false ->
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index 4c385b76aa..ecb8e132fe 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. 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
@@ -214,7 +214,7 @@ handle_event(#wx{event = #wxClose{}}, State) ->
     {stop, normal, State};
 
 handle_event(#wx{id = ?ID_CDV, event = #wxCommand{type = command_menu_selected}}, State) ->
-    crashdump_viewer:start(),
+    spawn(crashdump_viewer, start, []),
     {noreply, State};
 
 handle_event(#wx{id = ?wxID_EXIT, event = #wxCommand{type = command_menu_selected}}, State) ->