diff options
author | Rickard Green <[email protected]> | 2013-01-23 14:52:03 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2013-01-23 14:52:03 +0100 |
commit | 6141db8f76d310f648cc8e278cf9b62bf1417ca8 (patch) | |
tree | 4e8e34ff9c53b9ac2650dfb993f2af159acd53f0 /erts/emulator/test/send_term_SUITE_data/send_term_drv.c | |
parent | cc8285ed57ad46fcbbbfb333535ff472dd57ec27 (diff) | |
parent | e3373f0602282040ae7a75b5b7ebbdcae2789c17 (diff) | |
download | otp-6141db8f76d310f648cc8e278cf9b62bf1417ca8.tar.gz otp-6141db8f76d310f648cc8e278cf9b62bf1417ca8.tar.bz2 otp-6141db8f76d310f648cc8e278cf9b62bf1417ca8.zip |
Merge branch 'rickard/r16/port-optimizations/OTP-10336'
* rickard/r16/port-optimizations/OTP-10336:
Bump reductions also for immediate driver calls
Add 'port_count' and 'port_limit' to system_info/1 spec
Fix documentation
Replace use of deprecated functions in test cases
Replace use of driver_send_term() with erl_drv_send_term()
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/test/send_term_SUITE_data/send_term_drv.c')
-rw-r--r-- | erts/emulator/test/send_term_SUITE_data/send_term_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/test/send_term_SUITE_data/send_term_drv.c b/erts/emulator/test/send_term_SUITE_data/send_term_drv.c index b3feca79f0..f8613487b0 100644 --- a/erts/emulator/test/send_term_SUITE_data/send_term_drv.c +++ b/erts/emulator/test/send_term_SUITE_data/send_term_drv.c @@ -664,7 +664,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, ErlDrvSizeT count) /* Signal end of test case */ msg[0] = ERL_DRV_NIL; - driver_output_term(erlang_port, msg, 1); + erl_drv_output_term(driver_mk_port(erlang_port), msg, 1); return; } break; @@ -687,14 +687,14 @@ static void send_term_drv_run(ErlDrvData port, char *buf, ErlDrvSizeT count) static void output_term(ErlDrvTermData* msg, int len) { - if (driver_output_term(erlang_port, msg, len) <= 0) { - driver_failure_atom(erlang_port, "driver_output_term_failed"); + if (erl_drv_output_term(driver_mk_port(erlang_port), msg, len) <= 0) { + driver_failure_atom(erlang_port, "erl_drv_output_term_failed"); } } static void fail_term(ErlDrvTermData* msg, int len, int line) { - int status = driver_output_term(erlang_port, msg, len); + int status = erl_drv_output_term(driver_mk_port(erlang_port), msg, len); if (status == 1) { char buf[1024]; |