File 1045-observer-runtime_tools-Cleanup.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1045-observer-runtime_tools-Cleanup.patch of Package erlang (Revision e347808e4911fc349bf725ab1944c053)

Currently displaying revision e347808e4911fc349bf725ab1944c053 , Show latest

From 8ee16af3b7762666df5b1e32142fdc732d59475f Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 6 May 2021 16:58:31 +0200
Subject: [PATCH 05/17] [observer,runtime_tools] Cleanup

OTP-17346
---
 lib/observer/src/observer_lib.erl          |  26 ++---
 lib/observer/src/observer_sock_wx.erl      | 115 ++-------------------
 lib/observer/src/observer_wx.erl           |  51 ++-------
 lib/observer/test/observer_socket_test.erl |   4 +-
 lib/runtime_tools/src/observer_backend.erl |  16 ++-
 5 files changed, 33 insertions(+), 179 deletions(-)

diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index c2cc61af86..b5ffec9a73 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -148,26 +148,16 @@ display_info(Frame, Info) ->
     {Panel, Sizer, InfoFs}.
 
 display_info(Panel, Sizer, Info) ->
-    d("display_info -> entry with"
-      "~n   Panel: ~p"
-      "~n   Sizer: ~p"
-      "~n   Info:  ~p", [Panel, Sizer, Info]),
     wxSizer:addSpacer(Sizer, 5),
     Add = fun(BoxInfo) ->
-		  d("display_info:add -> entry with"
-		    "~n   BoxInfo:  ~p", [BoxInfo]),
 		  case create_box(Panel, BoxInfo) of
 		      {Box, InfoFs} ->
-			  d("display_info:add -> box created"
-			    "~n   Box:    ~p"
-			    "~n   InfoFs: ~p", [Box, InfoFs]),
 			  wxSizer:add(Sizer, Box,
 				      [{flag, ?wxEXPAND bor ?wxALL},
 				       {border, 5}]),
 			  wxSizer:addSpacer(Sizer, 5),
 			  InfoFs;
 		      undefined ->
-			  d("display_info:add -> box *not* created"),
 			  []
 		  end
 	  end,
@@ -918,15 +908,15 @@ make_obsbin(Bin,Tab) ->
     ['#OBSBin',Preview,PreviewBitSize,Size,Hash].
 
 
-d(F) ->
-    d(F, []).
+%% d(F) ->
+%%     d(F, []).
 
-d(F, A) ->
-    d(get(debug), F, A).
+%% d(F, A) ->
+%%     d(get(debug), F, A).
 
-d(true, F, A) ->
-    io:format("[ol] " ++ F ++ "~n", A);
-d(_, _, _) ->
-    ok.
+%% d(true, F, A) ->
+%%     io:format("[ol] " ++ F ++ "~n", A);
+%% d(_, _, _) ->
+%%     ok.
 
 
diff --git a/lib/observer/src/observer_sock_wx.erl b/lib/observer/src/observer_sock_wx.erl
index c1cb161a8a..4db42ba3e4 100644
--- a/lib/observer/src/observer_sock_wx.erl
+++ b/lib/observer/src/observer_sock_wx.erl
@@ -127,21 +127,13 @@ update_gen_socket_info(#state{node = _}) ->
 %% 2) Second part is a list (grid) och each socket and info about it
 init([Notebook, Parent, Config]) ->
     %% put(debug, true),
-    d("init -> entry with"
-      "~n      Notebook: ~p"
-      "~n      Parent:   ~p"
-      "~n      Config:   ~p", [Notebook, Parent, Config]),
     try
 	begin
 	    do_init(Notebook, Parent, Config, observer_backend:socket_info())
 	end
     catch
-	C:E:S ->
+	_C:_E:_S ->
 	    %% Current node does not support socket (windows?)
-	    d("init -> catched: "
-	      "~n   C: ~p"
-	      "~n   E: ~p"
-	      "~n   S: ~p", [C, E, S]),
 	    do_init(Notebook, Parent, Config, [])
     end.
 
@@ -208,14 +200,12 @@ handle_event(#wx{id=?ID_REFRESH},
 	     State = #state{node = Node,
 			    grid = Grid,
 			    opt  = Opt} = State) ->
-    d("handle_event(wx refresh) -> entry"),
     _ = update_gen_socket_info(State),
     Sockets0 = get_sockets(Node),
     Sockets  = update_grid(Grid, sel(State), Opt, Sockets0),
     {noreply, State#state{sockets = Sockets}};
 
 handle_event(#wx{obj=Obj, event=#wxClose{}}, #state{open_wins=Opened} = State) ->
-    d("handle_event(wx close) -> entry"),
     NewOpened =
 	case lists:keytake(Obj,2,Opened) of
 	    false -> Opened;
@@ -226,7 +216,6 @@ handle_event(#wx{obj=Obj, event=#wxClose{}}, #state{open_wins=Opened} = State) -
 handle_event(#wx{event=#wxList{type=command_list_col_click, col=Col}},
 	     State = #state{node=Node, grid=Grid,
 			    opt=Opt0=#opt{sort_key=Key, sort_incr=Bool}}) ->
-    d("handle_event(wx list cmd-list-col-click) -> entry"),
     Opt = case Col+2 of
 	      Key -> Opt0#opt{sort_incr=not Bool};
 	      NewKey -> Opt0#opt{sort_key=NewKey}
@@ -237,7 +226,6 @@ handle_event(#wx{event=#wxList{type=command_list_col_click, col=Col}},
     {noreply, State#state{opt = Opt, sockets = Sockets}};
 
 handle_event(#wx{event=#wxSize{size={W,_}}},  State=#state{grid=Grid}) ->
-    d("handle_event(wx size) -> entry"),
     observer_lib:set_listctrl_col_size(Grid, W),
     {noreply, State};
 
@@ -246,7 +234,6 @@ handle_event(#wx{event = #wxList{type      = command_list_item_activated,
 	     State = #state{grid      = Grid,
 			    sockets   = Sockets,
 			    open_wins = Opened}) ->
-    d("handle_event(wx list cmd-list-item-activated) -> entry"),
     Socket    = lists:nth(Index+1, Sockets),
     NewOpened = display_socket_info(Grid, Socket, Opened),
     {noreply, State#state{open_wins = NewOpened}};
@@ -254,7 +241,6 @@ handle_event(#wx{event = #wxList{type      = command_list_item_activated,
 handle_event(#wx{event = #wxList{type      = command_list_item_right_click,
 				 itemIndex = Index}},
 	     State = #state{panel = Panel, sockets=Sockets}) ->
-    d("handle_event(wx list cmd-list-item-right-clock) -> entry"),
     case Index of
 	-1 ->
 	    {noreply, State};
@@ -277,7 +263,6 @@ handle_event(#wx{id = ?ID_SOCKET_INFO},
 	     State = #state{grid                 = Grid,
 			    right_clicked_socket = Socket,
 			    open_wins            = Opened}) ->
-    d("handle_event(wx socket info) -> entry"),
     case Socket of
 	undefined ->
 	    {noreply, State};
@@ -291,7 +276,6 @@ handle_event(#wx{id = ?ID_SOCKET_INFO_SELECTED},
 	     State = #state{grid      = Grid,
 			    sockets   = Sockets,
 			    open_wins = Opened}) ->
-    d("handle_event(wx socket info selected) -> entry"),
     case get_selected_items(Grid, Sockets) of
 	[] ->
 	    observer_wx:create_txt_dialog(State#state.panel,
@@ -308,7 +292,6 @@ handle_event(#wx{id = ?ID_SOCKET_INFO_SELECTED},
 
 handle_event(#wx{id = ?ID_CLOSE_SOCKET},
 	     State = #state{right_clicked_socket = Socket}) ->
-    d("handle_event(wx close socket) -> entry"),
     case Socket of
 	undefined ->
 	    {noreply, State};
@@ -317,66 +300,32 @@ handle_event(#wx{id = ?ID_CLOSE_SOCKET},
 	    {noreply, State#state{right_clicked_socket = undefined}}
 	end;
 
-%% handle_event(#wx{id=?ID_TRACE_PORTS}, #state{grid=Grid, ports=Ports}=State)  ->
-%%     case get_selected_items(Grid, Ports) of
-%% 	[] ->
-%% 	    observer_wx:create_txt_dialog(State#state.panel, "No selected ports",
-%% 					  "Tracer", ?wxICON_EXCLAMATION);
-%% 	Selected ->
-%% 	    SelectedIds = [Port#port.id || Port <- Selected],
-%% 	    observer_trace_wx:add_ports(SelectedIds)
-%%     end,
-%%     {noreply,  State};
-
-%% handle_event(#wx{id=?ID_TRACE_NAMES}, #state{grid=Grid, ports=Ports}=State)  ->
-%%     case get_selected_items(Grid, Ports) of
-%% 	[] ->
-%% 	    observer_wx:create_txt_dialog(State#state.panel, "No selected ports",
-%% 					  "Tracer", ?wxICON_EXCLAMATION);
-%% 	Selected ->
-%% 	    IdsOrRegs =
-%% 		[case Port#port.name of
-%% 		     [] -> Port#port.id;
-%% 		     Name -> Name
-%% 		 end || Port <- Selected],
-%% 	    observer_trace_wx:add_ports(IdsOrRegs)
-%%     end,
-%%     {noreply,  State};
-
 handle_event(#wx{id=?ID_DEBUG_NEW, event=#wxCommand{type=command_menu_selected}}, State) ->
-    d("handle_event(wx debug new, cmd-menu-selected) -> entry"),
     observer_trace_wx:add_aockets([new_sockets]),
     {noreply,  State};
 
 handle_event(#wx{id=?ID_REFRESH_INTERVAL},
 	     State = #state{grid=Grid, timer=Timer0}) ->
-    d("handle_event(wx refresh interval) -> entry"),
     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) ->
-    d("handle_event(wx mouse left-down, more) -> entry"),
     observer_lib:add_scroll_entries(MoreEntry,More),
     {noreply, State};
 
 handle_event(#wx{event=#wxMouse{type=left_down}, userData=TargetPid}, State) ->
-    d("handle_event(wx mouse left-down) -> entry"),
     observer ! {open_link, TargetPid},
     {noreply, State};
 
 handle_event(#wx{obj=Obj, event=#wxMouse{type=enter_window}}, State) ->
-    d("handle_event(wx mouse enter-win) -> entry"),
     wxTextCtrl:setForegroundColour(Obj,{0,0,100,255}),
     {noreply, State};
 
 handle_event(#wx{obj=Obj, event=#wxMouse{type=leave_window}}, State) ->
-    d("handle_event(wx mouse leave-win) -> entry"),
     wxTextCtrl:setForegroundColour(Obj,?wxBLUE),
     {noreply, State};
 
 handle_event(Event, _State) ->
-    d("handle_event(unknown event) -> entry with"
-      "~n   Event: ~p", [Event]),
     error({unhandled_event, Event}).
 
 handle_sync_event(_Event, _Obj, _State) ->
@@ -395,14 +344,11 @@ handle_info(refresh_interval, State = #state{node    = Node,
 					     grid    = Grid,
 					     opt     = Opt,
                                              sockets = OldSockets} = State) ->
-    d("handle_info(refresh_interval) -> entry"),
     case get_sockets(Node) of
         OldSockets ->
             %% no change
             {noreply, State};
         Sockets0 ->
-	    d("handle_info(refresh_interval) -> ~w sockets",
-	      [length(Sockets0)]),
 	    _ = update_gen_socket_info(State),
             Sockets = update_grid(Grid, sel(State), Opt, Sockets0),
             {noreply, State#state{sockets = Sockets}}
@@ -413,7 +359,6 @@ handle_info({active, NodeName},
 		   grid   = Grid,
 		   opt    = Opt,
 		   timer  = Timer0} = State0) ->
-    d("handle_info({active, ~p}) -> entry", [NodeName]),
     Available = socketinfo_available(NodeName),
     Available orelse popup_unavailable_info(NodeName),
     State1   = State0#state{node = {NodeName, Available}},
@@ -481,15 +426,10 @@ get_sockets(NodeName) when is_atom(NodeName) ->
 	    [infomap_to_rec(SockInfo) || SockInfo <- SocketInfoMaps];
 	{badrpc,
 	 {'EXIT', {undef, [{observer_backend, get_socket_list, [], []}]}}} ->
-	    d("get_sockets -> No Backend"),
 	    {error, "No socket backend support"};
 	{badrpc, Error} ->
-	    d("get_sockets -> badrpc: "
-	      "~n   ~p", [Error]),
 	    {error, Error};
 	{error, _} = ERROR ->
-	    d("get_sockets -> error:"
-	      "~n   ~p", [ERROR]),
 	    ERROR
     end.
 
@@ -517,21 +457,6 @@ infomap_to_rec(#{id           := Id,
 		 wstates      := WState,
 		 monitored_by := MonitoredBy,
 		 statistics   := Statistics} = Info) ->
-    d("infomap_to_rec -> entry with"
-      "~n   Id:          ~p"
-      "~n   IsStr:       ~p"
-      "~n   Kind:        ~p"
-      "~n   FD:          ~p"
-      "~n   Owner:       ~p"
-      "~n   Domain:      ~p"
-      "~n   Type:        ~p"
-      "~n   Protocol:    ~p"
-      "~n   RState:      ~p"
-      "~n   WState:      ~p"
-      "~n   MonitoredBy: ~p"
-      "~n   Statistics:  ~p",
-      [Id, IdStr, Kind, FD, Owner, Domain, Type, Protocol, RState, WState,
-       MonitoredBy, Statistics]),
       #socket{id           = Id,
 	    id_str       = IdStr,
 	    kind         = Kind,
@@ -561,24 +486,6 @@ socketrec_to_list(#socket{id           = Id,
 			  wstate       = WState,
 			  monitored_by = MonitoredBy,
 			  statistics   = Statistics}) ->
-    d("socketrec_to_list -> entry with"
-      "~n   Id:          ~p"
-      "~n   IsStr:       ~p"
-      "~n   Kind:        ~p"
-      "~n   FD:          ~p"
-      "~n   Owner:       ~p"
-      "~n   Domain:      ~p"
-      "~n   Type:        ~p"
-      "~n   Protocol:    ~p"
-      "~n   RAddr:       ~p"
-      "~n   LAddr:       ~p"
-      "~n   RState:      ~p"
-      "~n   WState:      ~p"
-      "~n   MonitoredBy: ~p"
-      "~n   Statistics:  ~p",
-      [Id, IdStr, Kind, FD, Owner, Domain, Type, Protocol,
-       RAddr, LAddr, RState, WState,
-       MonitoredBy, Statistics]),
     [{id,           Id},
      {id_str,       IdStr},
      {kind,         Kind},
@@ -595,8 +502,6 @@ socketrec_to_list(#socket{id           = Id,
      {statistics,   Statistics}].
 
 display_socket_info(Parent, #socket{id_str = IdStr} = Sock, Opened) ->
-    d("display_socket_info -> entry with"
-      "~n   IdStr: ~p", [IdStr]),
     case lists:keyfind(IdStr, 1, Opened) of
 	false ->
 	    Frame = do_display_socket_info(Parent, Sock),
@@ -607,8 +512,6 @@ display_socket_info(Parent, #socket{id_str = IdStr} = Sock, Opened) ->
     end.
 
 do_display_socket_info(Parent0, #socket{id_str = IdStr} = SocketRec) ->
-    d("do_display_socket_info -> entry with"
-      "~n   IdStr: ~p", [IdStr]),
     Parent = observer_lib:get_wx_parent(Parent0),
     Title = "Socket Info: " ++ IdStr,
     Scale = observer_wx:get_scale(),
@@ -802,15 +705,15 @@ popup_unavailable_info(NodeName) ->
 f(F, A) ->
     lists:flatten(io_lib:format(F, A)).
 
-d(F) ->
-    d(F, []).
+%% d(F) ->
+%%     d(F, []).
 
-d(F, A) ->
-    d(get(debug), F, A).
+%% d(F, A) ->
+%%     d(get(debug), F, A).
 
-d(true, F, A) ->
-    io:format("[oswx] " ++ F ++ "~n", A);
-d(_, _, _) ->
-    ok.
+%% d(true, F, A) ->
+%%     io:format("[oswx] " ++ F ++ "~n", A);
+%% d(_, _, _) ->
+%%     ok.
 
 
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index b61532f5b0..3b10b6bd57 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -123,30 +123,23 @@ init(_Args) ->
 
 setup(#state{frame = Frame} = State) ->
     %% Setup Menubar & Menus
-    d("setup -> load-config"),
     Config = load_config(),
     Cnf = fun(Who) ->
                   proplists:get_value(Who, Config, #{})
           end,
-    d("setup -> create menu-bar"),
     MenuBar = wxMenuBar:new(),
 
-    d("setup -> get nodes"),
     {Nodes, NodeMenus} = get_nodes(),
     DefMenus = default_menus(NodeMenus),
-    d("setup -> create menus"),
     observer_lib:create_menus(DefMenus, MenuBar, default),
 
-    d("setup -> set menu-bar"),
     wxFrame:setMenuBar(Frame, MenuBar),
 
     %% Setup panels
-    d("setup -> panel setup"),
     Panel = wxPanel:new(Frame, []),
     Notebook = wxNotebook:new(Panel, ?ID_NOTEBOOK, [{style, ?wxBK_DEFAULT}]),
 
     %% System Panel
-    d("setup -> create system panel"),
     SysPanel = observer_sys_wx:start_link(Notebook, self(), Cnf(sys_panel)),
     wxNotebook:addPage(Notebook, SysPanel, "System", []),
 
@@ -175,71 +168,44 @@ setup(#state{frame = Frame} = State) ->
     %% the window size
 
     %% Perf Viewer Panel
-    d("setup -> create perf panel"),
     PerfPanel = observer_perf_wx:start_link(Notebook, self(), Cnf(perf_panel)),
     wxNotebook:addPage(Notebook, PerfPanel, "Load Charts", []),
 
     %% Memory Allocator Viewer Panel
-    d("setup -> create memory panel"),
     AllcPanel = observer_alloc_wx:start_link(Notebook, self(), Cnf(allc_panel)),
     wxNotebook:addPage(Notebook, AllcPanel, ?ALLOC_STR, []),
 
     %% App Viewer Panel
-    d("setup -> create app panel"),
     AppPanel = observer_app_wx:start_link(Notebook, self(), Cnf(app_panel)),
     wxNotebook:addPage(Notebook, AppPanel, "Applications", []),
 
     %% Process Panel
-    d("setup -> create process panel"),
     ProPanel = observer_pro_wx:start_link(Notebook, self(), Cnf(pro_panel)),
     wxNotebook:addPage(Notebook, ProPanel, "Processes", []),
 
     %% Port Panel
-    d("setup -> create port panel"),
     PortPanel = observer_port_wx:start_link(Notebook, self(), Cnf(port_panel)),
     wxNotebook:addPage(Notebook, PortPanel, "Ports", []),
 
     %% Socket Panel
-    %% Note that this panel should *only* be added if we have support for socket
-    %% Also, if we run on/with an "old" node (without this support),
-    %% we should also not include this!
-    %% SockPanel =
-    %% 	try socket:supports() of
-    %% 	    _ ->
-    %% 		d("setup -> create socket panel"),
-    %% 		SP = observer_sock_wx:start_link(Notebook,
-    %% 						 self(),
-    %% 						 Cnf(sock_panel)),
-    %% 		wxNotebook:addPage(Notebook, SP, "Sockets", []),
-    %% 		SP
-    %% 	catch
-    %% 	    _:_:_ ->
-    %% 		undefined
-    %% 	end,
-    d("setup -> create socket panel"),
     SockPanel = observer_sock_wx:start_link(Notebook,
 					    self(),
 					    Cnf(sock_panel)),
     wxNotebook:addPage(Notebook, SockPanel, "Sockets", []),
 
     %% Table Viewer Panel
-    d("setup -> create table panel"),
     TVPanel = observer_tv_wx:start_link(Notebook, self(), Cnf(tv_panel)),
     wxNotebook:addPage(Notebook, TVPanel, "Table Viewer", []),
 
     %% Trace Viewer Panel
-    d("setup -> create trace panel"),
     TracePanel = observer_trace_wx:start_link(Notebook, self(), Cnf(trace_panel)),
     wxNotebook:addPage(Notebook, TracePanel, ?TRACE_STR, []),
 
     %% Force redraw (windows needs it)
-    d("setup -> refresh"),
     wxWindow:refresh(Panel),
     DoFreeze andalso wxWindow:thaw(Panel),
 
-    d("setup -> frame: raise"),
     wxFrame:raise(Frame),
-    d("setup -> frame: set focus"),
     wxFrame:setFocus(Frame),
 
     SysPid = wx_object:get_pid(SysPanel),
@@ -280,7 +246,6 @@ setup(#state{frame = Frame} = State) ->
 		    wxFont:new(SysFontSize, ?wxFONTFAMILY_MODERN, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL)
 	    end,
     put({font, fixed}, Fixed),
-    d("setup -> done"),
     UpdState.
 
 
@@ -878,15 +843,15 @@ is_rb_server_running(Node, LogState) ->
    end.
 
 
-d(F) ->
-    d(F, []).
+%% d(F) ->
+%%     d(F, []).
 
-d(F, A) ->
-    d(get(debug), F, A).
+%% d(F, A) ->
+%%     d(get(debug), F, A).
 
-d(true, F, A) ->
-    io:format("[owx] " ++ F ++ "~n", A);
-d(_, _, _) ->
-    ok.
+%% d(true, F, A) ->
+%%     io:format("[owx] " ++ F ++ "~n", A);
+%% d(_, _, _) ->
+%%     ok.
 
 
diff --git a/lib/observer/test/observer_socket_test.erl b/lib/observer/test/observer_socket_test.erl
index fabeada576..67ab2e6d07 100644
--- a/lib/observer/test/observer_socket_test.erl
+++ b/lib/observer/test/observer_socket_test.erl
@@ -19,9 +19,9 @@
 %%
 
 %% =======================================================================
-%% This is just a simple utility that sets of several socket connections
+%% This is just a simple utility that sets op several socket connections
 %% and monitors. Data is exchanged.
-%% This done to make it possible to see that the socket sections of
+%% This is done to make it possible to see that the socket sections of
 %% observer works.
 %% =======================================================================
 
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 871bfc54da..c7643958be 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -225,8 +225,6 @@ get_socket_list() ->
 			 -1
 		 end,
 	 Info0  = socket:info(S),
-	 d("get_socket_list -> info: "
-	   "~n   ~p", [Info0]),
 	 IdStr0 = socket:to_list(S),
 	 IdStr  = case Info0 of
 		      #{type     := stream,
@@ -239,8 +237,6 @@ get_socket_list() ->
 		  end,
 	 {Counters0, Info1} = maps:take(counters, Info0),
 	 Counters = maps:to_list(Counters0),
-	 d("get_socket_list -> Counters: "
-	   "~n   ~p", [Counters]),
 	 Info2 = maps:remove(ctype,         Info1),
 	 Info3 = maps:remove(num_acceptors, Info2),
 	 Info4 = maps:remove(num_readers,   Info3),
@@ -882,12 +878,12 @@ f(F, A) ->
 %% d(F) ->
 %%     d(F, []).
 
-d(F, A) ->
-    d(get(debug), F, A).
+%% d(F, A) ->
+%%     d(get(debug), F, A).
 
-d(true, F, A) ->
-    io:format("[ob] " ++ F ++ "~n", A);
-d(_, _, _) ->
-    ok.
+%% d(true, F, A) ->
+%%     io:format("[ob] " ++ F ++ "~n", A);
+%% d(_, _, _) ->
+%%     ok.
 
 
-- 
2.26.2

Places

File 1045-observer-runtime_tools-Cleanup.patch of Package erlang (Revision e347808e4911fc349bf725ab1944c053)

Places