diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-04-15 11:57:40 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-04-15 11:57:40 +0200 |
| commit | 8e236f7c5a0c6383e5f604a781e68b1685127e15 (patch) | |
| tree | faf91cbdaa25d71b01e5bfddcfda7bb1d675e7c5 /lib/et | |
| parent | f7641c8aafecc7b54b3f6f226892f825ac19f63a (diff) | |
| parent | c82e9fad33302ff24fdddbd50f110c06d4eb81d4 (diff) | |
| download | otp-8e236f7c5a0c6383e5f604a781e68b1685127e15.tar.gz otp-8e236f7c5a0c6383e5f604a781e68b1685127e15.tar.bz2 otp-8e236f7c5a0c6383e5f604a781e68b1685127e15.zip | |
Merge branch 'lh/demonitor-flush/OTP-11039' into maint
* lh/demonitor-flush/OTP-11039:
Use erlang:demonitor(Ref, [flush]) where applicable
Diffstat (limited to 'lib/et')
| -rw-r--r-- | lib/et/src/et_collector.erl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/et/src/et_collector.erl b/lib/et/src/et_collector.erl index a63d15fb4c..ce8cf6d4e0 100644 --- a/lib/et/src/et_collector.erl +++ b/lib/et/src/et_collector.erl @@ -654,13 +654,8 @@ start_trace_client(CollectorPid, Type, FileName) when Type =:= file -> Ref = erlang:monitor(process, Pid), receive WaitFor -> - erlang:demonitor(Ref), - receive - {'DOWN', Ref, _, _, _} -> - file_loaded - after 0 -> - file_loaded - end; + erlang:demonitor(Ref, [flush]), + file_loaded; {'DOWN', Ref, _, _, Reason} -> exit(Reason) end; |