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/doc/src/erl_driver.xml | |
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/doc/src/erl_driver.xml')
-rw-r--r-- | erts/doc/src/erl_driver.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml index 13f42a74a7..1212c34586 100644 --- a/erts/doc/src/erl_driver.xml +++ b/erts/doc/src/erl_driver.xml @@ -317,9 +317,9 @@ minor version used by the driver is greater than the one used by the runtime system.</p> <p>The emulator will refuse to load a driver that does not use - the extended driver interface since, + the extended driver interface, to allow for 64-bit capable drivers, - incompatible type changes for the callbacks + since incompatible type changes for the callbacks <seealso marker="driver_entry#output">output</seealso>, <seealso marker="driver_entry#control">control</seealso> and <seealso marker="driver_entry#call">call</seealso> @@ -1560,7 +1560,7 @@ typedef struct ErlIOVec { <c>[ERL_DRV_BUSY_MSGQ_LIM_MIN, ERL_DRV_BUSY_MSGQ_LIM_MAX]</c>. Limits will be automatically adjusted to be sane. That is, the system will adjust values so that the low limit used is - lower or equal to the high limit used. By default the high + lower than or equal to the high limit used. By default the high limit will be 8 kB and the low limit will be 4 kB.</p> <p>By passing a pointer to an integer variable containing |