Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 60 insertions, 53 deletions

diff --git a/erts/emulator/test/gc_SUITE.erl b/erts/emulator/test/gc_SUITE.erl
index 36889b6c36..8a600b7d9f 100644
--- a/erts/emulator/test/gc_SUITE.erl
+++ b/erts/emulator/test/gc_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. 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.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -21,45 +22,27 @@
 
 -module(gc_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
+-include_lib("common_test/include/ct.hrl").
+-export([all/0, suite/0]).
 
--define(default_timeout, ?t:minutes(10)).
+-export([grow_heap/1, grow_stack/1, grow_stack_heap/1, max_heap_size/1]).
 
--export([grow_heap/1, grow_stack/1, grow_stack_heap/1]).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [grow_heap, grow_stack, grow_stack_heap].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
+    [grow_heap, grow_stack, grow_stack_heap, max_heap_size].
 
 
-grow_heap(doc) -> ["Produce a growing list of elements, ",
-		   "for X calls, then drop one item per call",
-		   "until the list is empty."];
+%% Produce a growing list of elements,
+%% for X calls, then drop one item per call
+%% until the list is empty.
 grow_heap(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(40)),
+    ct:timetrap({minutes, 40}),
     ok  = grow_heap1(256),
     ok  = grow_heap1(512),
     ok  = grow_heap1(1024),
     ok  = grow_heap1(2048),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 grow_heap1(Len) ->
@@ -77,7 +60,7 @@ grow_heap1(List, MaxLen, CurLen, up) ->
 grow_heap1([], _MaxLen, _, down) ->
     ok;
 grow_heap1([_|List], MaxLen, CurLen, down) ->
-    {_,_,C} = erlang:now(),
+    C=erlang:unique_integer([positive]),
     Num     = C rem (length(List))+1,
     Elem    = lists:nth(Num, List),
     NewList = lists:delete(Elem, List),
@@ -85,14 +68,13 @@ grow_heap1([_|List], MaxLen, CurLen, down) ->
 
 
 
-grow_stack(doc) -> ["Increase and decrease stack size, and ",
-		    "drop off some garbage from time to time."];
+%% Increase and decrease stack size, and
+%% drop off some garbage from time to time.
 grow_stack(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(80)),
+    ct:timetrap({minutes, 80}),
     show_heap("before:"),
     grow_stack1(200, 0),
     show_heap("after:"),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 grow_stack1(0, _) ->
@@ -109,14 +91,12 @@ grow_stack1(Recs, CurRecs) ->
 
 
 %% Let's see how BEAM handles this one...
-grow_stack_heap(doc) -> ["While growing the heap, bounces the size ",
-			 "of the stack, and while reducing the heap",
-			 "bounces the stack usage."];
+%% While growing the heap, bounces the size of the
+%% stack, and while reducing the heap, bounces the stack usage.
 grow_stack_heap(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(40)),
+    ct:timetrap({minutes, 40}),
     grow_stack_heap1(16),
     grow_stack_heap1(32),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 grow_stack_heap1(MaxLen) ->
@@ -136,7 +116,7 @@ grow_stack_heap1(List, MaxLen, CurLen, up) ->
 grow_stack_heap1([], _MaxLen, _, down) -> ok;
 grow_stack_heap1([_|List], MaxLen, CurLen, down) ->
     grow_stack1(CurLen*2,0),
-    {_,_,C}=erlang:now(),
+    C=erlang:unique_integer([positive]),
     Num=C rem (length(List))+1,
     Elem=lists:nth(Num, List),
     NewList=lists:delete(Elem, List),
@@ -146,8 +126,8 @@ grow_stack_heap1([_|List], MaxLen, CurLen, down) ->
 
 %% Create an arbitrary element/term.
 make_arbit() ->
-    {AA,BB,CC}=erlang:now(),
-    A=AA+1, B=BB+1, C=CC+1,
+    {AA,BB,CC}=erlang:timestamp(),
+    A=AA+1, B=BB+1, C=(CC+erlang:unique_integer([positive])) rem 1000000 + 1,
     New =
 	case C rem 9 of
 	    0 -> make_string((B div C) +5);
@@ -171,7 +151,7 @@ make_string(Length) ->
 make_string(_, 0, Acc) ->
     Acc;
 make_string(Alph, Length, Acc) ->
-    {_,_,C}=erlang:now(),
+    C=erlang:unique_integer([positive]),
     Pos=1+(Length*C rem length(Alph)),
     make_string(Alph, Length-1, 
 		[lists:nth(Pos,Alph)|Acc]).
@@ -183,3 +163,30 @@ show_heap(String) ->
     {stack_size, SSize}=process_info(self(), stack_size),
     io:format("Heap/Stack "++String++"~p/~p", [HSize, SSize]).
     
+%% Test that doing a remote GC that triggers the max heap size
+%% kills the process.
+max_heap_size(_Config) ->
+
+    Pid = spawn_opt(fun long_receive/0,[{max_heap_size, 1024},
+                                        {message_queue_data, on_heap}]),
+    [Pid ! lists:duplicate(I,I) || I <- lists:seq(1,100)],
+    Ref = erlang:monitor(process, Pid),
+
+    %% Force messages to be viewed as part of heap
+    erlang:process_info(Pid, messages),
+
+    %% Do the GC that triggers max heap
+    erlang:garbage_collect(Pid),
+
+    %% Verify that max heap was triggered
+    receive
+        {'DOWN', Ref, process, Pid, killed} -> ok
+    after 5000 ->
+            ct:fail({process_did_not_die, Pid, erlang:process_info(Pid)})
+    end.
+
+long_receive() ->
+    receive
+    after 10000 ->
+            ok
+    end.