Merge branch 'siri/cdv/many-links/OTP-14725' into maint

* siri/cdv/many-links/OTP-14725:
  [observer] Improve performance for many links or monitors

7 files changed, 133 insertions, 92 deletions

diff --git a/lib/observer/src/cdv_detail_wx.erl b/lib/observer/src/cdv_detail_wx.erl
index f6d282638a..6c4739042b 100644
--- a/lib/observer/src/cdv_detail_wx.erl
+++ b/lib/observer/src/cdv_detail_wx.erl
@@ -48,6 +48,7 @@ init([Id, Data, ParentFrame, Callback, App, Parent]) ->
     display_progress(ParentFrame,App),
     case Callback:get_details(Id, Data) of
 	{ok,Details} ->
+            display_progress_pulse(Callback,Id),
 	    init(Id,ParentFrame,Callback,App,Parent,Details);
 	{yes_no, Info, Fun} ->
             destroy_progress(App),
@@ -69,8 +70,16 @@ display_progress(ParentFrame,cdv) ->
                                          "Reading data");
 display_progress(_,_) ->
     ok.
+
+%% Display pulse while creating process detail page with much data
+display_progress_pulse(cdv_proc_cb,Pid) ->
+    observer_lib:report_progress({ok,"Displaying data for "++Pid}),
+    observer_lib:report_progress({ok,start_pulse});
+display_progress_pulse(_,_) ->
+    ok.
+
 destroy_progress(cdv) ->
-    observer_lib:destroy_progress_dialog();
+    observer_lib:sync_destroy_progress_dialog();
 destroy_progress(_) ->
     ok.
 
diff --git a/lib/observer/src/cdv_info_wx.erl b/lib/observer/src/cdv_info_wx.erl
index 7e416dd11a..07c28610e2 100644
--- a/lib/observer/src/cdv_info_wx.erl
+++ b/lib/observer/src/cdv_info_wx.erl
@@ -95,6 +95,10 @@ handle_cast(Msg, State) ->
     io:format("~p~p: Unhandled cast ~tp~n",[?MODULE, ?LINE, Msg]),
     {noreply, State}.
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down},userData=Target}, State) ->
     cdv_virtual_list_wx:start_detail_win(Target),
     {noreply, State};
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index c100e8d057..861b592439 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -1240,7 +1240,7 @@ all_procinfo(Fd,Fun,Proc,WS,LineHead) ->
 	"Last calls" ->
 	    get_procinfo(Fd,Fun,Proc#proc{last_calls=get_last_calls(Fd)},WS);
 	"Link list" ->
-	    {Links,Monitors,MonitoredBy} = parse_link_list(bytes(Fd),[],[],[]),
+	    {Links,Monitors,MonitoredBy} = get_link_list(Fd),
 	    get_procinfo(Fd,Fun,Proc#proc{links=Links,
 					  monitors=Monitors,
 					  mon_by=MonitoredBy},WS);
@@ -1322,86 +1322,64 @@ get_last_calls(Fd,<<>>,Acc,Lines) ->
 	    lists:reverse(Lines,[byte_list_to_string(lists:reverse(Acc))])
     end.
 
-parse_link_list([SB|Str],Links,Monitors,MonitoredBy) when SB==$[; SB==$] ->
-    parse_link_list(Str,Links,Monitors,MonitoredBy);
-parse_link_list("#Port"++_=Str,Links,Monitors,MonitoredBy) ->
-    {Link,Rest} = parse_port(Str),
-    parse_link_list(Rest,[Link|Links],Monitors,MonitoredBy);
-parse_link_list("<"++_=Str,Links,Monitors,MonitoredBy) ->
-    {Link,Rest} = parse_pid(Str),
-    parse_link_list(Rest,[Link|Links],Monitors,MonitoredBy);
-parse_link_list("{to,"++Str,Links,Monitors,MonitoredBy) ->
-    {Mon,Rest} = parse_monitor(Str),
-    parse_link_list(Rest,Links,[Mon|Monitors],MonitoredBy);
-parse_link_list("{from,"++Str,Links,Monitors,MonitoredBy) ->
-    {Mon,Rest} = parse_monitor(Str),
-    parse_link_list(Rest,Links,Monitors,[Mon|MonitoredBy]);
-parse_link_list(", "++Rest,Links,Monitors,MonitoredBy) ->
-    parse_link_list(Rest,Links,Monitors,MonitoredBy);
-parse_link_list([],Links,Monitors,MonitoredBy) ->
-    {lists:reverse(Links),lists:reverse(Monitors),lists:reverse(MonitoredBy)};
-parse_link_list(Unexpected,Links,Monitors,MonitoredBy) ->
-    io:format("WARNING: found unexpected data in link list:~n~ts~n",[Unexpected]),
-    parse_link_list([],Links,Monitors,MonitoredBy).
-
-
-parse_port(Str) ->
-    {Port,Rest} = parse_link(Str,[]),
-    {{Port,Port},Rest}.
-
-parse_pid(Str) ->
-    {Pid,Rest} = parse_link(Str,[]),
-    {{Pid,Pid},Rest}.
-
-parse_monitor("{"++Str) ->
-    %% Named process
-    {Name,Node,Rest1} = parse_name_node(Str,[]),
-    Pid = get_pid_from_name(Name,Node),
-    case parse_link(string:strip(Rest1,left,$,),[]) of
-	{Ref,"}"++Rest2} ->
-	    %% Bug in break.c - prints an extra "}" for remote
-	    %% nodes... thus the strip
-	    {{Pid,"{"++Name++","++Node++"} ("++Ref++")"},
-	     string:strip(Rest2,left,$})};
-	{Ref,[]} ->
-	    {{Pid,"{"++Name++","++Node++"} ("++Ref++")"},[]}
-    end;
-parse_monitor(Str) ->
-    case parse_link(Str,[]) of
-	{Pid,","++Rest1} ->
-	    case parse_link(Rest1,[]) of
-		{Ref,"}"++Rest2} ->
-		    {{Pid,Pid++" ("++Ref++")"},Rest2};
-		{Ref,[]} ->
-		    {{Pid,Pid++" ("++Ref++")"},[]}
-	    end;
-	{Pid,[]} ->
-	    {{Pid,Pid++" (unknown_ref)"},[]}
+get_link_list(Fd) ->
+    case get_chunk(Fd) of
+	{ok,<<"[",Bin/binary>>} ->
+            #{links:=Links,
+              mons:=Monitors,
+              mon_by:=MonitoredBy} =
+                get_link_list(Fd,Bin,#{links=>[],mons=>[],mon_by=>[]}),
+            {lists:reverse(Links),
+             lists:reverse(Monitors),
+             lists:reverse(MonitoredBy)};
+        eof ->
+            {[],[],[]}
     end.
 
-parse_link(">"++Rest,Acc) ->
-    {lists:reverse(Acc,">"),Rest};
-parse_link([H|T],Acc) ->
-    parse_link(T,[H|Acc]);
-parse_link([],Acc) ->
-    %% truncated
-    {lists:reverse(Acc),[]}.
+get_link_list(Fd,<<NL:8,_/binary>>=Bin,Acc) when NL=:=$\r; NL=:=$\n->
+    skip(Fd,Bin),
+    Acc;
+get_link_list(Fd,Bin,Acc) ->
+    case binary:split(Bin,[<<", ">>,<<"]">>]) of
+        [Link,Rest] ->
+            get_link_list(Fd,Rest,get_link(Link,Acc));
+        [Incomplete] ->
+            case get_chunk(Fd) of
+                {ok,More} ->
+                    get_link_list(Fd,<<Incomplete/binary,More/binary>>,Acc);
+                eof ->
+                    Acc
+            end
+    end.
 
-parse_name_node(","++Rest,Name) ->
-    parse_name_node(Rest,Name,[]);
-parse_name_node([H|T],Name) ->
-    parse_name_node(T,[H|Name]);
-parse_name_node([],Name) ->
-    %% truncated
-    {lists:reverse(Name),[],[]}.
-
-parse_name_node("}"++Rest,Name,Node) ->
-    {lists:reverse(Name),lists:reverse(Node),Rest};
-parse_name_node([H|T],Name,Node) ->
-    parse_name_node(T,Name,[H|Node]);
-parse_name_node([],Name,Node) ->
-    %% truncated
-    {lists:reverse(Name),lists:reverse(Node),[]}.
+get_link(<<"#Port",_/binary>>=PortBin,#{links:=Links}=Acc) ->
+    PortStr = binary_to_list(PortBin),
+    Acc#{links=>[{PortStr,PortStr}|Links]};
+get_link(<<"<",_/binary>>=PidBin,#{links:=Links}=Acc) ->
+    PidStr = binary_to_list(PidBin),
+    Acc#{links=>[{PidStr,PidStr}|Links]};
+get_link(<<"{to,",Bin/binary>>,#{mons:=Monitors}=Acc) ->
+    Acc#{mons=>[parse_monitor(Bin)|Monitors]};
+get_link(<<"{from,",Bin/binary>>,#{mon_by:=MonitoredBy}=Acc) ->
+    Acc#{mon_by=>[parse_monitor(Bin)|MonitoredBy]};
+get_link(Unexpected,Acc) ->
+    io:format("WARNING: found unexpected data in link list:~n~ts~n",[Unexpected]),
+    Acc.
+
+parse_monitor(MonBin) ->
+    case binary:split(MonBin,[<<",">>,<<"{">>,<<"}">>],[global]) of
+        [PidBin,RefBin,<<>>] ->
+            PidStr = binary_to_list(PidBin),
+            RefStr = binary_to_list(RefBin),
+            {PidStr,PidStr++" ("++RefStr++")"};
+        [<<>>,NameBin,NodeBin,<<>>,RefBin,<<>>] ->
+            %% Named process
+            NameStr = binary_to_list(NameBin),
+            NodeStr = binary_to_list(NodeBin),
+            PidStr = get_pid_from_name(NameStr,NodeStr),
+            RefStr = binary_to_list(RefBin),
+            {PidStr,"{"++NameStr++","++NodeStr++"} ("++RefStr++")"}
+    end.
 
 get_pid_from_name(Name,Node) ->
     case ets:lookup(cdv_reg_proc_table,cdv_dump_node_name) of
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 94d199e688..0470e785d9 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -21,7 +21,8 @@
 
 -export([get_wx_parent/1,
 	 display_info_dialog/2, display_yes_no_dialog/1,
-	 display_progress_dialog/3, destroy_progress_dialog/0,
+	 display_progress_dialog/3,
+         destroy_progress_dialog/0, sync_destroy_progress_dialog/0,
 	 wait_for_progress/0, report_progress/1,
 	 user_term/3, user_term_multiline/3,
 	 interval_dialog/4, start_timer/1, start_timer/2, stop_timer/1, timer_config/1,
@@ -31,7 +32,8 @@
 	 set_listctrl_col_size/2,
 	 create_status_bar/1,
 	 html_window/1, html_window/2,
-         make_obsbin/2
+         make_obsbin/2,
+         add_scroll_entries/2
 	]).
 
 -include_lib("wx/include/wx.hrl").
@@ -40,6 +42,8 @@
 -define(SINGLE_LINE_STYLE, ?wxBORDER_NONE bor ?wxTE_READONLY bor ?wxTE_RICH2).
 -define(MULTI_LINE_STYLE, ?SINGLE_LINE_STYLE bor ?wxTE_MULTILINE).
 
+-define(NUM_SCROLL_ITEMS,8).
+
 -define(pulse_timeout,50).
 
 get_wx_parent(Window) ->
@@ -397,17 +401,18 @@ get_box_info({Title, left, List}) -> {Title, ?wxALIGN_LEFT, List};
 get_box_info({Title, right, List}) -> {Title, ?wxALIGN_RIGHT, List}.
 
 add_box(Panel, OuterBox, Cursor, Title, Proportion, {Format, List}) ->
-    Box = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, Title}]),
+    NumStr = " ("++integer_to_list(length(List))++")",
+    Box = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, Title ++ NumStr}]),
     Scroll = wxScrolledWindow:new(Panel),
     wxScrolledWindow:enableScrolling(Scroll,true,true),
     wxScrolledWindow:setScrollbars(Scroll,1,1,0,0),
     ScrollSizer  = wxBoxSizer:new(?wxVERTICAL),
     wxScrolledWindow:setSizer(Scroll, ScrollSizer),
     wxWindow:setBackgroundStyle(Scroll, ?wxBG_STYLE_SYSTEM),
-    add_entries(Format, List, Scroll, ScrollSizer, Cursor),
+    Entries = add_entries(Format, List, Scroll, ScrollSizer, Cursor),
     wxSizer:add(Box,Scroll,[{proportion,1},{flag,?wxEXPAND}]),
     wxSizer:add(OuterBox,Box,[{proportion,Proportion},{flag,?wxEXPAND}]),
-    {Scroll,ScrollSizer,length(List)}.
+    {Scroll,ScrollSizer,length(Entries)}.
 
 add_entries(click, List, Scroll, ScrollSizer, Cursor) ->
     Add = fun(Link) ->
@@ -415,7 +420,20 @@ add_entries(click, List, Scroll, ScrollSizer, Cursor) ->
                   wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
 		  wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}])
 	  end,
-    [Add(Link) || Link <- List];
+    if length(List) > ?NUM_SCROLL_ITEMS ->
+            {List1,Rest} = lists:split(?NUM_SCROLL_ITEMS,List),
+            LinkEntries = [Add(Link) || Link <- List1],
+            NStr = integer_to_list(length(Rest)),
+            TC = link_entry2(Scroll,
+                             {{more,{Rest,Scroll,ScrollSizer}},"more..."},
+                             Cursor,
+                             "Click to see " ++ NStr ++ " more entries"),
+            wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
+            E = wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}]),
+            LinkEntries ++ [E];
+       true ->
+            [Add(Link) || Link <- List]
+    end;
 add_entries(plain, List, Scroll, ScrollSizer, _) ->
     Add = fun(String) ->
 		  TC = wxStaticText:new(Scroll, ?wxID_ANY, String),
@@ -423,6 +441,23 @@ add_entries(plain, List, Scroll, ScrollSizer, _) ->
 	  end,
     [Add(String) || String <- List].
 
+add_scroll_entries(MoreEntry,{List, Scroll, ScrollSizer}) ->
+    wx:batch(
+      fun() ->
+              wxSizer:remove(ScrollSizer,?NUM_SCROLL_ITEMS),
+              wxStaticText:destroy(MoreEntry),
+              Cursor = wxCursor:new(?wxCURSOR_HAND),
+              Add = fun(Link) ->
+                            TC = link_entry(Scroll, Link, Cursor),
+                            wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
+                            wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}])
+                    end,
+              Entries = [Add(Link) || Link <- List],
+              wxCursor:destroy(Cursor),
+              wxSizer:layout(ScrollSizer),
+              wxSizer:setVirtualSizeHints(ScrollSizer,Scroll),
+              Entries
+      end).
 
 create_box(_Panel, {scroll_boxes,[]}) ->
     undefined;
@@ -449,7 +484,7 @@ create_box(Panel, {scroll_boxes,Data}) ->
     {_,H} = wxWindow:getSize(Dummy),
     wxTextCtrl:destroy(Dummy),
 
-    MaxH = if MaxL > 8 -> 8*H;
+    MaxH = if MaxL > ?NUM_SCROLL_ITEMS -> ?NUM_SCROLL_ITEMS*H;
 	      true -> MaxL*H
 	   end,
     [wxWindow:setMinSize(B,{0,MaxH}) || {B,_,_} <- Boxes],
@@ -504,20 +539,22 @@ create_box(Parent, Data) ->
 
 link_entry(Panel, Link) ->
     Cursor = wxCursor:new(?wxCURSOR_HAND),
-    TC = link_entry2(Panel, to_link(Link), Cursor),
+    TC = link_entry(Panel, Link, Cursor),
     wxCursor:destroy(Cursor),
     TC.
 link_entry(Panel, Link, Cursor) ->
-    link_entry2(Panel, to_link(Link), Cursor).
+    link_entry2(Panel,to_link(Link),Cursor).
 
 link_entry2(Panel,{Target,Str},Cursor) ->
+    link_entry2(Panel,{Target,Str},Cursor,"Click to see properties for " ++ Str).
+link_entry2(Panel,{Target,Str},Cursor,ToolTipText) ->
     TC = wxStaticText:new(Panel, ?wxID_ANY, Str),
     wxWindow:setForegroundColour(TC,?wxBLUE),
     wxWindow:setCursor(TC, Cursor),
     wxWindow:connect(TC, left_down, [{userData,Target}]),
     wxWindow:connect(TC, enter_window),
     wxWindow:connect(TC, leave_window),
-    ToolTip = wxToolTip:new("Click to see properties for " ++ Str),
+    ToolTip = wxToolTip:new(ToolTipText),
     wxWindow:setToolTip(TC, ToolTip),
     TC.
 
@@ -708,6 +745,11 @@ wait_for_progress() ->
 destroy_progress_dialog() ->
     report_progress(finish).
 
+sync_destroy_progress_dialog() ->
+    Ref = erlang:monitor(process,?progress_handler),
+    destroy_progress_dialog(),
+    receive {'DOWN',Ref,process,_,_} -> ok end.
+
 report_progress(Progress) ->
     case whereis(?progress_handler) of
 	Pid when is_pid(Pid) ->
@@ -787,9 +829,8 @@ progress_dialog_new(Parent,Title,Str) ->
                           [{style,?wxDEFAULT_DIALOG_STYLE}]),
     Panel = wxPanel:new(Dialog),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
-    Message = wxStaticText:new(Panel, 1, Str),
-    Gauge = wxGauge:new(Panel, 2, 100, [{size, {170, -1}},
-                                        {style, ?wxGA_HORIZONTAL}]),
+    Message = wxStaticText:new(Panel, 1, Str,[{size,{220,-1}}]),
+    Gauge = wxGauge:new(Panel, 2, 100, [{style, ?wxGA_HORIZONTAL}]),
     SizerFlags = ?wxEXPAND bor ?wxLEFT bor ?wxRIGHT bor ?wxTOP,
     wxSizer:add(Sizer, Message, [{flag,SizerFlags},{border,15}]),
     wxSizer:add(Sizer, Gauge, [{flag, SizerFlags bor ?wxBOTTOM},{border,15}]),
diff --git a/lib/observer/src/observer_port_wx.erl b/lib/observer/src/observer_port_wx.erl
index 5908e99e36..f7ae07fb85 100644
--- a/lib/observer/src/observer_port_wx.erl
+++ b/lib/observer/src/observer_port_wx.erl
@@ -242,6 +242,10 @@ handle_event(#wx{id=?ID_REFRESH_INTERVAL},
     Timer = observer_lib:interval_dialog(Grid, Timer0, 10, 5*60),
     {noreply, State#state{timer=Timer}};
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down}, userData=TargetPid}, State) ->
     observer ! {open_link, TargetPid},
     {noreply, State};
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index fb02ae2728..854f338a89 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -120,6 +120,10 @@ handle_event(#wx{id=?REFRESH}, #state{frame=Frame, pid=Pid, pages=Pages, expand_
     end,
     {noreply, State};
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down}, userData=TargetPid}, State) ->
     observer ! {open_link, TargetPid},
     {noreply, State};
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index bb1755f530..b5e94a893a 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -83,6 +83,7 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) ->
     link(OtherPid), % own node
     link(Pid2),     % external node
     erlang:monitor(process,OtherPid),
+    erlang:monitor(process,init), % named process
     erlang:monitor(process,Pid2),
 
     code:load_file(?MODULE),