Merge branch 'maint' into sverk/trace-process_dump-matchstate

Conflicts:
	erts/emulator/beam/erl_printf_term.c
	erts/emulator/beam/erl_term.c
	erts/emulator/beam/utils.c

1 files changed, 210 insertions, 38 deletions

diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 611a568014..291356c7b1 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -3,16 +3,17 @@
 %%
 %% Copyright Ericsson AB 1996-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
-%% 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/.
+%% 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
 %%
-%% 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.
+%%     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%
 %%
@@ -38,7 +39,6 @@
 
 -export([integer_to_list/2]).
 -export([integer_to_binary/2]).
--export([flush_monitor_message/2]).
 -export([set_cpu_topology/1, format_cpu_topology/1]).
 -export([await_proc_exit/3]).
 -export([memory/0, memory/1]).
@@ -48,7 +48,7 @@
 	 await_sched_wall_time_modifications/2,
 	 gather_gc_info_result/1]).
 
--deprecated([hash/2]).
+-deprecated([hash/2, now/0]).
 
 %% Get rid of autoimports of spawn to avoid clashes with ourselves.
 -compile({no_auto_import,[spawn_link/1]}).
@@ -58,12 +58,21 @@
 -compile({no_auto_import,[spawn_opt/5]}).
 
 -export_type([timestamp/0]).
+-export_type([time_unit/0]).
 
 -type ext_binary() :: binary().
 -type timestamp() :: {MegaSecs :: non_neg_integer(),
                       Secs :: non_neg_integer(),
                       MicroSecs :: non_neg_integer()}.
 
+-type time_unit() ::
+	pos_integer()
+      | 'seconds'
+      | 'milli_seconds'
+      | 'micro_seconds'
+      | 'nano_seconds'
+      | 'native'.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Native code BIF stubs and their types
 %% (BIF's actually implemented in this module goes last in the file)
@@ -81,7 +90,7 @@
 -export([binary_to_list/3, binary_to_term/1, binary_to_term/2]).
 -export([bit_size/1, bitsize/1, bitstring_to_list/1]).
 -export([bump_reductions/1, byte_size/1, call_on_load_function/1]).
--export([cancel_timer/1, check_old_code/1, check_process_code/2,
+-export([cancel_timer/1, cancel_timer/2, check_old_code/1, check_process_code/2,
 	 check_process_code/3, crc32/1]).
 -export([crc32/2, crc32_combine/3, date/0, decode_packet/3]).
 -export([delete_element/2]).
@@ -93,7 +102,7 @@
 	 float_to_list/1, float_to_list/2]).
 -export([fun_info/2, fun_info_mfa/1, fun_to_list/1, function_exported/3]).
 -export([garbage_collect/0, garbage_collect/1, garbage_collect/2]).
--export([garbage_collect_message_area/0, get/0, get/1, get_keys/1]).
+-export([garbage_collect_message_area/0, get/0, get/1, get_keys/0, get_keys/1]).
 -export([get_module_info/1, get_stacktrace/0, group_leader/0]).
 -export([group_leader/2, halt/0, halt/1, halt/2, hash/2, hibernate/3]).
 -export([insert_element/3]).
@@ -104,7 +113,8 @@
 -export([list_to_bitstring/1, list_to_existing_atom/1, list_to_float/1]).
 -export([list_to_integer/1, list_to_integer/2]).
 -export([list_to_pid/1, list_to_tuple/1, loaded/0]).
--export([localtime/0, make_ref/0, map_size/1, match_spec_test/3, md5/1, md5_final/1]).
+-export([localtime/0, make_ref/0]).
+-export([map_size/1, match_spec_test/3, md5/1, md5_final/1]).
 -export([md5_init/0, md5_update/2, module_loaded/1, monitor/2]).
 -export([monitor_node/2, monitor_node/3, nif_error/1, nif_error/2]).
 -export([node/0, node/1, now/0, phash/2, phash2/1, phash2/2]).
@@ -112,13 +122,19 @@
 -export([port_connect/2, port_control/3, port_get_data/1]).
 -export([port_set_data/2, port_to_list/1, ports/0]).
 -export([posixtime_to_universaltime/1, pre_loaded/0, prepare_loading/2]).
+-export([monotonic_time/0, monotonic_time/1]).
+-export([system_time/0, system_time/1]).
+-export([convert_time_unit/3]).
+-export([unique_integer/0, unique_integer/1]).
+-export([time_offset/0, time_offset/1, timestamp/0]).
 -export([process_display/2]).
 -export([process_flag/3, process_info/1, processes/0, purge_module/1]).
--export([put/2, raise/3, read_timer/1, ref_to_list/1, register/2]).
--export([registered/0, resume_process/1, round/1, self/0, send_after/3]).
+-export([put/2, raise/3, read_timer/1, read_timer/2, ref_to_list/1, register/2]).
+-export([send_after/3, send_after/4, start_timer/3, start_timer/4]).
+-export([registered/0, resume_process/1, round/1, self/0]).
 -export([seq_trace/2, seq_trace_print/1, seq_trace_print/2, setnode/2]).
 -export([setnode/3, size/1, spawn/3, spawn_link/3, split_binary/2]).
--export([start_timer/3, suspend_process/2, system_monitor/0]).
+-export([suspend_process/2, system_monitor/0]).
 -export([system_monitor/1, system_monitor/2, system_profile/0]).
 -export([system_profile/2, throw/1, time/0, trace/3, trace_delivered/1]).
 -export([trace_info/2, trunc/1, tuple_size/1, universaltime/0]).
@@ -410,12 +426,27 @@ call_on_load_function(_P1) ->
     erlang:nif_error(undefined).
 
 %% cancel_timer/1
--spec erlang:cancel_timer(TimerRef) -> Time | false when
+-spec erlang:cancel_timer(TimerRef) -> Result when
       TimerRef :: reference(),
-      Time :: non_neg_integer().
+      Time :: non_neg_integer(),
+      Result :: Time | false.
+
 cancel_timer(_TimerRef) ->
     erlang:nif_error(undefined).
 
+%% cancel_timer/2
+-spec erlang:cancel_timer(TimerRef, Options) -> Result | ok when
+      TimerRef :: reference(),
+      Async :: boolean(),
+      Info :: boolean(),
+      Option :: {async, Async} | {info, Info},
+      Options :: [Option],
+      Time :: non_neg_integer(),
+      Result :: Time | false.
+
+cancel_timer(_TimerRef, _Options) ->
+    erlang:nif_error(undefined).
+
 %% check_old_code/1
 -spec check_old_code(Module) -> boolean() when
       Module :: module().
@@ -931,6 +962,12 @@ get() ->
 get(_Key) ->
     erlang:nif_error(undefined).
 
+%% get_keys/0
+-spec get_keys() -> [Key] when
+      Key :: term().
+get_keys() ->
+    erlang:nif_error(undefined).
+
 %% get_keys/1
 -spec get_keys(Val) -> [Key] when
       Val :: term(),
@@ -1184,13 +1221,18 @@ md5_update(_Context, _Data) ->
 module_loaded(_Module) ->
     erlang:nif_error(undefined).
 
+-type registered_name() :: atom().
+
+-type registered_process_identifier() :: registered_name() | {registered_name(), node()}.
+
+-type monitor_process_identifier() :: pid() | registered_process_identifier().
+
 %% monitor/2
--spec monitor(Type, Item) -> MonitorRef when
-      Type :: process,
-      Item :: pid() | RegName | {RegName, Node},
-      RegName :: module(),
-      Node :: node(),
+-spec monitor(process, monitor_process_identifier()) -> MonitorRef when
+      MonitorRef :: reference();
+	     (time_offset, clock_service) -> MonitorRef when
       MonitorRef :: reference().
+
 monitor(_Type, _Item) ->
     erlang:nif_error(undefined).
 
@@ -1292,6 +1334,90 @@ ports() ->
 posixtime_to_universaltime(_P1) ->
     erlang:nif_error(undefined).
 
+-spec erlang:unique_integer(ModifierList) -> integer() when
+      ModifierList :: [Modifier],
+      Modifier :: positive | monotonic.
+
+unique_integer(_ModifierList) ->
+    erlang:nif_error(undefined).
+
+-spec erlang:unique_integer() -> integer().
+
+unique_integer() ->
+    erlang:nif_error(undefined).
+
+-spec erlang:monotonic_time() -> integer().
+
+monotonic_time() ->
+    erlang:nif_error(undefined).
+
+-spec erlang:monotonic_time(Unit) -> integer() when
+      Unit :: time_unit().
+
+monotonic_time(_Unit) ->
+    erlang:nif_error(undefined).
+
+-spec erlang:system_time() -> integer().
+
+system_time() ->
+    erlang:nif_error(undefined).
+
+-spec erlang:system_time(Unit) -> integer() when
+      Unit :: time_unit().
+
+system_time(_Unit) ->
+    erlang:nif_error(undefined).
+
+-spec erlang:convert_time_unit(Time, FromUnit, ToUnit) -> ConvertedTime when
+      Time :: integer(),
+      ConvertedTime :: integer(),
+      FromUnit :: time_unit(),
+      ToUnit :: time_unit().
+
+convert_time_unit(Time, FromUnit, ToUnit) ->
+    try
+	FU = case FromUnit of
+		 native -> erts_internal:time_unit();
+		 nano_seconds -> 1000*1000*1000;
+		 micro_seconds -> 1000*1000;
+		 milli_seconds -> 1000;
+		 seconds -> 1;
+		 _ when FromUnit > 0 -> FromUnit
+	     end,
+	TU = case ToUnit of
+		 native -> erts_internal:time_unit();
+		 nano_seconds -> 1000*1000*1000;
+		 micro_seconds -> 1000*1000;
+		 milli_seconds -> 1000;
+		 seconds -> 1;
+		 _ when ToUnit > 0 -> ToUnit
+	     end,
+	case Time < 0 of
+	    true -> TU*Time - (FU - 1);
+	    false -> TU*Time
+	end div FU
+    catch
+	_ : _ ->
+	    erlang:error(badarg, [Time, FromUnit, ToUnit])
+    end.
+
+-spec erlang:time_offset() -> integer().
+
+time_offset() ->
+    erlang:nif_error(undefined).
+
+-spec erlang:time_offset(Unit) -> integer() when
+      Unit :: time_unit().
+
+time_offset(_Unit) ->
+    erlang:nif_error(undefined).
+
+-spec erlang:timestamp() -> Timestamp when
+      Timestamp :: timestamp().
+
+timestamp() ->
+    erlang:nif_error(undefined).
+
 %% prepare_loading/2
 -spec erlang:prepare_loading(Module, Code) -> PreparedCode | {error, Reason} when
       Module :: module(),
@@ -1357,11 +1483,26 @@ raise(_Class, _Reason, _Stacktrace) ->
     erlang:nif_error(undefined).
 
 %% read_timer/1
--spec erlang:read_timer(TimerRef) -> non_neg_integer() | false when
-      TimerRef :: reference().
+-spec erlang:read_timer(TimerRef) -> Result when
+      TimerRef :: reference(),
+      Time :: non_neg_integer(),
+      Result :: Time | false.
+
 read_timer(_TimerRef) ->
     erlang:nif_error(undefined).
 
+%% read_timer/2
+-spec erlang:read_timer(TimerRef, Options) -> Result | ok when
+      TimerRef :: reference(),
+      Async :: boolean(),
+      Option :: {async, Async},
+      Options :: [Option],
+      Time :: non_neg_integer(),
+      Result :: Time | false.
+
+read_timer(_TimerRef, _Options) ->
+    erlang:nif_error(undefined).
+
 %% ref_to_list/1
 -spec erlang:ref_to_list(Ref) -> string() when
       Ref :: reference().
@@ -1406,9 +1547,23 @@ self() ->
       Dest :: pid() | atom(),
       Msg :: term(),
       TimerRef :: reference().
+
 send_after(_Time, _Dest, _Msg) ->
     erlang:nif_error(undefined).
 
+%% send_after/4
+-spec erlang:send_after(Time, Dest, Msg, Options) -> TimerRef when
+      Time :: integer(),
+      Dest :: pid() | atom(),
+      Msg :: term(),
+      Options :: [Option],
+      Abs :: boolean(),
+      Option :: {abs, Abs},
+      TimerRef :: reference().
+
+send_after(_Time, _Dest, _Msg, _Options) ->
+    erlang:nif_error(undefined).
+
 %% seq_trace/2
 -spec erlang:seq_trace(P1, P2) -> seq_trace_info_returns() | {term(), term(), term(), term(), term()} when
       P1 :: atom(),
@@ -1480,9 +1635,23 @@ split_binary(_Bin, _Pos) ->
       Dest :: pid() | atom(),
       Msg :: term(),
       TimerRef :: reference().
+
 start_timer(_Time, _Dest, _Msg) ->
     erlang:nif_error(undefined).
 
+%% start_timer/4
+-spec erlang:start_timer(Time, Dest, Msg, Options) -> TimerRef when
+      Time :: integer(),
+      Dest :: pid() | atom(),
+      Msg :: term(),
+      Options :: [Option],
+      Abs :: boolean(),
+      Option :: {abs, Abs},
+      TimerRef :: reference().
+
+start_timer(_Time, _Dest, _Msg, _Options) ->
+    erlang:nif_error(undefined).
+
 %% suspend_process/2
 -spec erlang:suspend_process(Suspendee, OptList) -> boolean() when
       Suspendee :: pid(),
@@ -1651,7 +1820,7 @@ element(_N, _Tuple) ->
 %% Not documented
 -spec erlang:get_module_info(Module, Item) -> ModuleInfo when
       Module :: atom(),
-      Item :: module | imports | exports | functions | attributes | compile | native_addresses,
+      Item :: module | exports | functions | attributes | compile | native_addresses | md5,
       ModuleInfo :: atom() | [] | [{atom(), arity()}] | [{atom(), term()}] | [{atom(), arity(), integer()}].
 get_module_info(_Module, _Item) ->
     erlang:nif_error(undefined).
@@ -2118,6 +2287,8 @@ subtract(_,_) ->
                         (trace_control_word, TCW) -> OldTCW when
       TCW :: non_neg_integer(),
       OldTCW :: non_neg_integer();
+			(time_offset, finalize) -> OldState when
+      OldState :: preliminary | final | volatile;
                         %% These are deliberately not documented
 			(internal_cpu_topology, term()) -> term();
                         (sequential_tracer, pid() | port() | false) -> pid() | port() | false;
@@ -2222,6 +2393,7 @@ tuple_to_list(_Tuple) ->
       CpuTopology :: cpu_topology();
          (creation) -> integer();
          (debug_compiled) -> boolean();
+         (delayed_node_table_gc) -> infinity | non_neg_integer();
          (dirty_cpu_schedulers) -> non_neg_integer();
          (dirty_cpu_schedulers_online) -> non_neg_integer();
          (dirty_io_schedulers) -> non_neg_integer();
@@ -2254,6 +2426,8 @@ tuple_to_list(_Tuple) ->
          (multi_scheduling_blockers) -> [PID :: pid()];
          (nif_version) -> string();
          (otp_release) -> string();
+         (os_monotonic_time_source) -> [{atom(),term()}];
+         (os_system_time_source) -> [{atom(),term()}];
          (port_count) -> non_neg_integer();
          (port_limit) -> pos_integer();
          (process_count) -> pos_integer();
@@ -2271,10 +2445,14 @@ tuple_to_list(_Tuple) ->
          (scheduler_id) -> SchedulerId :: pos_integer();
          (schedulers | schedulers_online) -> pos_integer();
          (smp_support) -> boolean();
+         (start_time) -> integer();
          (system_version) -> string();
          (system_architecture) -> string();
          (threads) -> boolean();
          (thread_pool_size) -> non_neg_integer();
+         (time_correction) -> true | false;
+         (time_offset) -> preliminary | final | volatile;
+         (time_warp_mode) -> no_time_warp | single_time_warp | multi_time_warp;
          (tolerant_timeofday) -> enabled | disabled;
          (trace_control_word) -> non_neg_integer();
          (update_cpu_info) -> changed | unchanged;
@@ -3041,16 +3219,6 @@ integer_to_binary(I0, Base, R0) ->
         true -> integer_to_binary(I1, Base, R1)
     end.
 
-%% erlang:flush_monitor_message/2 is for internal use only!
-%%
-%% erlang:demonitor(Ref, [flush]) traps to
-%% erlang:flush_monitor_message(Ref, Res) when
-%% it needs to flush a monitor message.
-flush_monitor_message(Ref, Res) when erlang:is_reference(Ref),
-                                     erlang:is_atom(Res) ->
-    receive {_, Ref, _, _, _} -> ok after 0 -> ok end,
-    Res.
-
 -record(cpu, {node = -1,
 	      processor = -1,
 	      processor_node = -1,
@@ -3434,7 +3602,11 @@ blocks_size([], Acc) ->
 get_fix_proc([{ProcType, A1, U1}| Rest], {A0, U0}) when ProcType == proc;
 							ProcType == monitor_sh;
 							ProcType == nlink_sh;
-							ProcType == msg_ref ->
+							ProcType == msg_ref;
+							ProcType == ll_ptimer;
+							ProcType == hl_ptimer;
+							ProcType == bif_timer;
+							ProcType == accessor_bif_timer ->
     get_fix_proc(Rest, {A0+A1, U0+U1});
 get_fix_proc([_|Rest], Acc) ->
     get_fix_proc(Rest, Acc);