[logger] Change registered name of built-in handlers and use TID for mode table

2 files changed, 59 insertions, 43 deletions

diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 2b5bbe6aed..e1b1f16414 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -107,10 +107,10 @@ start_stop_handler(_Config) ->
     ok = logger:add_handler(?MODULE, logger_disk_log_h, #{}),
     {error,{already_exist,?MODULE}} =
         logger:add_handler(?MODULE, logger_disk_log_h, #{}),
-    true = is_pid(whereis(?MODULE)),
+    true = is_pid(whereis(h_proc_name())),
     ok = logger:remove_handler(?MODULE),
     timer:sleep(500),
-    undefined = whereis(?MODULE).
+    undefined = whereis(h_proc_name()).
 start_stop_handler(cleanup, _Config) ->
     logger:remove_handler(?MODULE).
 
@@ -326,7 +326,7 @@ formatter_fail(Config) ->
                 filters=>?DEFAULT_HANDLER_FILTERS([?MODULE])},
     %% no formatter!
     logger:add_handler(Name, logger_disk_log_h, HConfig),
-    Pid = whereis(Name),
+    Pid = whereis(h_proc_name(Name)),
     true = is_pid(Pid),
     #{handlers:=HC1} = logger:i(),
     H = [Id || {Id,_,_} <- HC1],
@@ -357,7 +357,7 @@ formatter_fail(Config) ->
                    5000),
 
     %% Check that handler is still alive and was never dead
-    Pid = whereis(Name),
+    Pid = whereis(h_proc_name(Name)),
     #{handlers:=HC2} = logger:i(),
     H = [Id || {Id,_,_} <- HC2],
     ok.
@@ -598,7 +598,7 @@ disk_log_wrap(Config) ->
                        Pid
                end,
     {ok,_} = dbg:tracer(process, {TraceFun, Tester}),
-    {ok,_} = dbg:p(whereis(?MODULE), [c]),
+    {ok,_} = dbg:p(whereis(h_proc_name()), [c]),
     {ok,_} = dbg:tp(logger_disk_log_h, handle_info, 2, []),
 
     Text = [34 + rand:uniform(126-34) || _ <- lists:seq(1,MaxBytes)],
@@ -652,7 +652,7 @@ disk_log_full(Config) ->
                        Pid
                end,
     {ok,_} = dbg:tracer(process, {TraceFun, Tester}),
-    {ok,_} = dbg:p(whereis(?MODULE), [c]),
+    {ok,_} = dbg:p(whereis(h_proc_name()), [c]),
     {ok,_} = dbg:tp(logger_disk_log_h, handle_info, 2, []),
 
     NoOfChars = 5,
@@ -701,10 +701,10 @@ disk_log_events(Config) ->
                        Pid
                end,
     {ok,_} = dbg:tracer(process, {TraceFun, Tester}),
-    {ok,_} = dbg:p(whereis(?MODULE), [c]),
+    {ok,_} = dbg:p(whereis(h_proc_name()), [c]),
     {ok,_} = dbg:tp(logger_disk_log_h, handle_info, 2, []),
     
-    [whereis(?MODULE) ! E || E <- Events],
+    [whereis(h_proc_name()) ! E || E <- Events],
     %% wait for trace messages
     timer:sleep(2000),
     dbg:stop_clear(),
@@ -889,7 +889,7 @@ op_switch_to_drop(Config) ->
                 [send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, info) ||
                     _ <- lists:seq(1, Bursts)],
                 Logged = count_lines(Log),
-                ok= stop_handler(?MODULE),
+                ok = stop_handler(?MODULE),
                 _ = file:delete(Log),
                 ct:pal("Number of messages dropped = ~w (~w)",
                        [Procs*NumOfReqs*Bursts-Logged,Procs*NumOfReqs*Bursts]),
@@ -1033,14 +1033,14 @@ kill_disabled(Config) ->
     Logged = count_lines(Log),
     ct:pal("Number of messages logged = ~w", [Logged]),
     ok = file:delete(Log),
-    true = is_pid(whereis(?MODULE)),
+    true = is_pid(whereis(h_proc_name())),
     ok.
 kill_disabled(cleanup, _Config) ->
     ok = stop_handler(?MODULE).
 
 qlen_kill_new(Config) ->
     {_Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
-    Pid0 = whereis(?MODULE),
+    Pid0 = whereis(h_proc_name()),
     {_,Mem0} = process_info(Pid0, memory),
     RestartAfter = ?HANDLER_RESTART_AFTER,
     NewHConfig =
@@ -1064,7 +1064,7 @@ qlen_kill_new(Config) ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
             end,
             timer:sleep(RestartAfter + 2000),
-            true = is_pid(whereis(?MODULE)),
+            true = is_pid(whereis(h_proc_name())),
             ok
     after
         5000 ->
@@ -1077,7 +1077,7 @@ qlen_kill_new(cleanup, _Config) ->
 
 mem_kill_new(Config) ->
     {_Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
-    Pid0 = whereis(?MODULE),
+    Pid0 = whereis(h_proc_name()),
     {_,Mem0} = process_info(Pid0, memory),
     RestartAfter = ?HANDLER_RESTART_AFTER,
     NewHConfig =
@@ -1101,7 +1101,7 @@ mem_kill_new(Config) ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
             end,
             timer:sleep(RestartAfter + 2000),
-            true = is_pid(whereis(?MODULE)),
+            true = is_pid(whereis(h_proc_name())),
             ok
     after
         5000 ->
@@ -1119,13 +1119,13 @@ restart_after(Config) ->
                                                handler_overloaded_qlen=>10,
                                                handler_restart_after=>never}},
     ok = logger:set_handler_config(?MODULE, NewHConfig1),
-    MRef1 = erlang:monitor(process, whereis(?MODULE)),
+    MRef1 = erlang:monitor(process, whereis(h_proc_name())),
     %% kill handler
     send_burst({n,100}, {spawn,2,0}, {chars,79}, info),
     receive
         {'DOWN', MRef1, _, _, _Info1} ->
             timer:sleep(?HANDLER_RESTART_AFTER + 1000),
-            undefined = whereis(?MODULE),
+            undefined = whereis(h_proc_name()),
             ok
     after
         5000 ->
@@ -1139,14 +1139,14 @@ restart_after(Config) ->
                                                handler_overloaded_qlen=>10,
                                                handler_restart_after=>RestartAfter}},
     ok = logger:set_handler_config(?MODULE, NewHConfig2),
-    Pid0 = whereis(?MODULE),
+    Pid0 = whereis(h_proc_name()),
     MRef2 = erlang:monitor(process, Pid0),
     %% kill handler
     send_burst({n,100}, {spawn,2,0}, {chars,79}, info),
     receive
         {'DOWN', MRef2, _, _, _Info2} ->
             timer:sleep(RestartAfter + 2000),
-            Pid1 = whereis(?MODULE),
+            Pid1 = whereis(h_proc_name()),
             true = is_pid(Pid1),
             false = (Pid1 == Pid0),
             ok
@@ -1225,14 +1225,15 @@ start_handler(Name, FuncName, Config) ->
                                                max_no_bytes => 100000000},
                               filter_default=>log,
                               filters=>?DEFAULT_HANDLER_FILTERS([Name]),
-                              formatter=>{?MODULE,op}}),
+                              formatter=>{?MODULE,op},
+                              level => info}),
     {ok,{_,HConfig = #{logger_disk_log_h := DLHConfig}}} =
         logger:get_handler_config(Name),
     {lists:concat([File,".1"]),HConfig,DLHConfig}.
     
 stop_handler(Name) ->
-    ok = logger:remove_handler(Name),
-    ct:pal("Handler ~p stopped!", [Name]).    
+    ct:pal("Stopping handler ~p!", [Name]),
+    logger:remove_handler(Name).
 
 send_burst(NorT, Type, {chars,Sz}, Class) ->
     Text = [34 + rand:uniform(126-34) || _ <- lists:seq(1,Sz)],
@@ -1331,7 +1332,7 @@ start_and_add(Name, Config, LogOpts) ->
            [Name,Config#{disk_log_opts=>LogOpts}]),
     ok = logger:add_handler(Name, logger_disk_log_h,
                             Config#{disk_log_opts=>LogOpts}),
-    Pid = whereis(Name),
+    Pid = whereis(h_proc_name(Name)),
     true = is_pid(Pid),
     Name = proplists:get_value(name, disk_log:info(Name)),
     ok.
@@ -1339,7 +1340,7 @@ start_and_add(Name, Config, LogOpts) ->
 remove_and_stop(Handler) ->
     ok = logger:remove_handler(Handler),
     timer:sleep(500),
-    undefined = whereis(Handler),
+    undefined = whereis(h_proc_name(Handler)),
     ok.
 
 try_read_file(FileName, Expected, Time) ->
@@ -1442,7 +1443,7 @@ repeat_until_ok(Fun, C, Stop, FirstReason) ->
 start_tracer(Trace,Expected) ->
     Pid = self(),
     dbg:tracer(process,{fun tracer/2,{Pid,Expected}}),
-    dbg:p(whereis(?MODULE),[c]),
+    dbg:p(h_proc_name(),[c]),
     tpl(Trace),
     ok.
 
@@ -1498,3 +1499,8 @@ escape([H|T]) ->
     [H|escape(T)];
 escape([]) ->
     [].
+
+h_proc_name() ->
+    h_proc_name(?MODULE).
+h_proc_name(Name) ->
+    list_to_atom(lists:concat([logger_disk_log_h,"_",Name])).
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index c6391e55fc..fa90be0fc8 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -170,7 +170,7 @@ add_remove_instance_file(Log, Type) ->
                               filter_default=>stop,
                               filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
                               formatter=>{?MODULE,self()}}),
-    Pid = whereis(?MODULE),
+    Pid = whereis(h_proc_name()),
     true = is_pid(Pid),
     logger:info(M1=?msg,?domain),
     ?check(M1),
@@ -178,7 +178,7 @@ add_remove_instance_file(Log, Type) ->
     try_read_file(Log, {ok,B1}, ?FILESYNC_REP_INT),
     ok = logger:remove_handler(?MODULE),
     timer:sleep(500),
-    undefined = whereis(?MODULE),
+    undefined = whereis(h_proc_name()),
     logger:info(?msg,?domain),
     ?check_no_log,
     try_read_file(Log, {ok,B1}, ?FILESYNC_REP_INT),
@@ -240,7 +240,7 @@ formatter_fail(Config) ->
                             #{logger_std_h => #{type => {file,Log}},
                               filter_default=>stop,
                               filters=>?DEFAULT_HANDLER_FILTERS([?MODULE])}),
-    Pid = whereis(?MODULE),
+    Pid = whereis(h_proc_name()),
     true = is_pid(Pid),
     #{handlers:=HC1} = logger:i(),
     H = [Id || {Id,_,_} <- HC1],
@@ -271,7 +271,7 @@ formatter_fail(Config) ->
                    5000),
 
     %% Check that handler is still alive and was never dead
-    Pid = whereis(?MODULE),
+    Pid = whereis(h_proc_name()),
     #{handlers:=HC2} = logger:i(),
     H = [Id || {Id,_,_} <- HC2],
 
@@ -354,7 +354,12 @@ crash_std_h(Config,Func,Var,Type,Log) ->
     ct:pal("Starting ~p with ~tp", [Name,Args]),
     %% Start a node which prints kernel logs to the destination specified by Type
     {ok,Node} = test_server:start_node(Name, peer, [{args, Args}]),
-    Pid = rpc:call(Node,erlang,whereis,[?STANDARD_HANDLER]),
+    HProcName =
+        case Type of
+            file -> ?name_to_reg_name(logger_std_h,?STANDARD_HANDLER);
+            disk_log -> ?name_to_reg_name(logger_disk_log_h,?STANDARD_HANDLER)
+        end,
+    Pid = rpc:call(Node,erlang,whereis,[HProcName]),
     ok = rpc:call(Node,logger,set_handler_config,[?STANDARD_HANDLER,formatter,
                                                   {?MODULE,self()}]),
     ok = log_on_remote_node(Node,"dummy1"),
@@ -367,7 +372,7 @@ crash_std_h(Config,Func,Var,Type,Log) ->
 
     %% Wait a bit, then check that it is gone
     timer:sleep(2000),
-    undefined = rpc:call(Node,erlang,whereis,[?STANDARD_HANDLER]),
+    undefined = rpc:call(Node,erlang,whereis,[HProcName]),
 
     %% Check that file is not empty
     {ok,Bin2} = sync_and_read(Node,Type,Log),
@@ -940,14 +945,14 @@ kill_disabled(Config) ->
     Logged = count_lines(Log),
     ct:pal("Number of messages logged = ~w", [Logged]),
     ok = file:delete(Log),
-    true = is_pid(whereis(?MODULE)),
+    true = is_pid(whereis(h_proc_name())),
     ok.
 kill_disabled(cleanup, _Config) ->
     ok = stop_handler(?MODULE).
 
 qlen_kill_new(Config) ->
     {_Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
-    Pid0 = whereis(?MODULE),
+    Pid0 = whereis(h_proc_name()),
     {_,Mem0} = process_info(Pid0, memory),
     RestartAfter = ?HANDLER_RESTART_AFTER,
      NewHConfig =
@@ -970,7 +975,7 @@ qlen_kill_new(Config) ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
             end,
             timer:sleep(RestartAfter + 2000),
-            true = is_pid(whereis(?MODULE)),
+            true = is_pid(whereis(h_proc_name())),
             ok
     after
         5000 ->
@@ -998,7 +1003,7 @@ qlen_kill_std(_Config) ->
 
 mem_kill_new(Config) ->
     {_Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
-    Pid0 = whereis(?MODULE),
+    Pid0 = whereis(h_proc_name()),
     {_,Mem0} = process_info(Pid0, memory),
     RestartAfter = ?HANDLER_RESTART_AFTER,
      NewHConfig =
@@ -1021,7 +1026,7 @@ mem_kill_new(Config) ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
             end,
             timer:sleep(RestartAfter * 3),
-            true = is_pid(whereis(?MODULE)),
+            true = is_pid(whereis(h_proc_name())),
             ok
     after
         5000 ->
@@ -1044,13 +1049,13 @@ restart_after(Config) ->
                                            handler_overloaded_qlen=>10,
                                            handler_restart_after=>never}},
     ok = logger:set_handler_config(?MODULE, NewHConfig1),
-    MRef1 = erlang:monitor(process, whereis(?MODULE)),
+    MRef1 = erlang:monitor(process, whereis(h_proc_name())),
     %% kill handler
     send_burst({n,100}, {spawn,2,0}, {chars,79}, info),
     receive
         {'DOWN', MRef1, _, _, _Info1} ->
             timer:sleep(?HANDLER_RESTART_AFTER + 1000),
-            undefined = whereis(?MODULE),
+            undefined = whereis(h_proc_name()),
             ok
     after
         5000 ->
@@ -1064,14 +1069,14 @@ restart_after(Config) ->
                                            handler_overloaded_qlen=>10,
                                            handler_restart_after=>RestartAfter}},
     ok = logger:set_handler_config(?MODULE, NewHConfig2),
-    Pid0 = whereis(?MODULE),
+    Pid0 = whereis(h_proc_name()),
     MRef2 = erlang:monitor(process, Pid0),
     %% kill handler
     send_burst({n,100}, {spawn,2,0}, {chars,79}, info),
     receive
         {'DOWN', MRef2, _, _, _Info2} ->
             timer:sleep(RestartAfter + 2000),
-            Pid1 = whereis(?MODULE),
+            Pid1 = whereis(h_proc_name()),
             true = is_pid(Pid1),
             false = (Pid1 == Pid0),
             ok
@@ -1286,7 +1291,7 @@ add_remove_instance_nofile(Type) ->
                               filter_default=>stop,
                               filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
                               formatter=>{?MODULE,self()}}),
-    Pid = whereis(?MODULE),
+    Pid = whereis(h_proc_name()),
     true = is_pid(Pid),
     group_leader(group_leader(),Pid), % to get printouts in test log
     logger:info(M1=?msg,?domain),
@@ -1295,7 +1300,7 @@ add_remove_instance_nofile(Type) ->
     ok = logger_std_h:sync(?MODULE),
     ok = logger:remove_handler(?MODULE),
     timer:sleep(500),
-    undefined = whereis(?MODULE),
+    undefined = whereis(h_proc_name()),
     logger:info(?msg,?domain),
     ?check_no_log,
     ok.
@@ -1379,7 +1384,7 @@ start_op_trace() ->
     TRecvPid = spawn_link(fun() -> trace_receiver(5000) end),
     {ok,_} = dbg:tracer(process, {TraceFun, TRecvPid}),
 
-    {ok,_} = dbg:p(whereis(?MODULE), [c]),
+    {ok,_} = dbg:p(whereis(h_proc_name()), [c]),
     {ok,_} = dbg:p(self(), [c]),
 
     MS1 = dbg:fun2ms(fun([_]) -> return_trace() end),
@@ -1459,7 +1464,7 @@ start_tracer(Trace,Expected) ->
     Pid = self(),
     FileCtrlPid = maps:get(file_ctrl_pid, logger_std_h:info(?MODULE)),
     dbg:tracer(process,{fun tracer/2,{Pid,Expected}}),
-    dbg:p(whereis(?MODULE),[c]),
+    dbg:p(whereis(h_proc_name()),[c]),
     dbg:p(FileCtrlPid,[c]),
     tpl(Trace),
     ok.
@@ -1525,3 +1530,8 @@ escape([H|T]) ->
     [H|escape(T)];
 escape([]) ->
     [].
+
+h_proc_name() ->
+    h_proc_name(?MODULE).
+h_proc_name(Name) ->
+    ?name_to_reg_name(logger_std_h,Name).