Merge branch 'maint'

2 files changed, 159 insertions, 99 deletions

diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 3283fa571f..148622cf07 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -21,12 +21,14 @@
 -include_lib("test_server/include/test_server.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
+	init_per_group/2,end_per_group/2]).
+
+-export([tiny/1,eed/1,basic/1,basic_option/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [basic, tiny, eed].
+    [basic, basic_option, tiny, eed].
 
 groups() -> 
     [].
@@ -49,140 +51,185 @@ basic(Config) when is_list(Config) ->
 
     %% load eprof_test and change directory
 
-    ?line {ok, OldCurDir} = file:get_cwd(),
+    {ok, OldCurDir} = file:get_cwd(),
     Datadir = ?config(data_dir, Config),
     Privdir = ?config(priv_dir, Config),
-    ?line {ok,eprof_test} = compile:file(filename:join(Datadir, "eprof_test"),
+    {ok,eprof_test} = compile:file(filename:join(Datadir, "eprof_test"),
 					       [trace,{outdir, Privdir}]),
-    ?line ok = file:set_cwd(Privdir),
-    ?line code:purge(eprof_test),
-    ?line {module,eprof_test} = code:load_file(eprof_test),
+    ok = file:set_cwd(Privdir),
+    code:purge(eprof_test),
+    {module,eprof_test} = code:load_file(eprof_test),
 
     %% rootset profiling
 
-    ?line ensure_eprof_stopped(),
-    ?line profiling = eprof:profile([self()]),
-    ?line {error, already_profiling} = eprof:profile([self()]),
-    ?line profiling_stopped = eprof:stop_profiling(),
-    ?line profiling_already_stopped = eprof:stop_profiling(),
-    ?line profiling = eprof:start_profiling([self(),self(),self()]),
-    ?line profiling_stopped = eprof:stop_profiling(),
+    ensure_eprof_stopped(),
+    profiling = eprof:profile([self()]),
+    {error, already_profiling} = eprof:profile([self()]),
+    profiling_stopped = eprof:stop_profiling(),
+    profiling_already_stopped = eprof:stop_profiling(),
+    profiling = eprof:start_profiling([self(),self(),self()]),
+    profiling_stopped = eprof:stop_profiling(),
 
     %% with patterns
 
-    ?line profiling = eprof:start_profiling([self()], {?MODULE, '_', '_'}),
-    ?line {error, already_profiling} = eprof:start_profiling([self()], {?MODULE, '_', '_'}),
-    ?line profiling_stopped = eprof:stop_profiling(),
-    ?line profiling = eprof:start_profiling([self()], {?MODULE, start_stop, '_'}),
-    ?line profiling_stopped = eprof:stop_profiling(),
-    ?line profiling = eprof:start_profiling([self()], {?MODULE, start_stop, 1}),
-    ?line profiling_stopped = eprof:stop_profiling(),
+    profiling = eprof:start_profiling([self()], {?MODULE, '_', '_'}),
+    {error, already_profiling} = eprof:start_profiling([self()], {?MODULE, '_', '_'}),
+    profiling_stopped = eprof:stop_profiling(),
+    profiling = eprof:start_profiling([self()], {?MODULE, start_stop, '_'}),
+    profiling_stopped = eprof:stop_profiling(),
+    profiling = eprof:start_profiling([self()], {?MODULE, start_stop, 1}),
+    profiling_stopped = eprof:stop_profiling(),
 
     %% with fun
 
-    ?line {ok, _} = eprof:profile(fun() -> eprof_test:go(10) end),
-    ?line profiling = eprof:profile([self()]),
-    ?line {error, already_profiling} = eprof:profile(fun() -> eprof_test:go(10) end),
-    ?line profiling_stopped = eprof:stop_profiling(),
-    ?line {ok, _} = eprof:profile(fun() -> eprof_test:go(10) end),
-    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end),
-    ?line Pid     = whereis(eprof),
-    ?line {ok, _} = eprof:profile(erlang:processes() -- [Pid], fun() -> eprof_test:go(10) end),
-    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, '_', '_'}),
-    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, go, '_'}),
-    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, go, 1}),
-    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, dec, 1}),
+    {ok, _} = eprof:profile(fun() -> eprof_test:go(10) end),
+    profiling = eprof:profile([self()]),
+    {error, already_profiling} = eprof:profile(fun() -> eprof_test:go(10) end),
+    profiling_stopped = eprof:stop_profiling(),
+    {ok, _} = eprof:profile(fun() -> eprof_test:go(10) end),
+    {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end),
+    Pid     = whereis(eprof),
+    {ok, _} = eprof:profile(erlang:processes() -- [Pid], fun() -> eprof_test:go(10) end),
+    {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, '_', '_'}),
+    {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, go, '_'}),
+    {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, go, 1}),
+    {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, dec, 1}),
 
     %% error case
 
-    ?line error     = eprof:profile([Pid], fun() -> eprof_test:go(10) end),
-    ?line Pid       = whereis(eprof),
-    ?line error     = eprof:profile([Pid], fun() -> eprof_test:go(10) end),
-    ?line A         = spawn(fun() -> receive _ -> ok end end),
-    ?line profiling = eprof:profile([A]),
-    ?line true      = exit(A, kill_it),
-    ?line profiling_stopped = eprof:stop_profiling(),
-    ?line {error,_} = eprof:profile(fun() -> a = b end),
+    error     = eprof:profile([Pid], fun() -> eprof_test:go(10) end),
+    Pid       = whereis(eprof),
+    error     = eprof:profile([Pid], fun() -> eprof_test:go(10) end),
+    A         = spawn(fun() -> receive _ -> ok end end),
+    profiling = eprof:profile([A]),
+    true      = exit(A, kill_it),
+    profiling_stopped = eprof:stop_profiling(),
+    {error,_} = eprof:profile(fun() -> a = b end),
 
     %% with mfa
 
-    ?line {ok, _} = eprof:profile([], eprof_test, go, [10]),
-    ?line {ok, _} = eprof:profile([], eprof_test, go, [10], {eprof_test, dec, 1}),
+    {ok, _} = eprof:profile([], eprof_test, go, [10]),
+    {ok, _} = eprof:profile([], eprof_test, go, [10], {eprof_test, dec, 1}),
 
     %% dump
 
-    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, '_', '_'}),
-    ?line [{_, Mfas}] = eprof:dump(),
-    ?line Dec_mfa = {eprof_test, dec, 1},
-    ?line Go_mfa  = {eprof_test, go,  1},
-    ?line {value, {Go_mfa,  { 1, _Time1}}} = lists:keysearch(Go_mfa,  1, Mfas),
-    ?line {value, {Dec_mfa, {11, _Time2}}} = lists:keysearch(Dec_mfa, 1, Mfas),
+    {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, '_', '_'}),
+    [{_, Mfas}] = eprof:dump(),
+    Dec_mfa = {eprof_test, dec, 1},
+    Go_mfa  = {eprof_test, go,  1},
+    {value, {Go_mfa,  { 1, _Time1}}} = lists:keysearch(Go_mfa,  1, Mfas),
+    {value, {Dec_mfa, {11, _Time2}}} = lists:keysearch(Dec_mfa, 1, Mfas),
 
     %% change current working directory
 
-    ?line ok = file:set_cwd(OldCurDir),
-    ?line stopped = eprof:stop(),
+    ok = file:set_cwd(OldCurDir),
+    stopped = eprof:stop(),
+    ok.
+
+basic_option(Config) when is_list(Config) ->
+    %% load eprof_test and change directory
+
+    {ok, OldCurDir} = file:get_cwd(),
+    Datadir = ?config(data_dir, Config),
+    Privdir = ?config(priv_dir, Config),
+    {ok,eprof_test} = compile:file(filename:join(Datadir, "eprof_test"),
+					       [trace,{outdir, Privdir}]),
+    ok = file:set_cwd(Privdir),
+    code:purge(eprof_test),
+    {module,eprof_test} = code:load_file(eprof_test),
+
+    % vanilla
+    {ok, _} = eprof:profile(fun() -> eprof_test:do(10) end, [{set_on_spawn, true}]),
+
+    [{_, MfasDo1},{_, MfasLists1}] = eprof:dump(),
+    Mfas1 = MfasDo1 ++ MfasLists1,
+
+    {value, {_, {11, _}}} = lists:keysearch({eprof_test,dec,1},  1, Mfas1),
+    {value, {_, { 1, _}}} = lists:keysearch({eprof_test, go,1},  1, Mfas1),
+    {value, {_, { 9, _}}} = lists:keysearch({lists, split_2,5},  1, Mfas1),
+    {value, {_, { 4, _}}} = lists:keysearch({lists, seq_loop,3}, 1, Mfas1),
+
+    {ok, _} = eprof:profile(fun() -> eprof_test:do(10) end, [set_on_spawn]),
+
+    [{_, MfasDo2},{_, MfasLists2}] = eprof:dump(),
+    Mfas2 = MfasDo2 ++ MfasLists2,
+    {value, {_, {11, _}}} = lists:keysearch({eprof_test,dec,1},  1, Mfas2),
+    {value, {_, { 1, _}}} = lists:keysearch({eprof_test, go,1},  1, Mfas2),
+    {value, {_, { 9, _}}} = lists:keysearch({lists, split_2,5},  1, Mfas2),
+    {value, {_, { 4, _}}} = lists:keysearch({lists, seq_loop,3}, 1, Mfas2),
+
+    % disable trace set_on_spawn
+    {ok, _} = eprof:profile(fun() -> eprof_test:do(10) end, []),
+    [{_, Mfas3}] = eprof:dump(),
+    {value, {_, {11, _}}} = lists:keysearch({eprof_test,dec,1}, 1, Mfas3),
+    {value, {_, { 1, _}}} = lists:keysearch({eprof_test, go,1}, 1, Mfas3),
+    false = lists:keysearch({lists, split_2,5},  1, Mfas3),
+    false = lists:keysearch({lists, seq_loop,3}, 1, Mfas3),
+
+    %% change current working directory
+    ok = file:set_cwd(OldCurDir),
+    stopped = eprof:stop(),
     ok.
 
 tiny(suite) -> [];
 tiny(Config) when is_list(Config) -> 
-    ?line ensure_eprof_stopped(),
-    ?line {ok, OldCurDir} = file:get_cwd(),
+    ensure_eprof_stopped(),
+    {ok, OldCurDir} = file:get_cwd(),
     Datadir = ?config(data_dir, Config),
     Privdir = ?config(priv_dir, Config),
-    ?line TTrap=?t:timetrap(60*1000),
+    TTrap=?t:timetrap(60*1000),
     % (Trace)Compile to priv_dir and make sure the correct version is loaded.
-    ?line {ok,eprof_suite_test} = compile:file(filename:join(Datadir,
+    {ok,eprof_suite_test} = compile:file(filename:join(Datadir,
 							     "eprof_suite_test"),
 					       [trace,{outdir, Privdir}]),
-    ?line ok = file:set_cwd(Privdir),
-    ?line code:purge(eprof_suite_test),
-    ?line {module,eprof_suite_test} = code:load_file(eprof_suite_test),
-    ?line {ok,_Pid} = eprof:start(),
-    ?line nothing_to_analyze = eprof:analyze(),
-    ?line nothing_to_analyze = eprof:analyze(total),
-    ?line eprof:profile([], eprof_suite_test, test, [Config]),
-    ?line ok = eprof:analyze(),
-    ?line ok = eprof:analyze(total),
-    ?line ok = eprof:log("eprof_SUITE_logfile"),
-    ?line stopped = eprof:stop(),
-    ?line ?t:timetrap_cancel(TTrap),
-    ?line ok = file:set_cwd(OldCurDir),
+    ok = file:set_cwd(Privdir),
+    code:purge(eprof_suite_test),
+    {module,eprof_suite_test} = code:load_file(eprof_suite_test),
+    {ok,_Pid} = eprof:start(),
+    nothing_to_analyze = eprof:analyze(),
+    nothing_to_analyze = eprof:analyze(total),
+    eprof:profile([], eprof_suite_test, test, [Config]),
+    ok = eprof:analyze(),
+    ok = eprof:analyze(total),
+    ok = eprof:log("eprof_SUITE_logfile"),
+    stopped = eprof:stop(),
+    ?t:timetrap_cancel(TTrap),
+    ok = file:set_cwd(OldCurDir),
     ok.
 
 eed(suite) -> [];
 eed(Config) when is_list(Config) ->
-    ?line ensure_eprof_stopped(),
-    ?line Datadir = ?config(data_dir, Config),
-    ?line Privdir = ?config(priv_dir, Config),
-    ?line TTrap=?t:timetrap(5*60*1000),
+    ensure_eprof_stopped(),
+    Datadir = ?config(data_dir, Config),
+    Privdir = ?config(priv_dir, Config),
+    TTrap=?t:timetrap(5*60*1000),
 
     %% (Trace)Compile to priv_dir and make sure the correct version is loaded.
-    ?line code:purge(eed),
-    ?line {ok,eed} = c:c(filename:join(Datadir, "eed"), [trace,{outdir,Privdir}]),
-    ?line {ok,_Pid} = eprof:start(),
-    ?line Script = filename:join(Datadir, "ed.script"),
-    ?line ok = file:set_cwd(Datadir),
-    ?line {T1,_} = statistics(runtime),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line ok = eed:file(Script),
-    ?line {T2,_} = statistics(runtime),
-    ?line {ok,ok} = eprof:profile([], eed, file, [Script]),
-    ?line {T3,_} = statistics(runtime),
-    ?line profiling_already_stopped = eprof:stop_profiling(),
-    ?line ok = eprof:analyze(),
-    ?line ok = eprof:analyze(total),
-    ?line ok = eprof:log("eprof_SUITE_logfile"),
-    ?line stopped = eprof:stop(),
-    ?line ?t:timetrap_cancel(TTrap),
+    code:purge(eed),
+    {ok,eed} = c:c(filename:join(Datadir, "eed"), [trace,{outdir,Privdir}]),
+    {ok,_Pid} = eprof:start(),
+    Script = filename:join(Datadir, "ed.script"),
+    ok = file:set_cwd(Datadir),
+    {T1,_} = statistics(runtime),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    ok = eed:file(Script),
+    {T2,_} = statistics(runtime),
+    {ok,ok} = eprof:profile([], eed, file, [Script]),
+    {T3,_} = statistics(runtime),
+    profiling_already_stopped = eprof:stop_profiling(),
+    ok = eprof:analyze(),
+    ok = eprof:analyze(total),
+    ok = eprof:log("eprof_SUITE_logfile"),
+    stopped = eprof:stop(),
+    ?t:timetrap_cancel(TTrap),
     try
 	S = lists:flatten(io_lib:format("~p times slower",
 					[10*(T3-T2)/(T2-T1)])),
@@ -198,5 +245,5 @@ ensure_eprof_stopped() ->
 	undefined ->
 	    ok;
 	Pid ->
-	    ?line stopped=eprof:stop()
+	    stopped=eprof:stop()
     end.
diff --git a/lib/tools/test/eprof_SUITE_data/eprof_test.erl b/lib/tools/test/eprof_SUITE_data/eprof_test.erl
index 33c428e893..2d9e4c2945 100644
--- a/lib/tools/test/eprof_SUITE_data/eprof_test.erl
+++ b/lib/tools/test/eprof_SUITE_data/eprof_test.erl
@@ -1,5 +1,5 @@
 -module(eprof_test).
--export([go/1]).
+-export([go/1, do/1]).
 
 go(N) ->
     0 = dec(N),
@@ -7,3 +7,16 @@ go(N) ->
 
 dec(0) -> 0;
 dec(N) -> dec(N - 1).
+
+
+
+load(N, Pid) ->
+    _ = lists:sort(lists:reverse(lists:seq(1, N))),
+    Pid ! {self(), ok}.
+
+
+do(N) ->
+    Me  = self(),
+    Pid = spawn_link(fun() -> load(N, Me) end),
+    ok  = go(N),
+    receive {Pid, ok} -> ok end.