diff options
| author | Rickard Green <[email protected]> | 2013-02-14 17:39:29 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-02-14 17:39:29 +0100 |
| commit | 08dde65f70ef2b2218e9350bb4013b40aed65996 (patch) | |
| tree | e06948a48b99ab1a999eeb794a7dcd3604be58da /erts/emulator/sys/win32/sys.c | |
| parent | 953dffbb4b1497f86004b9bc4e13bf9ed6cc2bed (diff) | |
| parent | 56b2a90c7c0e1d9c1e964ee324413d651a37e6e3 (diff) | |
| download | otp-08dde65f70ef2b2218e9350bb4013b40aed65996.tar.gz otp-08dde65f70ef2b2218e9350bb4013b40aed65996.tar.bz2 otp-08dde65f70ef2b2218e9350bb4013b40aed65996.zip | |
Merge branch 'rickard/r16b/port-optimizations-fixes/OTP-10809'
* rickard/r16b/port-optimizations-fixes/OTP-10809:
Add erl_drv_busy_msgq_limits() to driver API on Windows
Fix driver port accesses
Fix port exit
Diffstat (limited to 'erts/emulator/sys/win32/sys.c')
| -rwxr-xr-x | erts/emulator/sys/win32/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index 1cd9072cea..f7756f99bc 100755 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -1260,9 +1260,9 @@ spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* opts) retval = set_driver_data(dp, hFromChild, hToChild, opts->read_write, opts->exit_status); if (retval != ERL_DRV_ERROR_GENERAL && retval != ERL_DRV_ERROR_ERRNO) { - Port *prt = erts_drvport2port_raw(port_num); + Port *prt = erts_drvport2port(port_num); /* We assume that this cannot generate a negative number */ - ASSERT(prt); + ASSERT(prt != ERTS_INVALID_ERL_DRV_PORT); prt->os_pid = (SWord) pid; } } |