diff options
| author | Rickard Green <[email protected]> | 2013-06-04 11:53:39 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-04 11:53:39 +0200 |
| commit | e00d6bbbabd7b76c050665fc417e81554a83e341 (patch) | |
| tree | 2881bc8f70c18ca4a36a89211a042b11c637e985 /erts/emulator/beam/erl_port_task.c | |
| parent | e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479 (diff) | |
| parent | 2a0c4c3f327eb0e8635e3a835b91c3819281bf28 (diff) | |
| download | otp-e00d6bbbabd7b76c050665fc417e81554a83e341.tar.gz otp-e00d6bbbabd7b76c050665fc417e81554a83e341.tar.bz2 otp-e00d6bbbabd7b76c050665fc417e81554a83e341.zip | |
Merge branch 'maint'
* maint:
Fix crash when reporting stale driver select
Diffstat (limited to 'erts/emulator/beam/erl_port_task.c')
| -rw-r--r-- | erts/emulator/beam/erl_port_task.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c index 53cb01a8c6..f753de8f52 100644 --- a/erts/emulator/beam/erl_port_task.c +++ b/erts/emulator/beam/erl_port_task.c @@ -1928,18 +1928,21 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p) break; case ERTS_PORT_TASK_INPUT: erts_stale_drv_select(pp->common.id, + ERTS_Port2ErlDrvPort(pp), ptp->u.alive.td.io.event, DO_READ, 1); break; case ERTS_PORT_TASK_OUTPUT: erts_stale_drv_select(pp->common.id, + ERTS_Port2ErlDrvPort(pp), ptp->u.alive.td.io.event, DO_WRITE, 1); break; case ERTS_PORT_TASK_EVENT: erts_stale_drv_select(pp->common.id, + ERTS_Port2ErlDrvPort(pp), ptp->u.alive.td.io.event, 0, 1); |