aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/lib/kernel/include/dist_util.hrl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-09-01 10:55:01 +0200
committerBjörn Gustavsson <[email protected]>2017-09-01 11:28:36 +0200
commit31a38a1bd3814c22f217afbd686f20ee5a2fe434 (patch)
treeb5a0b3660ef4a943e72a31d4334d991663477c98 /bootstrap/lib/kernel/include/dist_util.hrl
parentfdf30c9a74871e45fc15004835f96cb1481fa5ca (diff)
downloadotp-31a38a1bd3814c22f217afbd686f20ee5a2fe434.tar.gz
otp-31a38a1bd3814c22f217afbd686f20ee5a2fe434.tar.bz2
otp-31a38a1bd3814c22f217afbd686f20ee5a2fe434.zip
Update primary bootstrap
Diffstat (limited to 'bootstrap/lib/kernel/include/dist_util.hrl')
-rw-r--r--bootstrap/lib/kernel/include/dist_util.hrl12
1 files changed, 9 insertions, 3 deletions
diff --git a/bootstrap/lib/kernel/include/dist_util.hrl b/bootstrap/lib/kernel/include/dist_util.hrl
index e3d2fe0eb6..eeb0f8dd43 100644
--- a/bootstrap/lib/kernel/include/dist_util.hrl
+++ b/bootstrap/lib/kernel/include/dist_util.hrl
@@ -29,9 +29,9 @@
-endif.
-ifdef(dist_trace).
--define(trace(Fmt,Args), io:format("~p ~p:~s",[erlang:timestamp(),node(),lists:flatten(io_lib:format(Fmt, Args))])).
+-define(trace(Fmt,Args), io:format("~p ~p:~s",[erlang:convert_time_unit(erlang:monotonic_time()-erlang:system_info(start_time), native, microsecond),node(),lists:flatten(io_lib:format(Fmt, Args))])).
% Use the one below for config-file (early boot) connection tracing
-%-define(trace(Fmt,Args), erlang:display([erlang:now(),node(),lists:flatten(io_lib:format(Fmt, Args))])).
+%-define(trace(Fmt,Args), erlang:display([erlang:convert_time_unit(erlang:monotonic_time()-erlang:system_info(start_time), native, microsecond),node(),lists:flatten(io_lib:format(Fmt, Args))])).
-define(trace_factor,8).
-else.
-define(trace(Fmt,Args), ok).
@@ -78,7 +78,13 @@
%% New in kernel-5.1 (OTP 19.1):
mf_setopts, %% netkernel:setopts on active connection
- mf_getopts %% netkernel:getopts on active connection
+ mf_getopts, %% netkernel:getopts on active connection
+
+ %% New in kernel-6.0 (OTP 21.0)
+ f_handshake_complete, %% Notify handshake complete
+ add_flags, %% dflags to add
+ reject_flags, %% dflags not to use (not all can be rejected)
+ require_flags %% dflags that are required
}).