aboutsummaryrefslogtreecommitdiffstats
path: root/lib/runtime_tools
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-12-20 09:42:01 +0100
committerSiri Hansen <[email protected]>2016-12-20 09:42:01 +0100
commita4350201d204d61ee67b7330200c8d7d6d4b38d5 (patch)
tree5c0e1f289438b3d2ff934d98add3d40979f6426d /lib/runtime_tools
parentf8bc348d6a717e84709eaebf8ebd882f41052c24 (diff)
parentf0152387b96dc0c2ce5ecf7805fc435cb400356e (diff)
downloadotp-a4350201d204d61ee67b7330200c8d7d6d4b38d5.tar.gz
otp-a4350201d204d61ee67b7330200c8d7d6d4b38d5.tar.bz2
otp-a4350201d204d61ee67b7330200c8d7d6d4b38d5.zip
Merge branch 'maint'
Diffstat (limited to 'lib/runtime_tools')
-rw-r--r--lib/runtime_tools/src/observer_backend.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index e943fb4a3e..b27bc63d15 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -314,13 +314,12 @@ etop_collect(Collector) ->
case SchedulerWallTime of
undefined ->
- spawn(fun() -> flag_holder_proc(Collector) end),
+ erlang:system_flag(scheduler_wall_time,true),
+ spawn(fun() -> flag_holder_proc(Collector) end),
ok;
_ ->
ok
- end,
-
- erlang:system_flag(scheduler_wall_time,true).
+ end.
flag_holder_proc(Collector) ->
Ref = erlang:monitor(process,Collector),