Print sys:log in error report

8 files changed, 158 insertions, 65 deletions

diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index caaaf8fa2e..2e6721e2a1 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -610,16 +610,17 @@ terminate(Reason, Name, Msg, Mod, StateName, StateData, Debug) ->
     end.
 
 error_info(Reason, Name, Msg, StateName, StateData, Debug) ->
+    Log = [{Event, State} || {Event, State, _FormFunc} <- sys:get_log(Debug)],
     ?LOG_ERROR(#{label=>{gen_fsm,terminate},
                  name=>Name,
                  last_message=>Msg,
                  state_name=>StateName,
                  state_data=>StateData,
+                 log=>Log,
                  reason=>Reason},
                #{domain=>[otp],
                  report_cb=>fun gen_fsm:format_log/1,
                  error_logger=>#{tag=>error}}),
-    sys:print_log(Debug),
     ok.
 
 format_log(#{label:={gen_fsm,terminate},
@@ -627,6 +628,7 @@ format_log(#{label:={gen_fsm,terminate},
              last_message:=Msg,
              state_name:=StateName,
              state_data:=StateData,
+             log:=Log,
              reason:=Reason}) ->
     Reason1 = 
 	case Reason of
@@ -645,12 +647,21 @@ format_log(#{label:={gen_fsm,terminate},
 	    _ ->
 		Reason
 	end,
+    LimitedLog = [error_logger:limit_term(D) || D <- Log],
     {"** State machine ~tp terminating \n" ++
          get_msg_str(Msg) ++
      "** When State == ~tp~n"
      "**      Data  == ~tp~n"
-     "** Reason for termination = ~n** ~tp~n",
-     [Name, get_msg(Msg), StateName, StateData, Reason1]};
+     "** Reason for termination ==~n** ~tp~n" ++
+         case LimitedLog of
+             [] -> [];
+             _ -> "** Log ==~n** ~tp~n"
+         end,
+     [Name, get_msg(Msg), StateName, StateData, Reason1 |
+      case LimitedLog of
+          [] -> [];
+          _ -> [LimitedLog]
+      end]};
 format_log(#{label:={gen_fsm,no_handle_info},
              module:=Mod,
              message:=Msg}) ->
@@ -689,7 +700,7 @@ format_status(Opt, StatusData) ->
 	StatusData,
     Header = gen:format_status_header("Status for state machine",
                                       Name),
-    Log = sys:get_debug(log, Debug, []),
+    Log = [{Ev, St} || {Ev, St, _FormFunc} <- sys:get_log(Debug)],
     Specfic = format_status(Opt, Mod, PDict, StateData),
     Specfic = case format_status(Opt, Mod, PDict, StateData) of
 		  S when is_list(S) -> S;
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 44e9231ebe..7de62eaf01 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -885,16 +885,17 @@ error_info(_Reason, application_controller, _From, _Msg, _Mod, _State, _Debug) -
     %% of it instead
     ok;
 error_info(Reason, Name, From, Msg, Mod, State, Debug) ->
+    Log = [{Ev, St} || {Ev, St, _FormFunc} <- sys:get_log(Debug)],
     ?LOG_ERROR(#{label=>{gen_server,terminate},
                  name=>Name,
                  last_message=>Msg,
                  state=>format_status(terminate, Mod, get(), State),
+                 log=>Log,
                  reason=>Reason,
                  client_info=>client_stacktrace(From)},
                #{domain=>[otp],
                  report_cb=>fun gen_server:format_log/1,
                  error_logger=>#{tag=>error}}),
-    sys:print_log(Debug),
     ok.
 
 client_stacktrace(undefined) ->
@@ -917,6 +918,7 @@ format_log(#{label:={gen_server,terminate},
              name:=Name,
              last_message:=Msg,
              state:=State,
+             log:=Log,
              reason:=Reason,
              client_info:=Client}) ->
     Reason1 = 
@@ -937,11 +939,21 @@ format_log(#{label:={gen_server,terminate},
 		error_logger:limit_term(Reason)
 	end,    
     {ClientFmt,ClientArgs} = format_client_log(Client),
+    [LimitedState|LimitedLog] =
+        [error_logger:limit_term(D) || D <- [State|Log]],
     {"** Generic server ~tp terminating \n"
      "** Last message in was ~tp~n"
      "** When Server state == ~tp~n"
-     "** Reason for termination == ~n** ~tp~n" ++ ClientFmt,
-     [Name, Msg, error_logger:limit_term(State), Reason1] ++ ClientArgs};
+     "** Reason for termination ==~n** ~tp~n" ++
+         case LimitedLog of
+             [] -> [];
+             _ -> "** Log ==~n** ~tp~n"
+         end ++ ClientFmt,
+     [Name, Msg, LimitedState, Reason1] ++
+         case LimitedLog of
+             [] -> [];
+             _ -> [LimitedLog]
+         end ++ ClientArgs};
 format_log(#{label:={gen_server,no_handle_info},
              module:=Mod,
              message:=Msg}) ->
@@ -966,7 +978,7 @@ format_client_log({_From,{Name,Stacktrace}}) ->
 format_status(Opt, StatusData) ->
     [PDict, SysState, Parent, Debug, [Name, State, Mod, _Time, _HibernateAfterTimeout]] = StatusData,
     Header = gen:format_status_header("Status for generic server", Name),
-    Log = sys:get_debug(log, Debug, []),
+    Log = [{Ev, St} || {Ev, St, _FormFunc} <- sys:get_log(Debug)],
     Specfic = case format_status(Opt, Mod, PDict, State) of
 		  S when is_list(S) -> S;
 		  S -> [S]
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 24b268cd38..016665ef35 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -586,7 +586,12 @@ enter_loop(Module, Opts, State, Data, Server_or_Actions) ->
 enter_loop(Module, Opts, State, Data, Server, Actions) ->
     is_atom(Module) orelse error({atom,Module}),
     Parent = gen:get_parent(),
-    enter(Module, Opts, State, Data, Server, Actions, Parent).
+    Name = gen:get_proc_name(Server),
+    Debug = gen:debug_options(Name, Opts),
+    HibernateAfterTimeout = gen:hibernate_after(Opts),
+    enter(
+      Parent, Debug, Module, Name, HibernateAfterTimeout,
+      State, Data, Actions).
 
 %%---------------------------------------------------------------------------
 %% API helpers
@@ -658,11 +663,10 @@ send(Proc, Msg) ->
     ok.
 
 %% Here the init_it/6 and enter_loop/5,6,7 functions converge
-enter(Module, Opts, State, Data, Server, Actions, Parent) ->
+enter(
+  Parent, Debug, Module, Name, HibernateAfterTimeout,
+  State, Data, Actions) ->
     %% The values should already have been type checked
-    Name = gen:get_proc_name(Server),
-    Debug = gen:debug_options(Name, Opts),
-    HibernateAfterTimeout = gen:hibernate_after(Opts),
     Events = [],
     Event = {internal,init_state},
     %% We enforce {postpone,false} to ensure that
@@ -695,18 +699,24 @@ enter(Module, Opts, State, Data, Server, Actions, Parent) ->
 init_it(Starter, self, ServerRef, Module, Args, Opts) ->
     init_it(Starter, self(), ServerRef, Module, Args, Opts);
 init_it(Starter, Parent, ServerRef, Module, Args, Opts) ->
+    Name = gen:get_proc_name(ServerRef),
+    Debug = gen:debug_options(Name, Opts),
+    HibernateAfterTimeout = gen:hibernate_after(Opts),
     try Module:init(Args) of
 	Result ->
-	    init_result(Starter, Parent, ServerRef, Module, Result, Opts)
+	    init_result(
+              Starter, Parent, ServerRef, Module, Result,
+              Name, Debug, HibernateAfterTimeout)
     catch
 	Result ->
-	    init_result(Starter, Parent, ServerRef, Module, Result, Opts);
+	    init_result(
+              Starter, Parent, ServerRef, Module, Result,
+              Name, Debug, HibernateAfterTimeout);
 	Class:Reason:Stacktrace ->
-	    Name = gen:get_proc_name(ServerRef),
 	    gen:unregister_name(ServerRef),
 	    proc_lib:init_ack(Starter, {error,Reason}),
 	    error_info(
-	      Class, Reason, Stacktrace,
+	      Class, Reason, Stacktrace, Debug,
 	      #state{name = Name},
 	      []),
 	    erlang:raise(Class, Reason, Stacktrace)
@@ -715,14 +725,20 @@ init_it(Starter, Parent, ServerRef, Module, Args, Opts) ->
 %%---------------------------------------------------------------------------
 %% gen callbacks helpers
 
-init_result(Starter, Parent, ServerRef, Module, Result, Opts) ->
+init_result(
+  Starter, Parent, ServerRef, Module, Result,
+  Name, Debug, HibernateAfterTimeout) ->
     case Result of
 	{ok,State,Data} ->
 	    proc_lib:init_ack(Starter, {ok,self()}),
-	    enter(Module, Opts, State, Data, ServerRef, [], Parent);
+            enter(
+              Parent, Debug, Module, Name, HibernateAfterTimeout,
+              State, Data, []);
 	{ok,State,Data,Actions} ->
 	    proc_lib:init_ack(Starter, {ok,self()}),
-	    enter(Module, Opts, State, Data, ServerRef, Actions, Parent);
+            enter(
+              Parent, Debug, Module, Name, HibernateAfterTimeout,
+              State, Data, Actions);
 	{stop,Reason} ->
 	    gen:unregister_name(ServerRef),
 	    proc_lib:init_ack(Starter, {error,Reason}),
@@ -732,12 +748,11 @@ init_result(Starter, Parent, ServerRef, Module, Result, Opts) ->
 	    proc_lib:init_ack(Starter, ignore),
 	    exit(normal);
 	_ ->
-	    Name = gen:get_proc_name(ServerRef),
 	    gen:unregister_name(ServerRef),
 	    Error = {bad_return_from_init,Result},
 	    proc_lib:init_ack(Starter, {error,Error}),
 	    error_info(
-	      error, Error, ?STACKTRACE(),
+	      error, Error, ?STACKTRACE(), Debug,
 	      #state{name = Name},
 	      []),
 	    exit(Error)
@@ -792,7 +807,7 @@ format_status(
   [PDict,SysState,Parent,Debug,
    #state{name = Name, postponed = P} = S]) ->
     Header = gen:format_status_header("Status for state machine", Name),
-    Log = sys:get_debug(log, Debug, []),
+    Log = [{Event, State} || {Event, State, _FormFunc} <- sys:get_log(Debug)],
     [{header,Header},
      {data,
       [{"Status",SysState},
@@ -1877,8 +1892,7 @@ terminate(
 	    catch
 		_ -> ok;
 		C:R:ST ->
-		    error_info(C, R, ST, S, Q),
-		    sys:print_log(Debug),
+		    error_info(C, R, ST, Debug, S, Q),
 		    erlang:raise(C, R, ST)
 	    end;
 	false ->
@@ -1893,8 +1907,7 @@ terminate(
 	    {shutdown,_} ->
                 terminate_sys_debug(Debug, S, State, Reason);
 	    _ ->
-		error_info(Class, Reason, Stacktrace, S, Q),
-		sys:print_log(Debug)
+		error_info(Class, Reason, Stacktrace, Debug, S, Q)
 	end,
     case Stacktrace of
 	[] ->
@@ -1908,13 +1921,14 @@ terminate_sys_debug(Debug, S, State, Reason) ->
 
 
 error_info(
-  Class, Reason, Stacktrace,
+  Class, Reason, Stacktrace, Debug,
   #state{
      name = Name,
      callback_mode = CallbackMode,
      state_enter = StateEnter,
      postponed = P} = S,
   Q) ->
+    Log = [{Ev, St} || {Ev, St, _FormFunc} <- sys:get_log(Debug)],
     ?LOG_ERROR(#{label=>{gen_statem,terminate},
                  name=>Name,
                  queue=>Q,
@@ -1922,6 +1936,7 @@ error_info(
                  callback_mode=>CallbackMode,
                  state_enter=>StateEnter,
                  state=>format_status(terminate, get(), S),
+                 log=>Log,
                  reason=>{Class,Reason,Stacktrace}},
                #{domain=>[otp],
                  report_cb=>fun gen_statem:format_log/1,
@@ -1934,6 +1949,7 @@ format_log(#{label:={gen_statem,terminate},
              callback_mode:=CallbackMode,
              state_enter:=StateEnter,
              state:=FmtData,
+             log:=Log,
              reason:={Class,Reason,Stacktrace}}) ->
     {FixedReason,FixedStacktrace} =
 	case Stacktrace of
@@ -1960,8 +1976,8 @@ format_log(#{label:={gen_statem,terminate},
 		end;
 	    _ -> {Reason,Stacktrace}
 	end,
-    [LimitedP, LimitedFmtData, LimitedFixedReason] =
-        [error_logger:limit_term(D) || D <- [P, FmtData, FixedReason]],
+    [LimitedP, LimitedFmtData, LimitedFixedReason | LimitedLog] =
+        [error_logger:limit_term(D) || D <- [P, FmtData, FixedReason | Log]],
     CBMode =
 	 case StateEnter of
 	     true ->
@@ -1988,6 +2004,10 @@ format_log(#{label:={gen_statem,terminate},
          case FixedStacktrace of
              [] -> "";
              _ -> "** Stacktrace =~n**  ~tp~n"
+         end ++
+         case LimitedLog of
+             [] -> "";
+             _ -> "** Log =~n**  ~tp~n"
          end,
      [Name |
       case Q of
@@ -2008,6 +2028,10 @@ format_log(#{label:={gen_statem,terminate},
          case FixedStacktrace of
              [] -> [];
              _ -> [FixedStacktrace]
+         end ++
+         case LimitedLog of
+             [] -> [];
+             _ -> [LimitedLog]
          end}.
 
 %% Call Module:format_status/2 or return a default value
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index 8e12b3ff8d..6775dfe933 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -30,7 +30,7 @@
 	 log_to_file/2, log_to_file/3, no_debug/1, no_debug/2,
 	 install/2, install/3, remove/2, remove/3]).
 -export([handle_system_msg/6, handle_system_msg/7, handle_debug/4,
-	 print_log/1, get_debug/3, debug_options/1, suspend_loop_hib/6]).
+	 print_log/1, get_log/1, get_debug/3, debug_options/1, suspend_loop_hib/6]).
 
 %%-----------------------------------------------------------------
 %% Types
@@ -635,6 +635,12 @@ print_log(Debug) ->
     NLog = get_debug(log, Debug, nlog_new()),
     lists:foreach(fun print_event/1, nlog_get(NLog)).
     
+-spec get_log(Debug) -> [system_event()] when
+      Debug :: [dbg_opt()].
+get_log(Debug) ->
+    NLog = get_debug(log, Debug, nlog_new()),
+    nlog_get(NLog).
+    
 close_log_file(Debug) ->
     case get_debug2(log_to_file, Debug, []) of
 	[] ->
diff --git a/lib/stdlib/test/gen_statem_SUITE.erl b/lib/stdlib/test/gen_statem_SUITE.erl
index 017939fdd6..16cf8f43f9 100644
--- a/lib/stdlib/test/gen_statem_SUITE.erl
+++ b/lib/stdlib/test/gen_statem_SUITE.erl
@@ -513,7 +513,9 @@ abnormal1dirty(Config) ->
 %% trap exit since we must link to get the real bad_return_ error
 abnormal2(Config) ->
     OldFl = process_flag(trap_exit, true),
-    {ok,Pid} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+    {ok,Pid} =
+        gen_statem:start_link(
+          ?MODULE, start_arg(Config, []), [{debug,[log]}]),
 
     %% bad return value in the gen_statem loop
     {{{bad_return_from_state_function,badreturn},_},_} =
@@ -531,7 +533,9 @@ abnormal2(Config) ->
 %% trap exit since we must link to get the real bad_return_ error
 abnormal3(Config) ->
     OldFl = process_flag(trap_exit, true),
-    {ok,Pid} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+    {ok,Pid} =
+        gen_statem:start_link(
+          ?MODULE, start_arg(Config, []), [{debug,[log]}]),
 
     %% bad return value in the gen_statem loop
     {{{bad_action_from_state_function,badaction},_},_} =
@@ -549,7 +553,9 @@ abnormal3(Config) ->
 %% trap exit since we must link to get the real bad_return_ error
 abnormal4(Config) ->
     OldFl = process_flag(trap_exit, true),
-    {ok,Pid} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+    {ok,Pid} =
+        gen_statem:start_link(
+          ?MODULE, start_arg(Config, []), [{debug,[log]}]),
 
     %% bad return value in the gen_statem loop
     BadTimeout = {badtimeout,4711,ouch},
@@ -689,7 +695,10 @@ state_enter(_Config) ->
 	      end},
     {ok,STM} =
 	gen_statem:start_link(
-	  ?MODULE, {map_statem,Machine,[state_enter]}, [{debug,[trace]}]),
+	  ?MODULE, {map_statem,Machine,[state_enter]},
+          [{debug,[trace,{log,17}]}]),
+    ok = sys:log(STM, false),
+    ok = sys:log(STM, true),
 
     [{1,enter,start,start}] = flush(),
     {2,echo,start} = gen_statem:call(STM, echo),
@@ -708,6 +717,11 @@ state_enter(_Config) ->
      {13,internal,start,wait}] = flush(),
     {14,repeat,start} = gen_statem:call(STM, repeat),
     [{15,enter,start,start}] = flush(),
+
+    {ok,Log} = sys:log(STM, get),
+    io:format("sys:log ~p~n", [Log]),
+    ok = sys:log(STM, print),
+
     {16,stop} = gen_statem:call(STM, {stop,bye}),
     [{'EXIT',STM,bye}] = flush(),
 
@@ -1470,7 +1484,8 @@ enter_loop(_Config) ->
 
     %% Locally registered process + {local,Name}
     {ok,Pid1a} =
-	proc_lib:start_link(?MODULE, enter_loop, [local,local]),
+	proc_lib:start_link(
+          ?MODULE, enter_loop, [local,local,[{debug,[{log,7}]}]]),
     yes = gen_statem:call(Pid1a, 'alive?'),
     stopped = gen_statem:call(Pid1a, stop),
     receive
@@ -1482,7 +1497,8 @@ enter_loop(_Config) ->
 
     %% Unregistered process + {local,Name}
     {ok,Pid1b} =
-	proc_lib:start_link(?MODULE, enter_loop, [anon,local]),
+	proc_lib:start_link(
+          ?MODULE, enter_loop, [anon,local,[{debug,[log]}]]),
     receive
 	{'EXIT',Pid1b,process_not_registered} ->
 	    ok
@@ -1591,6 +1607,9 @@ enter_loop(_Config) ->
     ok = verify_empty_msgq().
 
 enter_loop(Reg1, Reg2) ->
+    enter_loop(Reg1, Reg2, []).
+%%
+enter_loop(Reg1, Reg2, Opts) ->
     process_flag(trap_exit, true),
     case Reg1 of
 	local -> register(armitage, self());
@@ -1602,15 +1621,15 @@ enter_loop(Reg1, Reg2) ->
     case Reg2 of
 	local ->
 	    gen_statem:enter_loop(
-	      ?MODULE, [], state0, [], {local,armitage});
+	      ?MODULE, Opts, state0, [], {local,armitage});
 	global ->
 	    gen_statem:enter_loop(
-	      ?MODULE, [], state0, [], {global,armitage});
+	      ?MODULE, Opts, state0, [], {global,armitage});
 	via ->
 	    gen_statem:enter_loop(
-	      ?MODULE, [], state0, [], {via, dummy_via, armitage});
+	      ?MODULE, Opts, state0, [], {via, dummy_via, armitage});
 	anon ->
-	    gen_statem:enter_loop(?MODULE, [], state0, [])
+	    gen_statem:enter_loop(?MODULE, Opts, state0, [])
     end.
 
 undef_code_change(_Config) ->
@@ -1642,7 +1661,9 @@ undef_terminate2(_Config) ->
 
 undef_in_terminate(_Config) ->
     Data =  {undef_in_terminate, {?MODULE, terminate}},
-    {ok, Statem} = gen_statem:start(?MODULE, {data, Data}, []),
+    {ok, Statem} =
+        gen_statem:start(
+          ?MODULE, {data, Data}, [{debug,[log]}]),
     try
         gen_statem:stop(Statem),
         ct:fail(should_crash)
diff --git a/lib/stdlib/test/stdlib_bench_SUITE.erl b/lib/stdlib/test/stdlib_bench_SUITE.erl
index b937eeb06a..f409d683f4 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE.erl
+++ b/lib/stdlib/test/stdlib_bench_SUITE.erl
@@ -65,9 +65,9 @@ cases(gen_server) ->
       [simple, simple_timer, simple_mon, simple_timer_mon,
        generic, generic_timer];
 cases(gen_statem) ->
-    [generic, generic_fsm, generic_fsm_transit,
-     generic_statem, generic_statem_transit,
-     generic_statem_complex].
+    [generic, generic_log, generic_log100, generic_fsm, generic_fsm_transit,
+     generic_statem, generic_statem_log, generic_statem_log100,
+     generic_statem_transit, generic_statem_complex].
 
 init_per_group(gen_server, Config) ->
     compile_servers(Config),
@@ -290,12 +290,24 @@ simple_timer_mon(Config) when is_list(Config) ->
 generic(Config) when is_list(Config) ->
     comment(do_tests(generic, single_small, Config)).
 
+generic_log(Config) when is_list(Config) ->
+    comment(do_tests(generic_log, single_small, Config)).
+
+generic_log100(Config) when is_list(Config) ->
+    comment(do_tests(generic_log100, single_small, Config)).
+
 generic_timer(Config) when is_list(Config) ->
     comment(do_tests(generic_timer, single_small, Config)).
 
 generic_statem(Config) when is_list(Config) ->
     comment(do_tests(generic_statem, single_small, Config)).
 
+generic_statem_log(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem_log, single_small, Config)).
+
+generic_statem_log100(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem_log100, single_small, Config)).
+
 generic_statem_transit(Config) when is_list(Config) ->
     comment(do_tests(generic_statem_transit, single_small, Config)).
 
@@ -367,9 +379,9 @@ norm(T, Ref) ->
 
 do_tests(Test, ParamSet, Config) ->
     BenchmarkSuite = ?config(benchmark_suite, Config),
-    {Client, ServerMod} = bench(Test),
+    {Client, ServerMod, ServerArg} = bench(Test),
     {Parallelism, Message} = bench_params(ParamSet),
-    Fun = create_clients(Message, ServerMod, Client, Parallelism),
+    Fun = create_clients(Message, ServerMod, ServerArg, Client, Parallelism),
     {TotalLoops, AllPidTime} = run_test(Fun),
     try ?CALLS_PER_LOOP * round((1000 * TotalLoops) / AllPidTime) of
         PerSecond ->
@@ -484,27 +496,35 @@ generic_fsm_transit_client(N, M, P) ->
     generic_fsm_transit_client(N+1, M, P).
 
 bench(simple) ->
-    {fun simple_client/3, simple_server};
+    {fun simple_client/3, simple_server, term};
 bench(simple_timer) ->
-    {fun simple_client_timer/3, simple_server_timer};
+    {fun simple_client_timer/3, simple_server_timer, term};
 bench(simple_mon) ->
-    {fun simple_client_mon/3, simple_server_mon};
+    {fun simple_client_mon/3, simple_server_mon, term};
 bench(simple_timer_mon) ->
-    {fun simple_client_timer_mon/3, simple_server_timer_mon};
+    {fun simple_client_timer_mon/3, simple_server_timer_mon, term};
 bench(generic) ->
-    {fun generic_client/3, generic_server};
+    {fun generic_client/3, generic_server, [term]};
+bench(generic_log) ->
+    {fun generic_client/3, generic_server, [term,{debug,[log]}]};
+bench(generic_log100) ->
+    {fun generic_client/3, generic_server, [term,{debug,[{log,100}]}]};
 bench(generic_timer) ->
-    {fun generic_timer_client/3, generic_server_timer};
+    {fun generic_timer_client/3, generic_server_timer, term};
 bench(generic_statem) ->
-    {fun generic_statem_client/3, generic_statem};
+    {fun generic_statem_client/3, generic_statem, [term]};
+bench(generic_statem_log) ->
+    {fun generic_statem_client/3, generic_statem, [term,{debug,[log]}]};
+bench(generic_statem_log100) ->
+    {fun generic_statem_client/3, generic_statem, [term,{debug,[{log,100}]}]};
 bench(generic_statem_transit) ->
-    {fun generic_statem_transit_client/3, generic_statem};
+    {fun generic_statem_transit_client/3, generic_statem, [term]};
 bench(generic_statem_complex) ->
-    {fun generic_statem_complex_client/3, generic_statem_complex};
+    {fun generic_statem_complex_client/3, generic_statem_complex, term};
 bench(generic_fsm) ->
-    {fun generic_fsm_client/3, generic_fsm};
+    {fun generic_fsm_client/3, generic_fsm, term};
 bench(generic_fsm_transit) ->
-    {fun generic_fsm_transit_client/3, generic_fsm}.
+    {fun generic_fsm_transit_client/3, generic_fsm, term}.
 
 %% -> {Parallelism, MessageTerm}
 bench_params(single_small) -> {1, small()};
@@ -532,10 +552,9 @@ parallelism() ->
         _ -> 1
     end.
 
-create_clients(M, ServerMod, Client, Parallel) ->
+create_clients(M, ServerMod, ServerArg, Client, Parallel) ->
     fun() ->
-            State = term,
-            ServerPid = ServerMod:start(State),
+            ServerPid = ServerMod:start(ServerArg),
             PidRefs = [spawn_monitor(fun() -> Client(0, M, ServerPid) end) ||
                           _ <- lists:seq(1, Parallel)],
             timer:sleep(?MAX_TIME),
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
index abd61dcdef..3707d00dee 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
@@ -8,8 +8,8 @@
 
 -define(GEN_SERVER, gen_server).
 
-start(State) ->
-    {ok, Pid} = ?GEN_SERVER:start(?MODULE, State, []),
+start([State|Opts]) ->
+    {ok, Pid} = ?GEN_SERVER:start(?MODULE, State, Opts),
     Pid.
 
 init(State) ->
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
index 2e0491f060..cfeb974abd 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
@@ -28,8 +28,8 @@
 
 %% API
 
-start(Data) ->
-    {ok, Pid} = gen_statem:start(?MODULE, Data, []),
+start([Data|Opts]) ->
+    {ok, Pid} = gen_statem:start(?MODULE, Data, Opts),
     Pid.
 
 stop(P) ->