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/driver_SUITE_data/caller_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/driver_SUITE_data/caller_drv.c')
| -rw-r--r-- | erts/emulator/test/driver_SUITE_data/caller_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/driver_SUITE_data/caller_drv.c b/erts/emulator/test/driver_SUITE_data/caller_drv.c index 1ed20b0638..2731f9b317 100644 --- a/erts/emulator/test/driver_SUITE_data/caller_drv.c +++ b/erts/emulator/test/driver_SUITE_data/caller_drv.c @@ -85,9 +85,9 @@ send_caller(ErlDrvData drv_data, char *func) ERL_DRV_PID, driver_caller(port), ERL_DRV_TUPLE, (ErlDrvTermData) 4 }; - res = driver_output_term(port, msg, sizeof(msg)/sizeof(ErlDrvTermData)); + res = erl_drv_output_term(driver_mk_port(port), msg, sizeof(msg)/sizeof(ErlDrvTermData)); if (res <= 0) - driver_failure_atom(port, "driver_output_term failed"); + driver_failure_atom(port, "erl_drv_output_term failed"); } static ErlDrvData |