erts: Expand trace tests for refc binaries

Make sure to cover all of the refc binary cases in tracing

4 files changed, 34 insertions, 17 deletions

diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index ba557ab20e..32d0ba9f4c 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -1860,6 +1860,8 @@ trace_port_receive(Port *t_p, Eterm caller, Eterm what, ...)
         }
 
         data = TUPLE2(hp, caller, data);
+        hp += 3;
+        ASSERT(hp <= (local_heap + LOCAL_HEAP_SIZE) || orig_hp);
         send_to_tracer_nif(NULL, &t_p->common, t_p->common.id, tnif,
                            am_receive, data, THE_NON_VALUE);
 
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index ea973276db..6733237b20 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -597,16 +597,15 @@ ms_trace3(Config) when is_list(Config) ->
       end),
     ok.
 
-ms_trace_dead(doc) ->
-    ["Test that a dead tracer is removed using ms"];
-ms_trace_dead(suite) -> [];
-ms_trace_dead(Config) when is_list(Config) ->
+%% Test that a dead tracer is removed using ms
+ms_trace_dead(_Config) ->
     Self = self(),
     TFun = fun F() -> receive M -> Self ! M, F() end end,
     {Tracer, MRef} = spawn_monitor(TFun),
     MetaTracer = spawn_link(TFun),
     erlang:trace_pattern({?MODULE, f1, '_'},
-                         [{'_',[],[{trace,[],
+                         [{'_',[],[{message, false},
+                                   {trace,[],
                                     [call,{const,{tracer,Tracer}}]}]}],
                          [{meta, MetaTracer}]),
     erlang:trace_pattern({?MODULE, f2, '_'}, []),
@@ -623,8 +622,6 @@ ms_trace_dead(Config) when is_list(Config) ->
     ?MODULE:f2(3,4),
     TRef = erlang:trace_delivered(all),
     receive {trace_delivered, _, TRef} -> ok end,
-    receive {trace_ts, Self, call, {?MODULE, f1, _}, _} -> ok end,
-    receive {trace_ts, Self, call, {?MODULE, f1, _}, _} -> ok end,
     receive M -> ct:fail({unexpected, M}) after 10 -> ok end.
 
 %% Test that destructive operations in test bif does not really happen
diff --git a/erts/emulator/test/port_trace_SUITE.erl b/erts/emulator/test/port_trace_SUITE.erl
index 41e8a316c4..bfdea0761b 100644
--- a/erts/emulator/test/port_trace_SUITE.erl
+++ b/erts/emulator/test/port_trace_SUITE.erl
@@ -240,19 +240,23 @@ command(Config) ->
     Prt ! {S, {command, <<?ECHO_DRV_NOOP:8>>}},
     [{trace, Prt, 'receive', {S, {command, <<?ECHO_DRV_NOOP:8>>}}}] = flush(),
 
+    OutputMsg = <<?ECHO_DRV_NOOP:8,0:(8*512)>>,
+    Prt ! {S, {command, OutputMsg}},
+    [{trace, Prt, 'receive', {S, {command, OutputMsg}}}] = flush(),
+
     close(Prt, Flags),
 
     os:putenv("OUTPUTV","true"),
     reload_drv(Config),
 
     Prt2 = erlang:open_port({spawn, echo_drv}, [binary]),
-    Msg = [<<0:8>>,<<0:(8*512)>>,<<0:(8*256)>>,<<0:8>>],
+    OutputvMsg = [<<0:8>>,<<0:(8*512)>>,<<0:(8*256)>>,<<0:8>>],
 
-    erlang:port_command(Prt2, Msg),
-    [{trace, Prt2, 'receive', {S, {command, Msg}}}] = flush(),
+    erlang:port_command(Prt2, OutputvMsg),
+    [{trace, Prt2, 'receive', {S, {command, OutputvMsg}}}] = flush(),
 
-    Prt2 ! {S, {command, Msg}},
-    [{trace, Prt2, 'receive', {S, {command, Msg}}}] = flush(),
+    Prt2 ! {S, {command, OutputvMsg}},
+    [{trace, Prt2, 'receive', {S, {command, OutputvMsg}}}] = flush(),
 
     close(Prt2, Flags),
 
@@ -274,6 +278,12 @@ control(_Config) ->
     [{trace, Prt, 'receive', {S, {control, {(1 bsl 32) - 1, <<?ECHO_DRV_NOOP:8, 0:8>>}}}},
      {trace, Prt, send, {Prt, {control, <<0:8>>}}, S}] = flush(),
 
+    Msg = <<?ECHO_DRV_NOOP:8, 0:(8*512)>>,
+    Pat = lists:duplicate(512, 0),
+    Pat = erlang:port_control(Prt, 1, Msg),
+    [{trace, Prt, 'receive', {S, {control, {1, Msg}}}},
+     {trace, Prt, send, {Prt, {control, <<0:(8*512)>>}}, S}] = flush(),
+
     close(Prt, Flags),
 
     ok.
@@ -331,12 +341,16 @@ call(_Config) ->
     Flags = [send,'receive'],
     {Prt, S} = trace_and_open(Flags,[binary]),
 
-    Msg = {hello, world, make_ref()},
-    BinMsg = term_to_binary(Msg),
+    Test = fun(Msg) ->
+                   BinMsg = term_to_binary(Msg),
+
+                   Msg = erlang:port_call(Prt, 0, Msg),
+                   [{trace, Prt, 'receive', {S, {call, {0, BinMsg}}}},
+                    {trace, Prt, send, {Prt, {call, BinMsg}}, S}] = flush()
+           end,
 
-    Msg = erlang:port_call(Prt, 0, Msg),
-    [{trace, Prt, 'receive', {S, {call, {0, BinMsg}}}},
-     {trace, Prt, send, {Prt, {call, BinMsg}}, S}] = flush(),
+    Test({hello, world, make_ref()}),
+    Test({hello, world, lists:seq(1,1000)}),
 
     close(Prt, Flags),
 
diff --git a/erts/emulator/test/port_trace_SUITE_data/echo_drv.c b/erts/emulator/test/port_trace_SUITE_data/echo_drv.c
index b5728bc170..b5ae9389b4 100644
--- a/erts/emulator/test/port_trace_SUITE_data/echo_drv.c
+++ b/erts/emulator/test/port_trace_SUITE_data/echo_drv.c
@@ -217,6 +217,8 @@ static ErlDrvSSizeT echo_drv_control(ErlDrvData drv_data,
 				     char *buf, ErlDrvSizeT len,
 				     char **rbuf, ErlDrvSizeT rlen)
 {
+    if ((len - 1) > rlen)
+        *rbuf = driver_alloc(len - 1);
     memcpy(*rbuf, buf+1, len-1);
     return len-1;
 }
@@ -232,6 +234,8 @@ static ErlDrvSSizeT echo_drv_call(ErlDrvData drv_data,
                                   char **rbuf, ErlDrvSizeT rlen,
                                   unsigned int *flags)
 {
+    if ((len - command) > rlen)
+        *rbuf = driver_alloc(len - command);
     memcpy(*rbuf, buf+command, len-command);
     return len-command;
 }