diff options
author | Lukas Larsson <lukas@erlang.org> | 2019-06-18 15:21:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-18 15:21:54 +0200 |
commit | a9373f7f3ee139a62207235f2e197135df4d8aef (patch) | |
tree | 101d8901a13df3b2b49060fbf04101a6a26b192f | |
parent | e4c7350a94affef3c295e00a4a6662222b6207d5 (diff) | |
parent | 6d337a2e2bbafe5a261b876fed139b2ba53edc75 (diff) | |
download | erlang-a9373f7f3ee139a62207235f2e197135df4d8aef.tar.gz |
Merge pull request #2270 from essen/dist-get-stat-real-pend-value/OTP-15905
Return real pend value in erlang:dist_get_stat/1
-rw-r--r-- | erts/emulator/beam/dist.c | 2 | ||||
-rw-r--r-- | erts/preloaded/src/erlang.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 5e48a553af..d8501ea6ac 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -3375,7 +3375,7 @@ dist_get_stat_1(BIF_ALIST_1) am_ok, erts_bld_sint64(hpp, szp, read), erts_bld_sint64(hpp, szp, write), - pend ? am_true : am_false); + erts_bld_sint64(hpp, szp, pend)); if (hpp) break; hp = HAlloc(BIF_P, sz); diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index ac73946dc0..06f0ee1dc6 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3361,7 +3361,7 @@ dist_ctrl_get_opt(_DHandle, _Opt) -> DHandle :: dist_handle(), InputPackets :: non_neg_integer(), OutputPackets :: non_neg_integer(), - PendingOutputPackets :: boolean(), + PendingOutputPackets :: non_neg_integer(), Res :: {'ok', InputPackets, OutputPackets, PendingOutputPackets}. dist_get_stat(_DHandle) -> |