erts: Fix misc trace test cases

bjorng · Oct 3, 2024 · 4e1d8f5 · 4e1d8f5
1 parent 7c44844
commit 4e1d8f5
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 31 deletions.
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
@@ -65,7 +65,7 @@ testcases() ->
      exception_nocatch, bit_syntax, errors, on_load].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
@@ -76,7 +76,7 @@ testcases_match_spec_test() ->
      maps, guard_bifs].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/port_trace_SUITE.erl b/erts/emulator/test/port_trace_SUITE.erl
@@ -73,7 +73,7 @@ testcases() ->
      driver_remote_send_term].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
@@ -84,7 +84,7 @@ testcases() ->
      ms_excessive_nesting].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/trace_bif_SUITE.erl b/erts/emulator/test/trace_bif_SUITE.erl
@@ -1,3 +1,4 @@
+
 %%
 %% %CopyrightBegin%
 %% 
@@ -48,7 +49,7 @@ testcases() ->
      trace_bif_return, trace_info_old_code].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/trace_call_count_SUITE.erl b/erts/emulator/test/trace_call_count_SUITE.erl
@@ -84,7 +84,7 @@ testcases() ->
     [basic, on_and_off, info, pause_and_restart, combo].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/trace_call_memory_SUITE.erl b/erts/emulator/test/trace_call_memory_SUITE.erl
@@ -58,7 +58,7 @@ testcases() ->
     spawn_memory_lambda, conflict_traces, big_words].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).
@@ -316,12 +316,13 @@ parallel_map(Config) when is_list(Config) ->
     end.
 
 do_parallel() ->
-    Allocs = [spawn_link(fun() -> alloc_2tup(), receive_message() end) || _ <- lists:seq(1, 3)],
-    Grand = [spawn_link(fun() -> receive_message() end) || _ <- lists:seq(1, 3)],
+    Allocs = [spawn_monitor(fun() -> alloc_2tup(), receive_message() end) || _ <- lists:seq(1, 3)],
+    Grand = [spawn_monitor(fun() -> receive_message() end) || _ <- lists:seq(1, 3)],
     pre_stop = receive_message(),
-    [P ! {atom, <<"1234">>} || P <- Grand], %% 6 words on the heap: 3 for binary, 3 for tuple
+    [P ! {atom, <<"1234">>} || {P,_} <- Grand], %% 3 words on the heap for tuple (binary is literal)
     {stop, 1} = receive_message(),
-    [exit(P, normal) || P <- Allocs].
+    [P ! atom || {P,_} <- Allocs], %% no words on the heap for atom
+    [receive {'DOWN', MRef, process, P, normal} -> ok end || {P,MRef} <- Allocs++Grand].
 
 trace_all() ->
     [{doc, "Enables memory tracing for all processes, mainly ensuring there are no core dumps"}].

diff --git a/erts/emulator/test/trace_call_time_SUITE.erl b/erts/emulator/test/trace_call_time_SUITE.erl
@@ -91,7 +91,7 @@ testcases() ->
      catch_crash].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
@@ -63,7 +63,7 @@
          init_per_testcase/2, end_per_testcase/2]).
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/trace_meta_SUITE.erl b/erts/emulator/test/trace_meta_SUITE.erl
@@ -93,7 +93,7 @@ testcases() ->
      combo, nosilent].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).
@@ -395,9 +395,9 @@ tracer_test() ->
 	?erlang_trace_info({erlang,phash2,2}, meta_match_spec),
     %% Initiate trace messages that will fail
     Ref2 = make_ref(),
-    apply_slave_async(?MODULE, receiver, [Ref2]),
     Slave ! Ref2,
-    receive_no_next(100),
+    apply_slave(?MODULE, receiver, [Ref2]),
+    receive_no_next(0),
     {meta,[]} =
 	?erlang_trace_info({?MODULE,receiver,1}, meta),
     {meta_match_spec, MatchSpec} = 

diff --git a/erts/emulator/test/trace_nif_SUITE.erl b/erts/emulator/test/trace_nif_SUITE.erl
@@ -51,7 +51,7 @@ testcases() ->
 
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).

diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl
@@ -60,7 +60,7 @@ testcases() ->
      default_tracer, tracer_port_crash].
 
 init_per_suite(Config) ->
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).
@@ -227,13 +227,14 @@ receive_trace_non_scheduler(Config) when is_list(Config) ->
                  fun() ->
                          receive
                              go ->
-                                 Ref = S ! erlang:trace_delivered(all),
+                                 Ref = erlang:trace_delivered(all),
+                                 S ! {sync,Ref},
                                  receive {trace_delivered, Ref, all} -> ok end
                          end
                  end),
     trac(Receiver, true, ['receive']),
     Receiver ! go,
-    Ref = receive R -> R end,
+    Ref = receive {sync,R} -> R end,
     expect({trace,Receiver,'receive',go}),
     expect({trace,Receiver,'receive',{trace_delivered, all, Ref}}),
 

diff --git a/erts/emulator/test/trace_session_SUITE.erl b/erts/emulator/test/trace_session_SUITE.erl
@@ -384,7 +384,7 @@ set_on_spawn2(S1, Tracer1, Opts1, S2, Tracer2, Opts2) ->
         {Tracer1, {trace, GrandChild, exit, die}}],
 
        [{Tracer2, {trace, GrandChild, spawned, Child, '_'}},
-        {Tracer2,{trace, '_', exit, die}}]
+        {Tracer2, {trace, GrandChild, exit, die}}]
       }),
 
     1 = erlang_trace(S1, self(), false, [procs, set_on_spawn | Opts1]),

diff --git a/erts/emulator/test/trace_sessions.erl b/erts/emulator/test/trace_sessions.erl
@@ -28,7 +28,7 @@
 %%
 
 -export([all/0, groups/1,
-         init_per_suite/1, end_per_suite/1, suite_controller/2,
+         init_per_suite/2, end_per_suite/1, suite_controller/2,
          init_per_group/2, end_per_group/2,
          init_per_testcase/1, end_per_testcase/1,
          erlang_trace/3,
@@ -55,10 +55,13 @@ all() ->
 groups(Testcases) ->
     [{Group, [], Testcases} || Group <- group_list()].
 
-init_per_suite(Config) ->
+init_per_suite(Config, SuiteModule) ->
     SessionsBefore = trace:session_info(all),
     Pid = spawn(?MODULE, suite_controller, [start, []]),
-    [{suite_controller, Pid}, {sessions_before, SessionsBefore} | Config].
+    [{suite_controller, Pid},
+     {sessions_before, SessionsBefore},
+     {suite_module, SuiteModule}
+    | Config].
 
 end_per_suite(Config) ->
     SessionsBefore = proplists:get_value(sessions_before, Config),
@@ -228,17 +231,14 @@ init_group([pre_session|Tail], Config) ->
     %% Set a dummy call_count on all (local) functions.
     trace:function(S, {'_','_','_'}, true, [local]),
 
-    %% Re-set a dummy global call trace on all exported functions.
-    [[trace:function(S, {Module, Func, Arity}, true, [global])
-      || {Func,Arity} <- Module:module_info(exports)]
-     || Module <- erlang:loaded(),
-        erlang:function_exported(Module, module_info, 1)],
+    %% Re-set a dummy global call trace on exported functions.
+    set_dummy_global_trace(S, Config),
 
     %% Set a dummy send trace on all processes and ports
     %% but disable send trace to not get any messages.
+    1 = trace:send(S, false, []),
     trace:process(S, all, true, [send]),
     trace:port(S, all, true, [send]),
-    1 = trace:send(S, false, []),
 
     ets:insert(?MODULE, {pre_session, S, Tracer}),
     init_group(Tail, Config);
@@ -287,3 +287,28 @@ init_per_testcase(Config) ->
 
 end_per_testcase(Config) ->
     suite_controller_check(Config).
+
+
+
+set_dummy_global_trace(S, Config) ->
+    %% Modules = [M || M <- erlang:loaded(),
+    %%                 erlang:function_exported(M, module_info, 1)],
+    %% Calling trace_pattern on all loaded modules takes too long time
+    %% on some machines. Do it on a subset of modules instead.
+
+    %% Set a dummy global call trace on some exported functions.
+    SuiteModule = proplists:get_value(suite_module, Config),
+    Modules = [erlang, ets, lists, maps, SuiteModule],
+    io:format("~w modules to trace...\n", [length(Modules)]),
+
+    [begin
+         {Micros, 1} = timer:tc(fun() ->
+                                        trace:function(S, {Mod, Func, Arity},
+                                                       true, [global])
+                                end),
+         io:format("~10w: ~w:~w/~w", [Micros, Mod, Func, Arity])
+     end
+     || Mod <- Modules,
+        {Func, Arity} <- Mod:module_info(exports)],
+
+    ok.
diff --git a/erts/emulator/test/tracer_SUITE.erl b/erts/emulator/test/tracer_SUITE.erl
@@ -56,7 +56,7 @@ init_per_suite(Config) ->
     erlang:trace_pattern({'_','_','_'}, false, []),
     purge(),
 
-    trace_sessions:init_per_suite(Config).
+    trace_sessions:init_per_suite(Config, ?MODULE).
 
 end_per_suite(Config) ->
     trace_sessions:end_per_suite(Config).