diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-28 11:08:06 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-28 11:08:06 +0200 |
| commit | b83073436a39553da458b19ef572ded9cd051611 (patch) | |
| tree | 2f26fb6d7f55dcc1b617fd3b9f652d2fb259547e | |
| parent | a1e73008b8dc8161922b1a47ffad4a4b61885ef8 (diff) | |
| parent | bc4362edacedb40c6edb9e855aa234c066b8292f (diff) | |
| download | otp-b83073436a39553da458b19ef572ded9cd051611.tar.gz otp-b83073436a39553da458b19ef572ded9cd051611.tar.bz2 otp-b83073436a39553da458b19ef572ded9cd051611.zip | |
Merge branch 'bjorn/stdlib/fix-beam_lib-race/OTP-9586' into dev
* bjorn/stdlib/fix-beam_lib-race/OTP-9586:
beam_lib: Handle rare race in the crypto key server functionality
| -rw-r--r-- | lib/stdlib/src/beam_lib.erl | 14 | ||||
| -rw-r--r-- | lib/stdlib/test/beam_lib_SUITE.erl | 10 |
2 files changed, 19 insertions, 5 deletions
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl index d9c645d787..fdfbb2e998 100644 --- a/lib/stdlib/src/beam_lib.erl +++ b/lib/stdlib/src/beam_lib.erl @@ -893,13 +893,17 @@ call_crypto_server(Req) -> gen_server:call(?CRYPTO_KEY_SERVER, Req, infinity) catch exit:{noproc,_} -> - start_crypto_server(), - erlang:yield(), - call_crypto_server(Req) + %% Not started. + call_crypto_server_1(Req); + exit:{normal,_} -> + %% The process finished just as we called it. + call_crypto_server_1(Req) end. -start_crypto_server() -> - gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []). +call_crypto_server_1(Req) -> + gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []), + erlang:yield(), + call_crypto_server(Req). -spec init([]) -> {'ok', #state{}}. diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl index 91fff3cee4..27520a5c88 100644 --- a/lib/stdlib/test/beam_lib_SUITE.erl +++ b/lib/stdlib/test/beam_lib_SUITE.erl @@ -571,8 +571,18 @@ do_encrypted_abstr(Beam, Key) -> ?line {ok,{simple,[{"Abst",Abst}]}} = beam_lib:chunks(Beam, ["Abst"]), ?line {ok,cleared} = beam_lib:clear_crypto_key_fun(), + + %% Try to force a stop/start race. + ?line start_stop_race(10000), + ok. +start_stop_race(0) -> + ok; +start_stop_race(N) -> + {error,_} = beam_lib:crypto_key_fun(bad_fun), + undefined = beam_lib:clear_crypto_key_fun(), + start_stop_race(N-1). bad_fun(F) -> {error,E} = beam_lib:crypto_key_fun(F), |