diff options
| author | Siri Hansen <[email protected]> | 2014-03-27 11:27:06 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-03-27 11:27:06 +0100 |
| commit | 5b9ffc724e7c3ffe7c775b5113de059e2e25f755 (patch) | |
| tree | 251971e94f68cffefeae627bf23d346d51869bbd /lib/observer/src/crashdump_viewer.erl | |
| parent | d6b30f44ea610355dab47024acdcb9fc597f96cb (diff) | |
| parent | f51d3ce81c1314d06b76975d9d06bf2b22925a89 (diff) | |
| download | otp-5b9ffc724e7c3ffe7c775b5113de059e2e25f755.tar.gz otp-5b9ffc724e7c3ffe7c775b5113de059e2e25f755.tar.bz2 otp-5b9ffc724e7c3ffe7c775b5113de059e2e25f755.zip | |
Merge branch 'siri/cdv-bugs/OTP-11650'
* siri/cdv-bugs/OTP-11650:
Improve crashdump_viewer_SUITE:start_stop test case
Fix crash in crashdump_viewer when node has multiple creations
Change spawn/1 + monitor/2 to spawn_monitor/1 to avoid deadlock
Diffstat (limited to 'lib/observer/src/crashdump_viewer.erl')
| -rw-r--r-- | lib/observer/src/crashdump_viewer.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl index a17efbccb0..a08d27d070 100644 --- a/lib/observer/src/crashdump_viewer.erl +++ b/lib/observer/src/crashdump_viewer.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2013. All Rights Reserved. +%% Copyright Ericsson AB 2003-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1576,7 +1576,13 @@ get_nodeinfo(Fd,Nod) -> "Controller" -> get_nodeinfo(Fd,Nod#nod{controller=val(Fd)}); "Creation" -> - get_nodeinfo(Fd,Nod#nod{creation=list_to_integer(val(Fd))}); + %% Throwing away elements like "(refc=1)", which might be + %% printed from a debug compiled emulator. + Creations = lists:flatmap(fun(C) -> try [list_to_integer(C)] + catch error:badarg -> [] + end + end, string:tokens(val(Fd)," ")), + get_nodeinfo(Fd,Nod#nod{creation={creations,Creations}}); "Remote link" -> Procs = val(Fd), % e.g. "<0.31.0> <4322.54.0>" {Local,Remote} = split(Procs), @@ -2559,11 +2565,11 @@ progress_pmap(Report,File,Fun,List) -> {L1,L2} = if length(L)>=NPerProc -> lists:split(NPerProc,L); true -> {L,[]} % last chunk end, - P = spawn( + {P,_Ref} = + spawn_monitor( fun() -> progress_map(Collector,ReportInterval,File,Fun,L1) end), - erlang:monitor(process,P), {L2,[P|Ps]} end, {List,[]}, |