Merge branch 'egil/binary-gc' into ccase/r13b04_dev

* egil/binary-gc:
  Add documentation for binary heap size settings.
  Add tracing capabilities for binary virtual heap
  Add min heap size start options to beam and erl
  Improve binary garbage collection

OTP-8370  The default settings for garbage collection of binaries has been
          adjusted to be less aggressive than in R13B03. It is now also
          possible configure the settings for binary GC. See the
          documentation for spawn_opt/2-5, erlang:system_info/1,
          erlang:system_flag/2, process_flag/2-3, erlang:trace/3, and the
          documenation for erl for the new command line options +hms and
          +hmbs.

2 files changed, 61 insertions, 20 deletions

diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index fdedf30e78..77f850d0fb 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_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%
 %%
 
@@ -41,7 +41,8 @@
 	 bump_reductions/1, low_prio/1, binary_owner/1, yield/1, yield2/1,
 	 process_status_exiting/1,
 	 otp_4725/1, bad_register/1, garbage_collect/1, otp_6237/1,
-	 process_info_messages/1, process_flag_badarg/1,
+	 process_info_messages/1, process_flag_badarg/1, process_flag_heap_size/1,
+	 spawn_opt_heap_size/1,
 	 processes_large_tab/1, processes_default_tab/1, processes_small_tab/1,
 	 processes_this_tab/1, processes_apply_trap/1,
 	 processes_last_call_trap/1, processes_gc_trap/1,
@@ -63,9 +64,8 @@ all(suite) ->
      process_info_lock_reschedule, process_info_lock_reschedule2,
      process_status_exiting,
      bump_reductions, low_prio, yield, yield2, otp_4725, bad_register,
-     garbage_collect, process_info_messages, process_flag_badarg, otp_6237,
-     processes_bif,
-     otp_7738].
+     garbage_collect, process_info_messages, process_flag_badarg, process_flag_heap_size,
+     spawn_opt_heap_size, otp_6237, processes_bif, otp_7738].
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(10)),
@@ -388,6 +388,8 @@ t_process_info(Config) when is_list(Config) ->
     ?line register(my_name, self()),
     ?line {registered_name, my_name} = process_info(self(), registered_name),
     ?line {status, running} = process_info(self(), status),
+    ?line {min_heap_size, 233} = process_info(self(), min_heap_size),
+    ?line {min_bin_vheap_size, 46368} = process_info(self(), min_bin_vheap_size),
     ?line {current_function, {?MODULE, t_process_info, 1}} =
 	process_info(self(), current_function),
     ?line Gleader = group_leader(),
@@ -437,6 +439,10 @@ process_info_other_msg(Config) when is_list(Config) ->
 	      empty -> ok
 	  end,
     ?line {messages,[]} = process_info(Pid, messages),
+
+    ?line {min_heap_size, 233} = process_info(Pid, min_heap_size),
+    ?line {min_bin_vheap_size, 46368} = process_info(Pid, min_bin_vheap_size),
+
     ?line Pid ! stop,
     ok.
 
@@ -1148,6 +1154,8 @@ process_flag_badarg(Config) when is_list(Config) ->
     ?line chk_badarg(fun () -> process_flag(trap_exit, gurka) end),
     ?line chk_badarg(fun () -> process_flag(error_handler, 1) end),
     ?line chk_badarg(fun () -> process_flag(min_heap_size, gurka) end),
+    ?line chk_badarg(fun () -> process_flag(min_bin_vheap_size, gurka) end),
+    ?line chk_badarg(fun () -> process_flag(min_bin_vheap_size, -1) end),
     ?line chk_badarg(fun () -> process_flag(priority, 4711) end),
     ?line chk_badarg(fun () -> process_flag(save_calls, hmmm) end),
     ?line P= spawn_link(fun () -> receive die -> ok end end),
@@ -1774,6 +1782,34 @@ processes_gc_trap(Config) when is_list(Config) ->
     ?line exit(Suspendee, bang),
     ?line ok.
 
+process_flag_heap_size(doc) ->
+    [];
+process_flag_heap_size(suite) ->
+    [];
+process_flag_heap_size(Config) when is_list(Config) ->
+    HSize  = 2584,   % must be gc fib number
+    VHSize = 317811, % must be gc fib number
+    ?line OldHmin = erlang:process_flag(min_heap_size, HSize),
+    ?line {min_heap_size, HSize} = erlang:process_info(self(), min_heap_size),
+    ?line OldVHmin = erlang:process_flag(min_bin_vheap_size, VHSize),
+    ?line {min_bin_vheap_size, VHSize} = erlang:process_info(self(), min_bin_vheap_size),
+    ?line HSize = erlang:process_flag(min_heap_size, OldHmin),
+    ?line VHSize = erlang:process_flag(min_bin_vheap_size, OldVHmin),
+    ?line ok.
+
+spawn_opt_heap_size(doc) ->
+    [];
+spawn_opt_heap_size(suite) ->
+    [];
+spawn_opt_heap_size(Config) when is_list(Config) ->
+    HSize  = 987,   % must be gc fib number
+    VHSize = 46368, % must be gc fib number
+    ?line Pid  = spawn_opt(fun () -> receive stop -> ok end end,
+	[{min_heap_size, HSize},{ min_bin_vheap_size, VHSize}]),
+    ?line {min_heap_size, HSize} = process_info(Pid, min_heap_size),
+    ?line {min_bin_vheap_size, VHSize} = process_info(Pid, min_bin_vheap_size),
+    ?line Pid ! stop,
+    ?line ok.
 
 processes_term_proc_list(doc) ->
     [];
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index 2c7124839a..e782d2f293 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-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%
 %%
 
@@ -35,12 +35,12 @@
 %-compile(export_all).
 -export([all/1, init_per_testcase/2, fin_per_testcase/2]).
 
--export([process_count/1, system_version/1, misc_smoke_tests/1]).
+-export([process_count/1, system_version/1, misc_smoke_tests/1, heap_size/1]).
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(2)).
 
 all(doc) -> [];
-all(suite) -> [process_count, system_version, misc_smoke_tests].
+all(suite) -> [process_count, system_version, misc_smoke_tests, heap_size].
 
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
@@ -135,8 +135,13 @@ misc_smoke_tests(Config) when is_list(Config) ->
     ?line ok.
     
 
-
-
-
-
+heap_size(doc) -> [];
+heap_size(suite) -> [];
+heap_size(Config) when is_list(Config) ->
+   ?line {min_bin_vheap_size, VHmin} = erlang:system_info(min_bin_vheap_size),
+   ?line {min_heap_size, Hmin} =  erlang:system_info(min_heap_size),
+   ?line GCinf =  erlang:system_info(garbage_collection),
+   ?line VHmin = proplists:get_value(min_bin_vheap_size, GCinf),
+   ?line Hmin  = proplists:get_value(min_heap_size, GCinf),
+   ok.