diff options
| author | Siri Hansen <[email protected]> | 2013-08-12 14:44:18 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-08-12 14:44:18 +0200 |
| commit | fd3e32e7a13b522a04e17c815bba11d307fa1049 (patch) | |
| tree | 9862978898506f59f7ae86580f26ae51eb1dcfc6 | |
| parent | 01a13c00f67112e7996e45439d4eec9e6aa414ce (diff) | |
| parent | b1ee66711e447a1666b07d9160ee28d096c17064 (diff) | |
| download | otp-fd3e32e7a13b522a04e17c815bba11d307fa1049.tar.gz otp-fd3e32e7a13b522a04e17c815bba11d307fa1049.tar.bz2 otp-fd3e32e7a13b522a04e17c815bba11d307fa1049.zip | |
Merge branch 'siri/runtime_tools/dbg-silent/otp-11222' into maint
* siri/runtime_tools/dbg-silent/otp-11222:
Allow 'silent' flag to be set with dbg:p/2
| -rw-r--r-- | lib/runtime_tools/doc/src/dbg.xml | 2 | ||||
| -rw-r--r-- | lib/runtime_tools/src/dbg.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml index d8c82b2459..36b3b51a99 100644 --- a/lib/runtime_tools/doc/src/dbg.xml +++ b/lib/runtime_tools/doc/src/dbg.xml @@ -244,7 +244,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\ </item> <tag><c>all</c></tag> <item> - <p>Sets all flags.</p> + <p>Sets all flags except <c>silent</c>.</p> </item> <tag><c>clear</c></tag> <item> diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl index 6b2fb0460f..f0086e8cc7 100644 --- a/lib/runtime_tools/src/dbg.erl +++ b/lib/runtime_tools/src/dbg.erl @@ -1113,7 +1113,7 @@ transform_flags([sos|Tail],Acc) -> transform_flags(Tail,[set_on_spawn|Acc]); transform_flags([sol|Tail],Acc) -> transform_flags(Tail,[set_on_link|Acc]); transform_flags([sofs|Tail],Acc) -> transform_flags(Tail,[set_on_first_spawn|Acc]); transform_flags([sofl|Tail],Acc) -> transform_flags(Tail,[set_on_first_link|Acc]); -transform_flags([all|_],_Acc) -> all(); +transform_flags([all|_],_Acc) -> all()--[silent]; transform_flags([F|Tail]=List,Acc) when is_atom(F) -> case lists:member(F, all()) of true -> transform_flags(Tail,[F|Acc]); @@ -1124,7 +1124,7 @@ transform_flags(Bad,_Acc) -> {error,{bad_flags,Bad}}. all() -> [send,'receive',call,procs,garbage_collection,running, set_on_spawn,set_on_first_spawn,set_on_link,set_on_first_link, - timestamp,arity,return_to]. + timestamp,arity,return_to,silent]. display_info([Node|Nodes]) -> io:format("~nNode ~w:~n",[Node]), |