diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-04-15 11:57:59 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-04-15 11:57:59 +0200 |
| commit | efbf57358b8afca275545a627713bcf14969e243 (patch) | |
| tree | 6fc8087ac679d2d545b63b1f2de9fb303e65f3e1 /lib/tools/src/fprof.erl | |
| parent | 057c411456f6e60cd1fcf0acd1a226381f43cea8 (diff) | |
| parent | 8e236f7c5a0c6383e5f604a781e68b1685127e15 (diff) | |
| download | otp-efbf57358b8afca275545a627713bcf14969e243.tar.gz otp-efbf57358b8afca275545a627713bcf14969e243.tar.bz2 otp-efbf57358b8afca275545a627713bcf14969e243.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/tools/src/fprof.erl')
| -rw-r--r-- | lib/tools/src/fprof.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl index 4cbb910f11..877218bda0 100644 --- a/lib/tools/src/fprof.erl +++ b/lib/tools/src/fprof.erl @@ -1226,10 +1226,7 @@ spawn_3step(Spawn, FunPrelude, FunAck, FunBody) MRef = erlang:monitor(process, Parent), receive {Parent, Ref, Go} -> - erlang:demonitor(MRef), - receive {'DOWN', MRef, _, _, _} -> ok - after 0 -> ok - end, + erlang:demonitor(MRef, [flush]), FunBody(Go); {'DOWN', MRef, _, _, _} -> ok @@ -1238,8 +1235,7 @@ spawn_3step(Spawn, FunPrelude, FunAck, FunBody) MRef = erlang:monitor(process, Child), receive {Child, Ref, Ack} -> - erlang:demonitor(MRef), - receive {'DOWN', MRef, _, _, _} -> ok after 0 -> ok end, + erlang:demonitor(MRef, [flush]), try FunAck(Ack) of {Result, Go} -> catch Child ! {Parent, Ref, Go}, |