aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Ramine <[email protected]>2014-06-26 12:57:20 +0200
committerMarcus Arendt <[email protected]>2014-09-15 15:12:56 +0200
commitff47482c9acb9b0655d1d9528164c96aff05cc90 (patch)
tree0179f2e3760acc7de466c5553cbe12406499d0a1
parent6ae71a42e83fc2f47c7fea4fe11efbc5a469d1c0 (diff)
downloadotp-ff47482c9acb9b0655d1d9528164c96aff05cc90.tar.gz
otp-ff47482c9acb9b0655d1d9528164c96aff05cc90.tar.bz2
otp-ff47482c9acb9b0655d1d9528164c96aff05cc90.zip
Remove untested option 'generic_debug' from gen_server
This undocumented option makes an init:get_argument/1 call every time a gen_server is started. Reported-By: James Fish
-rw-r--r--lib/stdlib/src/gen_server.erl16
-rw-r--r--lib/wx/src/wx_object.erl16
2 files changed, 4 insertions, 28 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 27b34b05a9..2d8d7f6233 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -803,22 +803,10 @@ opt(_, []) ->
debug_options(Name, Opts) ->
case opt(debug, Opts) of
- {ok, Options} -> dbg_options(Name, Options);
- _ -> dbg_options(Name, [])
+ {ok, Options} -> dbg_opts(Name, Options);
+ _ -> []
end.
-dbg_options(Name, []) ->
- Opts =
- case init:get_argument(generic_debug) of
- error ->
- [];
- _ ->
- [log, statistics]
- end,
- dbg_opts(Name, Opts);
-dbg_options(Name, Opts) ->
- dbg_opts(Name, Opts).
-
dbg_opts(Name, Opts) ->
case catch sys:debug_options(Opts) of
{'EXIT',_} ->
diff --git a/lib/wx/src/wx_object.erl b/lib/wx/src/wx_object.erl
index 249ea1cee3..2c016e7951 100644
--- a/lib/wx/src/wx_object.erl
+++ b/lib/wx/src/wx_object.erl
@@ -600,22 +600,10 @@ opt(_, []) ->
%% @hidden
debug_options(Name, Opts) ->
case opt(debug, Opts) of
- {ok, Options} -> dbg_options(Name, Options);
- _ -> dbg_options(Name, [])
+ {ok, Options} -> dbg_opts(Name, Options);
+ _ -> []
end.
%% @hidden
-dbg_options(Name, []) ->
- Opts =
- case init:get_argument(generic_debug) of
- error ->
- [];
- _ ->
- [log, statistics]
- end,
- dbg_opts(Name, Opts);
-dbg_options(Name, Opts) ->
- dbg_opts(Name, Opts).
-%% @hidden
dbg_opts(Name, Opts) ->
case catch sys:debug_options(Opts) of
{'EXIT',_} ->