Merge branch 'egil/runtime_tools/cuddle-tests'

* egil/runtime_tools/cuddle-tests:
  runtime_tools: Cuddle with dbg_SUITE
  runtime_tools: Remove obsolete debug info in dbg_SUITE
  runtime_tools: Use 'infinity' gen_server calls

2 files changed, 33 insertions, 43 deletions

diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl
index ad7ee7311c..1add01612d 100644
--- a/lib/runtime_tools/src/system_information.erl
+++ b/lib/runtime_tools/src/system_information.erl
@@ -28,31 +28,25 @@
 -behaviour(gen_server).
 
 %% API
--export([
-	report/0,
+-export([report/0,
 	from_file/1,
-	to_file/1
-    ]).
--export([
-	start/0, stop/0,
-	load_report/0, load_report/2,
-	applications/0, applications/1,
-	application/1, application/2,
-	environment/0, environment/1,
-	module/1, module/2,
-	modules/1,
-	sanity_check/0
-    ]).
+	to_file/1]).
+-export([start/0, stop/0,
+         load_report/0, load_report/2,
+         applications/0, applications/1,
+         application/1, application/2,
+         environment/0, environment/1,
+         module/1, module/2,
+         modules/1,
+         sanity_check/0]).
 
 %% gen_server callbacks
--export([
-	init/1,
-	handle_call/3,
-	handle_cast/2,
-	handle_info/2,
-	terminate/2,
-	code_change/3
-    ]).
+-export([init/1,
+         handle_call/3,
+         handle_cast/2,
+         handle_info/2,
+         terminate/2,
+         code_change/3]).
 
 -define(SERVER, ?MODULE).
 
@@ -71,13 +65,13 @@ start() ->
     gen_server:start({local, ?SERVER}, ?MODULE, [], []).
 
 stop() ->
-    gen_server:call(?SERVER, stop).
+    gen_server:call(?SERVER, stop, infinity).
 
 load_report() -> load_report(data, report()).
 
 load_report(file, File)   -> load_report(data, from_file(File));
 load_report(data, Report) ->
-    start(), gen_server:call(?SERVER, {load_report, Report}).
+    start(), gen_server:call(?SERVER, {load_report, Report}, infinity).
 
 report() -> [
 	{init_arguments,    init:get_arguments()},
@@ -120,22 +114,22 @@ from_file(File) ->
 
 applications() -> applications([]).
 applications(Opts) when is_list(Opts) ->
-    gen_server:call(?SERVER, {applications, Opts}).
+    gen_server:call(?SERVER, {applications, Opts}, infinity).
 
 application(App) when is_atom(App) -> application(App, []).
 application(App, Opts) when is_atom(App), is_list(Opts) ->
-    gen_server:call(?SERVER, {application, App, Opts}).
+    gen_server:call(?SERVER, {application, App, Opts}, infinity).
 
 environment() -> environment([]).
 environment(Opts) when is_list(Opts) ->
-    gen_server:call(?SERVER, {environment, Opts}).
+    gen_server:call(?SERVER, {environment, Opts}, infinity).
 
 module(M) when is_atom(M) -> module(M, []).
 module(M, Opts) when is_atom(M), is_list(Opts) ->
-    gen_server:call(?SERVER, {module, M, Opts}).
+    gen_server:call(?SERVER, {module, M, Opts}, infinity).
 
 modules(Opt) when is_atom(Opt) ->
-    gen_server:call(?SERVER, {modules, Opt}).
+    gen_server:call(?SERVER, {modules, Opt}, infinity).
 
 
 -spec sanity_check() -> ok | {failed, Failures} when
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index 9c9d6ca352..6b6e35fc31 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -447,12 +447,6 @@ file_port_schedfix1(Config) when is_list(Config) ->
     %%
     {ok,[{matched,_,_}]} = dbg:p(all, [clear]),
     stop(),
-    % Some debug code to run on all platforms, for finding the fault on genny
-    % Dont touch please /PaN
-    io:format("Trace dump by PaN BEGIN~n"),
-    dbg:trace_client(file,{FName, wrap, ".wraplog"},{fun(end_of_trace,Pid)-> Pid ! done; (Mesg,Pid) -> io:format("~w~n",[Mesg]),Pid end,self()}),
-    receive done -> ok end,
-    io:format("Trace dump by PaN END~n"),
     %%
     %% Get the trace result
     %%
@@ -473,14 +467,12 @@ file_port_schedfix1(Config) when is_list(Config) ->
     %%
     %% Analyze the result
     %%
-    {Min, Max} =
-    lists:foldl(
-      fun({_Pid, M}, {Mi, Ma}) ->
-              {if M < Mi -> M; true -> Mi end,
-               if M > Ma -> M; true -> Ma end}
-      end,
-      {void, 0},
-      Result),
+    {Min, Max} = lists:foldl(fun({_Pid, M}, {Mi, Ma}) ->
+                                     {if M < Mi -> M; true -> Mi end,
+                                      if M > Ma -> M; true -> Ma end}
+                             end,
+                             {void, 0},
+                             Result),
     % More PaN debug
     io:format("Min = ~f, Max = ~f~n",[Min,Max]),
     %%
@@ -895,6 +887,10 @@ schedstat_handler(TraceMsg, {Parent, Tag, Data} = State) ->
                     Data
             end,
             {Parent, Tag, NewData};
+        {trace_ts,_Pid,spawned,_OtherPid,_,_Ts} ->
+            State;
+        {trace_ts,_Pid,getting_linked,_OtherPid,_Ts} ->
+            State;
         {trace_ts, Pid, exit, normal, {A3, B3, C3}} ->
             NewData =
             case lists:keysearch(Pid, 1, Data) of