Skip to content

Add configurable timeout for stop_trace #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ijcd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add configurable timeout for stop_trace #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ ebin/*
*.svg
*.out
erl_crash.dump
.rebar
30 changes: 21 additions & 9 deletions src/eflame.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,44 @@
-export([apply/2,
apply/3,
apply/4,
apply/5]).
apply/5,
apply/6]).

-define(RESOLUTION, 1000). %% us
-record(dump, {stack=[], us=0, acc=[]}). % per-process state

-define(DEFAULT_MODE, normal_with_children).
-define(DEFAULT_OUTPUT_FILE, "stacks.out").
-define(DEFAULT_OPTIONS, #{timeout => 5000}).

apply(F, A) ->
apply1(?DEFAULT_MODE, ?DEFAULT_OUTPUT_FILE, {F, A}).
apply1(?DEFAULT_MODE, ?DEFAULT_OUTPUT_FILE, {F, A}, ?DEFAULT_OPTIONS).

apply(F, A, O) when is_map(O) ->
apply1(?DEFAULT_MODE, ?DEFAULT_OUTPUT_FILE, {F, A}, O);
apply(M, F, A) ->
apply1(?DEFAULT_MODE, ?DEFAULT_OUTPUT_FILE, {{M, F}, A}).
apply1(?DEFAULT_MODE, ?DEFAULT_OUTPUT_FILE, {{M, F}, A}, ?DEFAULT_OPTIONS).

apply(M, F, A, O) when is_map(O) ->
apply1(?DEFAULT_MODE, ?DEFAULT_OUTPUT_FILE, {{M, F}, A}, O);
apply(Mode, OutputFile, Fun, Args) ->
apply1(Mode, OutputFile, {Fun, Args}).
apply1(Mode, OutputFile, {Fun, Args}, ?DEFAULT_OPTIONS).

apply(Mode, OutputFile, Fun, Args, O) when is_map(O) ->
apply1(Mode, OutputFile, {Fun, Args}, O);
apply(Mode, OutputFile, M, F, A) ->
apply1(Mode, OutputFile, {{M, F}, A}).
apply1(Mode, OutputFile, {{M, F}, A}, ?DEFAULT_OPTIONS).

apply1(Mode, OutputFile, {Fun, Args}) ->
apply(Mode, OutputFile, M, F, A, O) when is_map(O) ->
apply1(Mode, OutputFile, {{M, F}, A}, O).

apply1(Mode, OutputFile, {Fun, Args}, Options) ->
Tracer = spawn_tracer(),
#{timeout := Timeout} = Options,

start_trace(Tracer, self(), Mode),
Return = (catch apply_fun(Fun, Args)),
{ok, Bytes} = stop_trace(Tracer, self()),
{ok, Bytes} = stop_trace(Tracer, self(), Timeout),

ok = file:write_file(OutputFile, Bytes),
Return.
Expand All @@ -44,12 +56,12 @@ start_trace(Tracer, Target, Mode) ->
erlang:trace(Target, true, [{tracer, Tracer} | trace_flags(Mode)]),
ok.

stop_trace(Tracer, Target) ->
stop_trace(Tracer, Target, Timeout) ->
erlang:trace(Target, false, [all]),
Tracer ! {dump_bytes, self()},

Ret = receive {bytes, B} -> {ok, B}
after 5000 -> {error, timeout}
after Timeout -> {error, timeout}
end,

exit(Tracer, normal),
Expand Down