diff options
| author | Rickard Green <[email protected]> | 2017-08-28 15:00:48 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-08-28 15:00:48 +0200 |
| commit | 3aa559f584559af3a76ecd8c2367f59e062dbe0e (patch) | |
| tree | 8cdd89cabdb2b6592f03627826a7b7041441d178 /erts/emulator/beam/io.c | |
| parent | 7d8beec59350c1b3e92cee50c222f8e2ccdd30d5 (diff) | |
| parent | ffd59fbd9ac262b7aba4b86e7da4992a3e668e24 (diff) | |
| download | otp-3aa559f584559af3a76ecd8c2367f59e062dbe0e.tar.gz otp-3aa559f584559af3a76ecd8c2367f59e062dbe0e.tar.bz2 otp-3aa559f584559af3a76ecd8c2367f59e062dbe0e.zip | |
Merge branch 'rickard/dist/OTP-14459' into rickard/dist/master/OTP-14459
Conflicts:
erts/emulator/beam/bif.c
erts/emulator/beam/dist.c
erts/emulator/beam/dist.h
erts/emulator/beam/erl_bif_info.c
erts/emulator/beam/erl_node_tables.c
erts/emulator/beam/erl_node_tables.h
erts/emulator/beam/external.c
Diffstat (limited to 'erts/emulator/beam/io.c')
| -rw-r--r-- | erts/emulator/beam/io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index c8925e159e..04108e5f20 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -6682,6 +6682,7 @@ int driver_output_binary(ErlDrvPort ix, char* hbuf, ErlDrvSizeT hlen, else erts_atomic64_add_nob(&bytes_in, (erts_aint64_t) (hlen + len)); if (state & ERTS_PORT_SFLG_DISTRIBUTION) { + erts_atomic64_inc_nob(&prt->dist_entry->in); return erts_net_message(prt, prt->dist_entry, (byte*) hbuf, hlen, @@ -6722,6 +6723,7 @@ int driver_output2(ErlDrvPort ix, char* hbuf, ErlDrvSizeT hlen, else erts_atomic64_add_nob(&bytes_in, (erts_aint64_t) (hlen + len)); if (state & ERTS_PORT_SFLG_DISTRIBUTION) { + erts_atomic64_inc_nob(&prt->dist_entry->in); if (len == 0) return erts_net_message(prt, prt->dist_entry, |