Merge branch 'dgud/observer/bug-fixes/OTP-9878' into maint

* dgud/observer/bug-fixes/OTP-9878:
  [observer] Fixed refresh interval for table viewer
  [observer] Improved term formatting in table viewer
  [observer] Fixed regexp error handling
  [observer] Fix refresh dead process crash
  [observer] Fix bugs in edit table object
  [observer] Fix index reporting bug

4 files changed, 180 insertions, 70 deletions

diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 967baa5c7a..5260861497 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. 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
@@ -339,17 +339,37 @@ user_term(Parent, Title, Default) ->
 	?wxID_OK ->
 	    Str = wxTextEntryDialog:getValue(Dialog),
 	    wxTextEntryDialog:destroy(Dialog),
-	    parse_string(Str);
+	    parse_string(ensure_last_is_dot(Str));
 	?wxID_CANCEL ->
-	    wxTextEntryDialog:destroy(Dialog)
+	    wxTextEntryDialog:destroy(Dialog),
+	    cancel
     end.
 
 parse_string(Str) ->
     try
-	{ok, Tokens, _} = erl_scan:string(Str),
-	erl_parse:parse_term(Tokens)
-    catch _:{badmatch, {error, {_, _, Err}}} ->
-	    {error, ["Parse error: ", Err]};
-	  _Err ->
+	Tokens = case erl_scan:string(Str) of
+		     {ok, Ts, _} -> Ts;
+		     {error, {_SLine, SMod, SError}, _} ->
+			 throw(io_lib:format("~s", [SMod:format_error(SError)]))
+		 end,
+	case erl_parse:parse_term(Tokens) of
+	    {error, {_PLine, PMod, PError}} ->
+		throw(io_lib:format("~s", [PMod:format_error(PError)]));
+	    Res -> Res
+	end
+    catch
+	throw:ErrStr ->
+	    {error, ErrStr};
+	_:_Err ->
 	    {error, ["Syntax error in: ", Str]}
     end.
+
+ensure_last_is_dot([]) ->
+    ".";
+ensure_last_is_dot(String) ->
+    case lists:last(String) =:= $. of
+	true ->
+	    String;
+	false ->
+	    String ++ "."
+    end.
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index a4c5914c49..ec08d3aff1 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. 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
@@ -124,9 +124,14 @@ code_change(_, _, State) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 init_process_page(Panel, Pid) ->
-    Fields = process_info_fields(Pid),
-    {FPanel, _, UpFields} = observer_lib:display_info(Panel, Fields),
-    {FPanel, fun() -> observer_lib:update_info(UpFields, process_info_fields(Pid)) end}.
+    Fields0 = process_info_fields(Pid),
+    {FPanel, _, UpFields} = observer_lib:display_info(Panel, Fields0),
+    {FPanel, fun() -> case process_info_fields(Pid) of
+			  Fields when is_list(Fields) ->
+			      observer_lib:update_info(UpFields, Fields);
+			  _ -> ok
+		      end
+	     end}.
 
 init_text_page(Parent) ->
     Style = ?wxTE_MULTILINE bor ?wxTE_RICH2 bor ?wxTE_READONLY,
@@ -144,16 +149,20 @@ init_message_page(Parent, Pid) ->
 		      Number+1}
 	     end,
     Update = fun() ->
-		     {messages,RawMessages} =
-			 observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, messages]),
-		     {Messages,_} = lists:mapfoldl(Format, 1, RawMessages),
-		     Last = wxTextCtrl:getLastPosition(Text),
-		     wxTextCtrl:remove(Text, 0, Last),
-		     case Messages =:= [] of
-			 true ->
-			     wxTextCtrl:writeText(Text, "No messages");
-			 false ->
-			     wxTextCtrl:writeText(Text, Messages)
+		     case observer_wx:try_rpc(node(Pid), erlang, process_info,
+					      [Pid, messages])
+		     of
+			 {messages,RawMessages} ->
+			     {Messages,_} = lists:mapfoldl(Format, 1, RawMessages),
+			     Last = wxTextCtrl:getLastPosition(Text),
+			     wxTextCtrl:remove(Text, 0, Last),
+			     case Messages =:= [] of
+				 true ->
+				     wxTextCtrl:writeText(Text, "No messages");
+				 false ->
+				     wxTextCtrl:writeText(Text, Messages)
+			     end;
+			 _ -> ok
 		     end
 	     end,
     Update(),
@@ -162,12 +171,15 @@ init_message_page(Parent, Pid) ->
 init_dict_page(Parent, Pid) ->
     Text = init_text_page(Parent),
     Update = fun() ->
-		     {dictionary,RawDict} =
-			 observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, dictionary]),
-		     Dict = [io_lib:format("~-20.w ~p~n", [K, V]) || {K, V} <- RawDict],
-		     Last = wxTextCtrl:getLastPosition(Text),
-		     wxTextCtrl:remove(Text, 0, Last),
-		     wxTextCtrl:writeText(Text, Dict)
+		     case observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, dictionary])
+		     of
+			 {dictionary,RawDict} ->
+			     Dict = [io_lib:format("~-20.w ~p~n", [K, V]) || {K, V} <- RawDict],
+			     Last = wxTextCtrl:getLastPosition(Text),
+			     wxTextCtrl:remove(Text, 0, Last),
+			     wxTextCtrl:writeText(Text, Dict);
+			 _ -> ok
+		     end
 	     end,
     Update(),
     {Text, Update}.
@@ -183,24 +195,29 @@ init_stack_page(Parent, Pid) ->
     wxListCtrl:setColumnWidth(LCtrl, 1, 300),
     wxListItem:destroy(Li),
     Update = fun() ->
-		     {current_stacktrace,RawBt} =
-			 observer_wx:try_rpc(node(Pid), erlang, process_info,
-					     [Pid, current_stacktrace]),
-		     wxListCtrl:deleteAllItems(LCtrl),
-		     wx:foldl(fun({M, F, A, Info}, Row) ->
-				      _Item = wxListCtrl:insertItem(LCtrl, Row, ""),
-				      ?EVEN(Row) andalso
-					  wxListCtrl:setItemBackgroundColour(LCtrl, Row, ?BG_EVEN),
-				      wxListCtrl:setItem(LCtrl, Row, 0, observer_lib:to_str({M,F,A})),
-				      FileLine = case Info of
-						     [{file,File},{line,Line}] ->
-							 io_lib:format("~s:~w", [File,Line]);
-						     _ ->
-							 []
-						 end,
-				      wxListCtrl:setItem(LCtrl, Row, 1, FileLine),
-				      Row+1
-			      end, 0, RawBt)
+		     case observer_wx:try_rpc(node(Pid), erlang, process_info,
+					      [Pid, current_stacktrace])
+		     of
+			 {current_stacktrace,RawBt} ->
+			     observer_wx:try_rpc(node(Pid), erlang, process_info,
+						 [Pid, current_stacktrace]),
+			     wxListCtrl:deleteAllItems(LCtrl),
+			     wx:foldl(fun({M, F, A, Info}, Row) ->
+					      _Item = wxListCtrl:insertItem(LCtrl, Row, ""),
+					      ?EVEN(Row) andalso
+						  wxListCtrl:setItemBackgroundColour(LCtrl, Row, ?BG_EVEN),
+					      wxListCtrl:setItem(LCtrl, Row, 0, observer_lib:to_str({M,F,A})),
+					      FileLine = case Info of
+							     [{file,File},{line,Line}] ->
+								 io_lib:format("~s:~w", [File,Line]);
+							     _ ->
+								 []
+							 end,
+					      wxListCtrl:setItem(LCtrl, Row, 1, FileLine),
+					      Row+1
+				      end, 0, RawBt);
+			 _ -> ok
+		     end
 	     end,
     Resize = fun(#wx{event=#wxSize{size={W,_}}},Ev) ->
 		     wxEvent:skip(Ev),
@@ -216,7 +233,6 @@ create_menus(MenuBar) ->
     observer_lib:create_menus(Menus, MenuBar, new_window).
 
 process_info_fields(Pid) ->
-    RawInfo = observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, item_list()]),
     Struct = [{"Overview",
 	       [{"Initial Call",     initial_call},
 		{"Current Function", current_function},
@@ -246,7 +262,12 @@ process_info_fields(Pid) ->
 		{"GC Min Heap Size", {bytes, get_gc_info(min_heap_size)}},
 		{"GC FullSweep After", get_gc_info(fullsweep_after)}
 	       ]}],
-    observer_lib:fill_info(Struct, RawInfo).
+    case observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, item_list()]) of
+	RawInfo when is_list(RawInfo) ->
+	    observer_lib:fill_info(Struct, RawInfo);
+	_ ->
+	    ok
+    end.
 
 item_list() ->
     [ %% backtrace,
diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index 31d5f3d632..f432173f57 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. 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
@@ -58,7 +58,7 @@
 	  source,
 	  tab,
 	  attrs,
-	  timer
+	  timer={false, 30}
 	}).
 
 -record(opt,
@@ -268,8 +268,8 @@ handle_event(#wx{id=?ID_DELETE},
 handle_event(#wx{id=?wxID_CLOSE}, State) ->
     {stop, normal, State};
 
-handle_event(Help = #wx{id=?wxID_HELP}, State = #state{parent=Parent}) ->
-    Parent ! Help,
+handle_event(Help = #wx{id=?wxID_HELP}, State) ->
+    observer ! Help,
     {noreply, State};
 
 handle_event(#wx{id=?GOTO_ENTRY, event=#wxCommand{cmdString=Str}},
@@ -374,40 +374,51 @@ handle_event(#wx{id=?ID_REFRESH_INTERVAL},
     Timer = observer_lib:interval_dialog(Grid, Timer0, 10, 5*60),
     {noreply, State#state{timer=Timer}};
 
-handle_event(Event, State) ->
-    io:format("~p:~p, handle event ~p\n", [?MODULE, ?LINE, Event]),
+handle_event(_Event, State) ->
+    %io:format("~p:~p, handle event ~p\n", [?MODULE, ?LINE, Event]),
     {noreply, State}.
 
-handle_sync_event(Event, _Obj, _State) ->
-    io:format("~p:~p, handle sync_event ~p\n", [?MODULE, ?LINE, Event]),
+handle_sync_event(_Event, _Obj, _State) ->
+    %io:format("~p:~p, handle sync_event ~p\n", [?MODULE, ?LINE, Event]),
     ok.
 
-handle_call(Event, From, State) ->
-    io:format("~p:~p, handle call (~p) ~p\n", [?MODULE, ?LINE, From, Event]),
+handle_call(_Event, _From, State) ->
+    %io:format("~p:~p, handle call (~p) ~p\n", [?MODULE, ?LINE, From, Event]),
     {noreply, State}.
 
-handle_cast(Event, State) ->
-    io:format("~p:~p, handle cast ~p\n", [?MODULE, ?LINE, Event]),
+handle_cast(_Event, State) ->
+    %io:format("~p:~p, handle cast ~p\n", [?MODULE, ?LINE, Event]),
     {noreply, State}.
 
 handle_info({no_rows, N}, State = #state{grid=Grid, status=StatusBar}) ->
     wxListCtrl:setItemCount(Grid, N),
     wxStatusBar:setStatusText(StatusBar, io_lib:format("Objects: ~w",[N])),
     {noreply, State};
+
 handle_info({new_cols, New}, State = #state{grid=Grid, columns=Cols0}) ->
     Cols = add_columns(Grid, Cols0, New),
     {noreply, State#state{columns=Cols}};
+
 handle_info({refresh, Min, Max}, State = #state{grid=Grid}) ->
     wxListCtrl:refreshItems(Grid, Min, Max),
     {noreply, State};
+
+handle_info(refresh_interval, State = #state{pid=Pid}) ->
+    Pid ! refresh,
+    {noreply, State};
+
 handle_info({error, Error}, State = #state{frame=Frame}) ->
-    Dlg = wxMessageDialog:new(Frame, Error),
+    ErrorStr =
+	try io_lib:format("~ts", [Error]), Error
+	catch _:_ -> io_lib:format("~p", [Error])
+	end,
+    Dlg = wxMessageDialog:new(Frame, ErrorStr),
     wxMessageDialog:showModal(Dlg),
     wxMessageDialog:destroy(Dlg),
     {noreply, State};
 
-handle_info(Event, State) ->
-    io:format("~p:~p, handle info ~p\n", [?MODULE, ?LINE, Event]),
+handle_info(_Event, State) ->
+    %% io:format("~p:~p, handle info ~p\n", [?MODULE, ?LINE, _Event]),
     {noreply, State}.
 
 terminate(_Event, #state{pid=Pid, attrs=Attrs}) ->
@@ -588,19 +599,22 @@ search([Str, Row, Dir0, CaseSens],
 	      true -> [];
 	      false -> [caseless]
 	  end,
-    {ok, Re} = re:compile(Str, Opt),
     Dir = case Dir0 of
 	      true -> 1;
 	      false -> -1
 	  end,
-    Res = search(Row, Dir, Re, Table),
+    Res = case re:compile(Str, Opt) of
+	      {ok, Re} ->
+		  search(Row, Dir, Re, Table);
+	      {error, _} -> false
+	  end,
     Parent ! {self(), Res},
     S#holder{search=Res}.
 
 search(Row, Dir, Re, Table) ->
     Res = try lists:nth(Row+1, Table) of
 	      Term ->
-		  Str = io_lib:format("~w", [Term]),
+		  Str = format(Term),
 		  re:run(Str, Re)
 	  catch _:_ -> no_more
 	  end,
@@ -613,9 +627,9 @@ search(Row, Dir, Re, Table) ->
 get_row(From, Row, Col, Table) ->
     case lists:nth(Row+1, Table) of
 	[Object|_] when Col =:= all ->
-	    From ! {self(), io_lib:format("~w", [Object])};
+	    From ! {self(), format(Object)};
 	[Object|_] when tuple_size(Object) >= Col ->
-	    From ! {self(), io_lib:format("~w", [element(Col, Object)])};
+	    From ! {self(), format(element(Col, Object))};
 	_ ->
 	    From ! {self(), ""}
     end.
@@ -724,3 +738,58 @@ key_pos(Node, ets, TabId) ->
     KeyPos = rpc:call(Node, ets, info, [TabId, keypos]),
     is_integer(KeyPos) orelse throw(node_or_table_down),
     KeyPos.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+format(Tuple) when is_tuple(Tuple) ->
+    [${ |format_tuple(Tuple, 1, tuple_size(Tuple))];
+format(List) when is_list(List) ->
+    format_list(List);
+format(Bin) when is_binary(Bin), byte_size(Bin) > 100 ->
+    io_lib:format("<<#Bin:~w>>", [byte_size(Bin)]);
+format(Float) when is_float(Float) ->
+    io_lib:format("~.3g", [Float]);
+format(Term) ->
+    io_lib:format("~w", [Term]).
+
+format_tuple(Tuple, I, Max) when I < Max ->
+    [format(element(I, Tuple)), $,|format_tuple(Tuple, I+1, Max)];
+format_tuple(Tuple, Max, Max) ->
+    [format(element(Max, Tuple)), $}];
+format_tuple(_Tuple, 1, 0) ->
+    [$}].
+
+format_list([]) -> "[]";
+format_list(List) ->
+    case printable_list(List) of
+	true ->  io_lib:format("\"~ts\"", [List]);
+	false -> [$[ | make_list(List)]
+    end.
+
+make_list([Last]) ->
+    [format(Last), $]];
+make_list([Head|Tail]) ->
+    [format(Head), $,|make_list(Tail)].
+
+%% printable_list([Char]) -> bool()
+%%  Return true if CharList is a list of printable characters, else
+%%  false.
+
+printable_list([C|Cs]) when is_integer(C), C >= $ , C =< 255 ->
+    printable_list(Cs);
+printable_list([$\n|Cs]) ->
+    printable_list(Cs);
+printable_list([$\r|Cs]) ->
+    printable_list(Cs);
+printable_list([$\t|Cs]) ->
+    printable_list(Cs);
+printable_list([$\v|Cs]) ->
+    printable_list(Cs);
+printable_list([$\b|Cs]) ->
+    printable_list(Cs);
+printable_list([$\f|Cs]) ->
+    printable_list(Cs);
+printable_list([$\e|Cs]) ->
+    printable_list(Cs);
+printable_list([]) -> true;
+printable_list(_Other) -> false.	     %Everything else is false
diff --git a/lib/observer/src/observer_tv_wx.erl b/lib/observer/src/observer_tv_wx.erl
index ad3e8c14ab..b276965f83 100644
--- a/lib/observer/src/observer_tv_wx.erl
+++ b/lib/observer/src/observer_tv_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. 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
@@ -313,7 +313,7 @@ display_table_info(Parent0, Node, Source, Table) ->
 
 list_to_strings([]) -> "None";
 list_to_strings([A]) -> integer_to_list(A);
-list_to_strings([A,B]) ->
+list_to_strings([A|B]) ->
     integer_to_list(A) ++ " ," ++ list_to_strings(B).
 
 handle_error(Foo) ->