aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPiotr Dorobisz <[email protected]>2011-03-09 13:29:23 +0100
committerHenrik Nord <[email protected]>2011-08-30 15:22:17 +0200
commit84cf781d8f2f97f0950cb72d2c7a442af5a8eb94 (patch)
tree6a2c45eb214824d90397344ec4384806e3f4da8a /lib
parent6af331934dafdfe95d30f7f7502161a3da34fd23 (diff)
downloadotp-84cf781d8f2f97f0950cb72d2c7a442af5a8eb94.tar.gz
otp-84cf781d8f2f97f0950cb72d2c7a442af5a8eb94.tar.bz2
otp-84cf781d8f2f97f0950cb72d2c7a442af5a8eb94.zip
Always use timestamp, optional sorting
Diffstat (limited to 'lib')
-rw-r--r--lib/observer/src/ttb.erl39
1 files changed, 23 insertions, 16 deletions
diff --git a/lib/observer/src/ttb.erl b/lib/observer/src/ttb.erl
index d4a90d7e42..65739ae7d8 100644
--- a/lib/observer/src/ttb.erl
+++ b/lib/observer/src/ttb.erl
@@ -357,7 +357,7 @@ no_store_p(Procs0,Flags0) ->
transform_flags([clear]) ->
[clear];
transform_flags(Flags) ->
- dbg:transform_flags(Flags).
+ dbg:transform_flags([timestamp | Flags]).
procs(Procs) when is_list(Procs) ->
@@ -774,10 +774,10 @@ write_info(Nodes,PI,Traci) ->
format(Files) ->
format(Files,[]).
format(Files,Opt) ->
- {Out,Handler} = format_opt(Opt),
+ {Out,Handler,DisableSort} = format_opt(Opt),
ets:new(?MODULE,[named_table]),
- format(Files,Out,Handler).
-format(File,Out,Handler) when is_list(File), is_integer(hd(File)) ->
+ format(Files,Out,Handler, DisableSort).
+format(File,Out,Handler,DisableSort) when is_list(File), is_integer(hd(File)) ->
Files =
case filelib:is_dir(File) of
true -> % will merge all files in the directory
@@ -793,8 +793,8 @@ format(File,Out,Handler) when is_list(File), is_integer(hd(File)) ->
false -> % format one file
[File]
end,
- format(Files,Out,Handler);
-format(Files,Out,Handler) when is_list(Files), is_list(hd(Files)) ->
+ format(Files,Out,Handler,DisableSort);
+format(Files,Out,Handler,DisableSort) when is_list(Files), is_list(hd(Files)) ->
StopDbg = case whereis(dbg) of
undefined -> true;
_ -> false
@@ -802,7 +802,7 @@ format(Files,Out,Handler) when is_list(Files), is_list(hd(Files)) ->
Details = lists:foldl(fun(File,Acc) -> [prepare(File,Handler)|Acc] end,
[],Files),
Fd = get_fd(Out),
- R = do_format(Fd,Details),
+ R = do_format(Fd,Details,DisableSort),
file:close(Fd),
ets:delete(?MODULE),
case StopDbg of
@@ -835,7 +835,8 @@ format_opt(Opt) when is_list(Opt) ->
{value,{handler,H}} -> H;
_ -> undefined
end,
- {Out,Handler};
+ DisableSort = proplists:get_value(disable_sort, Opt, false),
+ {Out,Handler,DisableSort};
format_opt(Opt) ->
format_opt([Opt]).
@@ -927,12 +928,12 @@ get_handler(Handler,Traci) ->
Handler
end.
-do_format(Fd,Details) ->
+do_format(Fd,Details,DisableSort) ->
Clients = lists:foldl(fun({FileOrWrap,Traci,Handler},Acc) ->
[start_client(FileOrWrap,Traci,Handler)
|Acc]
end,[],Details),
- init_collector(Fd,Clients).
+ init_collector(Fd,Clients,DisableSort).
start_client(FileOrWrap,Traci,et) ->
@@ -966,20 +967,26 @@ defaulthandler(Fd,Trace,_Traci,initial) ->
defaulthandler(_Fd,Trace,_Traci,State) ->
dbg:dhandler(Trace,State).
-init_collector(Fd,Clients) ->
+init_collector(Fd,Clients,DisableSort) ->
Collected = get_first(Clients),
- collector(Fd,sort(Collected)).
+ case DisableSort of
+ true -> collector(Fd,Collected, DisableSort);
+ false -> collector(Fd,sort(Collected), DisableSort)
+ end.
-collector(Fd,[{_,{Client,{Trace,State}}} |Rest]) ->
+collector(Fd,[{_,{Client,{Trace,State}}} |Rest], DisableSort) ->
Trace1 = update_procinfo(Trace),
State1 = handler1(Trace1,{Fd,State}),
case get_next(Client,State1) of
end_of_trace ->
handler1(end_of_trace,{Fd,State1}),
- collector(Fd,Rest);
- Next -> collector(Fd,sort([Next|Rest]))
+ collector(Fd,Rest,DisableSort);
+ Next -> case DisableSort of
+ false -> collector(Fd,sort([Next|Rest]), DisableSort);
+ true -> collector(Fd,[Next|Rest], DisableSort)
+ end
end;
-collector(_Fd,[]) ->
+collector(_Fd,[], _) ->
ok.
update_procinfo({drop,_N}=Trace) ->