observer: (re)store config

Store config when exiting app and restore config when starting again.

1 files changed, 42 insertions, 29 deletions

diff --git a/lib/observer/src/observer_trace_wx.erl b/lib/observer/src/observer_trace_wx.erl
index af90e2100c..247a4608d5 100644
--- a/lib/observer/src/observer_trace_wx.erl
+++ b/lib/observer/src/observer_trace_wx.erl
@@ -19,7 +19,7 @@
 
 -module(observer_trace_wx).
 
--export([start_link/2, add_processes/1, add_ports/1]).
+-export([start_link/3, add_processes/1, add_ports/1]).
 -export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
 	 handle_event/2, handle_cast/2]).
 
@@ -88,8 +88,8 @@
 
 -record(titem, {id, opts}).
 
-start_link(Notebook, ParentPid) ->
-    wx_object:start_link(?MODULE, [Notebook, ParentPid], []).
+start_link(Notebook, ParentPid, Config) ->
+    wx_object:start_link(?MODULE, [Notebook, ParentPid, Config], []).
 
 add_processes(Pids) when is_list(Pids) ->
     wx_object:cast(observer_wx:get_tracer(), {add_processes, Pids}).
@@ -99,10 +99,10 @@ add_ports(Ports) when is_list(Ports) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-init([Notebook, ParentPid]) ->
-    wx:batch(fun() -> create_window(Notebook, ParentPid) end).
+init([Notebook, ParentPid, Config]) ->
+    wx:batch(fun() -> create_window(Notebook, ParentPid, Config) end).
 
-create_window(Notebook, ParentPid) ->
+create_window(Notebook, ParentPid, Config) ->
     %% Create the window
     Panel = wxPanel:new(Notebook, [{size, wxWindow:getClientSize(Notebook)}]),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
@@ -130,11 +130,16 @@ create_window(Notebook, ParentPid) ->
     wxSizer:add(Sizer, Buttons, [{flag, ?wxLEFT bor ?wxRIGHT bor ?wxDOWN},
 				 {border, 5}, {proportion,0}]),
     wxWindow:setSizer(Panel, Sizer),
+    MS = parse_ms(maps:get(match_specs, Config, []), default_matchspecs()),
     {Panel, #state{parent=ParentPid, panel=Panel,
 		   n_view=NodeView, proc_view=ProcessView, port_view=PortView,
 		   m_view=ModView, f_view=FuncView,
 		   toggle_button = ToggleButton,
-		   match_specs=default_matchspecs()}}.
+                   output=maps:get(output, Config, []),
+                   def_proc_flags=maps:get(procflags, Config, []),
+                   def_port_flags=maps:get(portflags, Config, []),
+                   match_specs=MS
+                  }}.
 
 default_matchspecs() ->
     [{Key,default_matchspecs(Key)} || Key <- [funcs,send,'receive']].
@@ -397,27 +402,19 @@ handle_event(#wx{id=?LOG_SAVE, userData=TCtrl}, #state{panel=Panel} = State) ->
     {noreply, State};
 
 handle_event(#wx{id = ?SAVE_TRACEOPTS},
-	     #state{panel = Panel,
-		    def_proc_flags = ProcFlags,
-		    def_port_flags = PortFlags,
-		    match_specs = MatchSpecs,
-		    tpatterns = TracePatterns,
-		    output = Output
-		   } = State) ->
+	     #state{panel = Panel} = State) ->
     Dialog = wxFileDialog:new(Panel, [{style, ?wxFD_SAVE bor ?wxFD_OVERWRITE_PROMPT}]),
     case wxFileDialog:showModal(Dialog) of
 	?wxID_OK ->
 	    Path = wxFileDialog:getPath(Dialog),
-	    write_file(Panel, Path,
-		       ProcFlags, PortFlags, MatchSpecs, Output,
-		       dict:to_list(TracePatterns)
-		      );
+	    write_file(Panel, Path, get_config(State));
 	_ ->
 	    ok
     end,
     wxDialog:destroy(Dialog),
     {noreply, State};
 
+
 handle_event(#wx{id = ?LOAD_TRACEOPTS}, #state{panel = Panel} = State) ->
     Dialog = wxFileDialog:new(Panel, [{style, ?wxFD_FILE_MUST_EXIST}]),
     State2 = case wxFileDialog:showModal(Dialog) of
@@ -690,6 +687,10 @@ handle_event(#wx{id=ID, event = What}, State) ->
     {noreply, State}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+handle_call(get_config, _, State) ->
+    Config0 = get_config(State),
+    Config = lists:keydelete(trace_p, 1, Config0),
+    {reply, maps:from_list(Config), State};
 handle_call(Msg, From, _State) ->
     error({unhandled_call, Msg, From}).
 
@@ -1101,26 +1102,38 @@ ftup(Trace, Index, Size) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-write_file(Frame, Filename, ProcFlags, PortFlags, MatchSpecs, Output, TPs) ->
+get_config(#state{def_proc_flags = ProcFlags,
+                  def_port_flags = PortFlags,
+                  match_specs = MatchSpecs0,
+                  tpatterns = TracePatterns,
+                  output = Output}) ->
     MSToList = fun(#match_spec{name=Id, term=T, func=F}) ->
 		       [{name,Id},{term,T},{func,F}]
 	       end,
-    MSTermList = [{ms,Key,[MSToList(MS) || MS <- MSs]} ||
-		     {Key,MSs} <- MatchSpecs],
+    MatchSpecs = [{ms,Key,[MSToList(MS) || MS <- MSs]} ||
+		     {Key,MSs} <- MatchSpecs0],
     TPToTuple = fun(#tpattern{fa={F,A}, ms=Ms}) ->
-		       {F,A,MSToList(Ms)}
+                        {F,A,MSToList(Ms)}
 		end,
     ModuleTermList = [{tp, Module, [TPToTuple(FTP) || FTP <- FTPs]} ||
-			 {Module,FTPs} <- TPs],
-
+			 {Module,FTPs} <- dict:to_list(TracePatterns)],
+    [{procflags,ProcFlags},
+     {portflags,PortFlags},
+     {match_specs,MatchSpecs},
+     {output,Output},
+     {trace_p,ModuleTermList}].
+
+write_file(Frame, Filename, Config) ->
     Str =
 	["%%%\n%%% This file is generated by Observer\n",
 	 "%%%\n%%% DO NOT EDIT!\n%%%\n",
-	 [io_lib:format("~p.~n",[MSTerm]) || MSTerm <- MSTermList],
-	 io_lib:format("~p.~n",[{procflags,ProcFlags}]),
-	 io_lib:format("~p.~n",[{portflags,PortFlags}]),
-	 io_lib:format("~p.~n",[{output,Output}]),
-	 [io_lib:format("~p.~n",[ModuleTerm]) || ModuleTerm <- ModuleTermList]
+	 [io_lib:format("~p.~n",[MSTerm]) ||
+             MSTerm <- proplists:get_value(match_specs, Config)],
+	 io_lib:format("~p.~n",[lists:keyfind(procflags, 1, Config)]),
+	 io_lib:format("~p.~n",[lists:keyfind(portflags, 1, Config)]),
+	 io_lib:format("~p.~n",[lists:keyfind(output, 1, Config)]),
+	 [io_lib:format("~p.~n",[ModuleTerm]) ||
+             ModuleTerm <- proplists:get_value(trace_p, Config)]
 	],
 
     case file:write_file(Filename, list_to_binary(Str)) of