OTP-8240 Improved GC performance after BIF/NIF call when a lot of heap

          fragments was created. This will mainly benefit NIFs that return
          large compound terms.

4 files changed, 75 insertions, 52 deletions

diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 44b6bbe785..db2b3e10db 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -580,11 +580,18 @@ corrupter(Term) ->
     ?line corrupter(CompressedBin, size(CompressedBin)-1).
 
 corrupter(Bin, Pos) when Pos >= 0 ->
-    ?line {ShorterBin, _} = split_binary(Bin, Pos),
+    ?line {ShorterBin, Rest} = split_binary(Bin, Pos),
     ?line catch binary_to_term(ShorterBin), %% emulator shouldn't crash
     ?line MovedBin = list_to_binary([ShorterBin]),
     ?line catch binary_to_term(MovedBin), %% emulator shouldn't crash
-    ?line corrupter(MovedBin, Pos-1);
+
+    %% Bit faults, shouldn't crash
+    <<Byte,Tail/binary>> = Rest,
+    Fun = fun(M) -> FaultyByte = Byte bxor M,                    
+		    catch binary_to_term(<<ShorterBin/binary,
+					  FaultyByte, Tail/binary>>) end,
+    ?line lists:foreach(Fun,[1,2,4,8,16,32,64,128,255]),    
+    ?line corrupter(Bin, Pos-1);
 corrupter(_Bin, _) ->
     ok.
 
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index 716ee3707d..a7889dfe90 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1999-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -627,7 +627,13 @@ refc_dist_1() ->
     %% Fun is passed in an exit signal. Wait until it is gone.
     ?line wait_until(fun () -> 4 =/= fun_refc(F2) end),
     ?line 3 = fun_refc(F2),
-    ?line 3 = fun_refc(F),
+    erts_debug:set_internal_state(available_internal_state, true),
+    ?line F_refc = case erts_debug:get_internal_state(force_heap_frags) of
+		       false -> 3;
+		       true -> 2 % GC after bif already decreased it
+		   end,
+    ?line F_refc = fun_refc(F),
+    erts_debug:set_internal_state(available_internal_state, false),
     refc_dist_send(Node, F).
 
 refc_dist_send(Node, F) ->
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index bc12821887..9e1732a445 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -212,17 +212,18 @@ reductions(Config) when is_list(Config) ->
     %% 300 * 4 is more than CONTEXT_REDS (1000).  Thus, there will be one or
     %% more context switches.
 
-    reductions(300, Reductions).
+    Mask = (1 bsl erlang:system_info(wordsize)*8) - 1,
+    reductions(300, Reductions, Mask).
 
-reductions(N, Previous) when N > 0 ->
+reductions(N, Previous, Mask) when N > 0 ->
     ?line {Reductions, Diff} = statistics(reductions),
     ?line build_some_garbage(),
     ?line if Reductions > 0 -> ok end,
     ?line if Diff >= 0 -> ok end,
     io:format("Previous = ~p, Reductions = ~p, Diff = ~p, DiffShouldBe = ~p",
-	      [Previous, Reductions, Diff, Reductions-Previous]),
-    ?line if Reductions == Previous+Diff -> reductions(N-1, Reductions) end;
-reductions(0, _) ->
+	      [Previous, Reductions, Diff, (Reductions-Previous) band Mask]),
+    ?line if Reductions == ((Previous+Diff) band Mask) -> reductions(N-1, Reductions, Mask) end;
+reductions(0, _, _) ->
     ok.
 
 build_some_garbage() ->
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
index 2c60ba6838..e9713fcf0f 100644
--- a/erts/emulator/test/trace_SUITE.erl
+++ b/erts/emulator/test/trace_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -498,19 +498,23 @@ system_monitor_long_gc_1(doc) ->
     ["Tests erlang:system_monitor(Pid, [{long_gc,Time}])"];
 system_monitor_long_gc_1(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
-    try
-	%% Add ?LONG_GC_SLEEP ms to all gc
-	?line erts_debug:set_internal_state(test_long_gc_sleep,
-					    ?LONG_GC_SLEEP),
-	?line LoadFun =
-	fun () -> 
-		garbage_collect(),
-		self() 
-	end,
-	?line long_gc(LoadFun, false)
+    try 
+	case erts_debug:get_internal_state(force_heap_frags) of
+	    true ->
+		{skip,"emulator with FORCE_HEAP_FRAGS defined"};
+	    false ->
+		%% Add ?LONG_GC_SLEEP ms to all gc
+		?line erts_debug:set_internal_state(test_long_gc_sleep,
+						    ?LONG_GC_SLEEP),
+		?line LoadFun = fun () -> 
+					garbage_collect(),
+					self() 
+				end,
+		?line long_gc(LoadFun, false)
+	end
     after
 	erts_debug:set_internal_state(test_long_gc_sleep, 0),
-	erts_debug:set_internal_state(available_internal_state, false)
+	erts_debug:set_internal_state(available_internal_state, false)	
     end.
 
 system_monitor_long_gc_2(suite) ->
@@ -520,24 +524,29 @@ system_monitor_long_gc_2(doc) ->
 system_monitor_long_gc_2(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     try
-	%% Add ?LONG_GC_SLEEP ms to all gc
-	?line erts_debug:set_internal_state(test_long_gc_sleep,
-					    ?LONG_GC_SLEEP),
-	?line Parent = self(),
-	?line LoadFun =
-	fun () ->
-		Ref = make_ref(),
-		Pid = 
-		    spawn_link(
-		      fun () ->
-			      garbage_collect(),
-			      Parent ! {Ref, self()}
-		      end),
-		receive {Ref, Pid} -> Pid end
-	end,
-	?line long_gc(LoadFun, true),
-	?line long_gc(LoadFun, true),
-	?line long_gc(LoadFun, true)
+	case erts_debug:get_internal_state(force_heap_frags) of
+	    true ->
+		{skip,"emulator with FORCE_HEAP_FRAGS defined"};
+	    false ->
+		%% Add ?LONG_GC_SLEEP ms to all gc
+		?line erts_debug:set_internal_state(test_long_gc_sleep,
+						    ?LONG_GC_SLEEP),
+		?line Parent = self(),
+		?line LoadFun =
+		    fun () ->
+			    Ref = make_ref(),
+			    Pid = 
+				spawn_link(
+				  fun () ->
+					  garbage_collect(),
+					  Parent ! {Ref, self()}
+				  end),
+			    receive {Ref, Pid} -> Pid end
+		    end,
+		?line long_gc(LoadFun, true),
+		?line long_gc(LoadFun, true),
+		?line long_gc(LoadFun, true)
+	end
     after
 	erts_debug:set_internal_state(test_long_gc_sleep, 0),
 	erts_debug:set_internal_state(available_internal_state, false)