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 /lib/megaco/src | |
| 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 'lib/megaco/src')
| -rw-r--r-- | lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src b/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src index b8146c345d..5faddb08c5 100644 --- a/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src +++ b/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src @@ -76,6 +76,7 @@ typedef struct { ErlDrvPort port; + ErlDrvTermData port_id; char* digit_map_name_ptr; int digit_map_name_len; char* digit_map_value_ptr; @@ -1497,6 +1498,7 @@ static ErlDrvData mfs_start(ErlDrvPort port, char *buf) DBG( ("mfs_start -> entry\n") ); dataP->port = port; + dataP->port_id = driver_mk_port(port); dataP->digit_map_name_ptr = NULL; dataP->digit_map_name_len = 0; dataP->digit_map_value_ptr = NULL; @@ -1841,10 +1843,10 @@ static ErlDrvSSizeT mfs_control(ErlDrvData handle, "\n term_spec_size: %d\n", dataP->term_spec_index, dataP->term_spec_size) ); - driver_send_term(dataP->port, - driver_caller(dataP->port), - dataP->term_spec, - dataP->term_spec_index); + erl_drv_send_term(dataP->port_id, + driver_caller(dataP->port), + dataP->term_spec, + dataP->term_spec_index); if (dataP->text_buf != NULL) FREE(dataP->text_buf); if (dataP->term_spec != NULL) FREE(dataP->term_spec); |