Merge branch 'bmk/snmp/handling_corrupt_atl_when_converting/r16/OTP-11453' into bmk/snmp/snmp425_integration

Conflicts:
	lib/snmp/src/misc/snmp_log.erl

8 files changed, 96 insertions, 20 deletions

diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 801ed0f85a..f6ff6bb813 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -29,6 +29,7 @@
 	 bucket_mask/1,
 	 rbtree/1,
 	 mseg_clear_cache/1,
+	 erts_mmap/1,
 	 cpool/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -41,7 +42,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [basic, coalesce, threads, realloc_copy, bucket_index,
-     bucket_mask, rbtree, mseg_clear_cache, cpool].
+     bucket_mask, rbtree, mseg_clear_cache, erts_mmap, cpool].
 
 groups() -> 
     [].
@@ -110,6 +111,59 @@ cpool(suite) -> [];
 cpool(doc) ->   [];
 cpool(Cfg) -> ?line drv_case(Cfg).
 
+erts_mmap(Config) when is_list(Config) ->
+    case {?t:os_type(), is_halfword_vm()} of
+	{{unix, _}, false} ->
+	    [erts_mmap_do(Config, SCO, SCRPM, SCMGC)
+	     || SCO <-[true,false], SCMGC <-[1234,0], SCRPM <- [true,false]];
+
+	{_,true} ->
+	    {skipped, "No supercarrier support on halfword vm"};
+	{SkipOs,_} ->
+	    ?line {skipped,
+		   lists:flatten(["Not run on "
+				  | io_lib:format("~p",[SkipOs])])}
+    end.
+
+
+erts_mmap_do(Config, SCO, SCRPM, SCMGC) ->
+    SCS = 100, % Mb
+    O1 = "+MMscs" ++ integer_to_list(SCS)
+	++ " +MMsco" ++ atom_to_list(SCO)
+	++ " +MMscrpm" ++ atom_to_list(SCRPM),
+    Opts = case SCMGC of
+	       0 -> O1;
+	       _ -> O1 ++ " +MMscmgc"++integer_to_list(SCMGC)
+	   end,
+    {ok, Node} = start_node(Config, Opts),
+    Self = self(),
+    Ref = make_ref(),
+    F = fun () ->
+		SI = erlang:system_info({allocator,mseg_alloc}),
+		{erts_mmap,EM} = lists:keyfind(erts_mmap, 1, SI),
+		{supercarrier,SC} = lists:keyfind(supercarrier, 1, EM),
+		{sizes,Sizes} = lists:keyfind(sizes, 1, SC),
+		{free_segs,Segs} = lists:keyfind(free_segs,1,SC),
+		{total,Total} = lists:keyfind(total,1,Sizes),
+		Total = SCS*1024*1024,
+
+		{reserved,Reserved} = lists:keyfind(reserved,1,Segs),
+		true = (Reserved >= SCMGC),
+
+		case {SCO,lists:keyfind(os,1,EM)} of
+		    {true, false} -> ok;
+		    {false, {os,_}} -> ok
+		end,
+
+		Self ! {Ref, ok}
+	end,
+
+    spawn_link(Node, F),
+    Result = receive {Ref, Rslt} -> Rslt end,
+    stop_node(Node),
+    Result.
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                                                                        %%
 %% Internal functions                                                     %%
@@ -179,7 +233,9 @@ receive_drv_result(Port, CaseName) ->
 		  ?line {comment, Comment}
 	  end.
 
-start_node(Config) when is_list(Config) ->
+start_node(Config) ->
+    start_node(Config, []).
+start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
     ?line Pa = filename:dirname(code:which(?MODULE)),
     ?line {A, B, C} = now(),
     ?line Name = list_to_atom(atom_to_list(?MODULE)
@@ -191,7 +247,14 @@ start_node(Config) when is_list(Config) ->
 			      ++ integer_to_list(B)
 			      ++ "-"
 			      ++ integer_to_list(C)),
-    ?line ?t:start_node(Name, slave, [{args, "-pa "++Pa}]).
+    ?line ?t:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
 
 stop_node(Node) ->
     ?t:stop_node(Node).
+
+is_halfword_vm() ->
+    case {erlang:system_info({wordsize, internal}),
+	  erlang:system_info({wordsize, external})} of
+	{4, 8} -> true;
+	{WS, WS} -> false
+    end.
diff --git a/erts/emulator/test/big_SUITE_data/eq_big.dat b/erts/emulator/test/big_SUITE_data/eq_big.dat
index 5511d1bf10..4ccb33d182 100644
--- a/erts/emulator/test/big_SUITE_data/eq_big.dat
+++ b/erts/emulator/test/big_SUITE_data/eq_big.dat
@@ -13001,4 +13001,5 @@
 
 0 = 7153697524993 bsr 475833444444444444444444444444444444444444444444.
 -1 = -83987348 bsr 475833444444444444444444444444444444444444444444.
+0 = 1183140560213014108063589658350 bsr 146783911423364576743092537299333564210980159306769991919205685720763064069663027716481187399048043939495935.
 
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index eaecd32f95..ef1f2aa04c 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -1193,7 +1193,7 @@ bs_sum_b(Acc, <<>>) -> Acc.
     
 
 
-
+
 %%% Help functions.
 
 expect() ->
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 104bdf8aec..7087542899 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -367,7 +367,7 @@ compare(Got, Expected) ->
 	    ?t:fail(got_bad_data)
     end.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% 		Driver timer test suites
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -515,7 +515,7 @@ try_change_timer(Port, Timeout) ->
 	    ?line test_server:fail("driver failed to timeout")
     end.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% 		Queue test suites
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -719,7 +719,7 @@ deq(Port, Size) ->
 read_head(Port, Size) ->
     erlang:port_control(Port, ?READ_HEAD, <<Size:32>>).
 
-
+
 driver_unloaded(doc) ->
     [];
 driver_unloaded(suite) ->
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index a93dd309c1..c428be6c5a 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -75,7 +75,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-
+
 %%% Testing statistics(wall_clock).
 
 
@@ -121,7 +121,7 @@ wall_clock_update1(N) when N > 0 ->
 wall_clock_update1(0) ->
     ok.
 
-
+
 %%% Test statistics(runtime).
 
 
@@ -199,7 +199,7 @@ do_much(N) ->
     _ = 4784728478274827 * 72874284728472,
     do_much(N-1).
 
-
+
 reductions(doc) ->
     "Test that statistics(reductions) is callable, and that "
 	"Total_Reductions and Reductions_Since_Last_Call make sense. "
@@ -246,7 +246,7 @@ reductions_big_loop() ->
 	    reductions_big_loop()
     end.
 
-
+
 %%% Tests of statistics(run_queue).
 
 
@@ -295,7 +295,7 @@ hog_iter(N, Mon) when N > 0 ->
     end;
 hog_iter(0, Mon) ->
     ?line hog_iter(10000, Mon).
-
+
 %%% Tests of statistics(scheduler_wall_time).
 
 scheduler_wall_time(doc) ->
@@ -363,7 +363,7 @@ load_percentage([{Id, WN, TN}|Ss], [{Id, WP, TP}|Ps]) ->
     [100*(WN-WP) div (TN-TP)|load_percentage(Ss, Ps)];
 load_percentage([], []) -> [].
 
-
+
 garbage_collection(doc) ->
     "Tests that statistics(garbage_collection) is callable. "
     "It is not clear how to test anything more.";
diff --git a/erts/emulator/test/time_SUITE.erl b/erts/emulator/test/time_SUITE.erl
index 4d12e3449c..a0a8a9c42c 100644
--- a/erts/emulator/test/time_SUITE.erl
+++ b/erts/emulator/test/time_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. 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
@@ -241,14 +241,26 @@ compare(Utc0, Local) ->
 %% Two linear times can be subtracted to give their difference
 %% in seconds.
 %%
-%% XXX Limitations: The length of months and leap years are not
-%% taken into account; thus a comparision of dates is only
-%% valid if they are in the SAME month.
+%% XXX Limitations: Simplified leap year calc will fail for 2100 :-)
 
 linear_time({{Year, Mon, Day}, {Hour, Min, Sec}}) ->
-    86400*(366*Year + 31*(Mon-1) + (Day-1)) +
+    86400*(year_to_days(Year) + month_to_days(Year,Mon) + (Day-1)) +
 	3600*Hour + 60*Min + Sec.
 
+year_to_days(Year) ->
+    Year * 365 + (Year-1) div 4.
+
+month_to_days(Year, Mon) ->
+    DoM = [31,days_in_february(Year),31,30,31,30,31,31,30,31,30,31],
+    {PastMonths,_} = lists:split(Mon-1, DoM),
+    lists:sum(PastMonths).
+
+days_in_february(Year) ->
+    case (Year rem 4) of
+	0 -> 29;
+	_ -> 28
+    end.
+
 %% This functions returns either the normal timezone or the
 %% the DST timezone, depending on the given UTC time.
 %%
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
index 0f513f0dcb..2251575e5a 100644
--- a/erts/emulator/test/trace_SUITE.erl
+++ b/erts/emulator/test/trace_SUITE.erl
@@ -1427,7 +1427,7 @@ receive_nothing() ->
 	    ok
     end.
 
-
+
 %%% Models for various kinds of processes.
 
 process(Dest) ->
diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl
index cc2eadafbc..99df8da107 100644
--- a/erts/emulator/test/trace_port_SUITE.erl
+++ b/erts/emulator/test/trace_port_SUITE.erl
@@ -648,7 +648,7 @@ fun_spawn(Fun, Opts) ->
 % 	    []
 %     end.
 
-
+
 %%% Models for various kinds of processes.
 
 %% Sends messages when ordered to.