diff options
| author | Rickard Green <[email protected]> | 2019-03-21 16:06:23 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-21 16:06:23 +0100 |
| commit | b89b9d8e5f8a136150642b9f7e34268a6d99381f (patch) | |
| tree | 6aebb61e6ce04159757a29b95bc7938df35bade9 /erts/preloaded | |
| parent | e739ec80b5546e8d04f08c1f4a6c0067be2c13a7 (diff) | |
| parent | 214b657769dd60cf2eab1824f6791225f5720a5a (diff) | |
| download | otp-b89b9d8e5f8a136150642b9f7e34268a6d99381f.tar.gz otp-b89b9d8e5f8a136150642b9f7e34268a6d99381f.tar.bz2 otp-b89b9d8e5f8a136150642b9f7e34268a6d99381f.zip | |
Merge branch 'rickard/dist_ctrl_get_data/OTP-15617'
* rickard/dist_ctrl_get_data/OTP-15617:
Testing of the example gen_tcp_dist module
Add possibility to also get size of data from erlang:dist_ctrl_get_data()
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 99948 -> 100196 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 20 |
2 files changed, 19 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 1b0cb5b50c..62dc8702e7 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index a5b60cc845..ac73946dc0 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -48,6 +48,8 @@ dist_ctrl_put_data/2, dist_ctrl_get_data/1, dist_ctrl_get_data_notification/1, + dist_ctrl_get_opt/2, + dist_ctrl_set_opt/3, dist_get_stat/1]). -deprecated([get_stacktrace/0,now/0]). @@ -3326,7 +3328,8 @@ dist_ctrl_input_handler(_DHandle, _InputHandler) -> dist_ctrl_put_data(_DHandle, _Data) -> erlang:nif_error(undefined). --spec erlang:dist_ctrl_get_data(DHandle) -> Data | 'none' when +-spec erlang:dist_ctrl_get_data(DHandle) -> {Size, Data} | Data | 'none' when + Size :: non_neg_integer(), DHandle :: dist_handle(), Data :: iodata(). @@ -3339,6 +3342,21 @@ dist_ctrl_get_data(_DHandle) -> dist_ctrl_get_data_notification(_DHandle) -> erlang:nif_error(undefined). +-spec erlang:dist_ctrl_set_opt(DHandle, 'get_size', Value) -> OldValue when + DHandle :: dist_handle(), + Value :: boolean(), + OldValue :: boolean(). + +dist_ctrl_set_opt(_DHandle, _Opt, _Val) -> + erlang:nif_error(undefined). + +-spec erlang:dist_ctrl_get_opt(DHandle, 'get_size') -> Value when + DHandle :: dist_handle(), + Value :: boolean(). + +dist_ctrl_get_opt(_DHandle, _Opt) -> + erlang:nif_error(undefined). + -spec erlang:dist_get_stat(DHandle) -> Res when DHandle :: dist_handle(), InputPackets :: non_neg_integer(), |