diff options
| author | Rickard Green <[email protected]> | 2014-08-11 10:16:31 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-08-11 10:16:31 +0200 |
| commit | 1fed4d803c1eb6363f26585a439cd97390b9af72 (patch) | |
| tree | 74e0d44940316247df700e2fb5aa2066aaf1289f /erts/emulator/beam | |
| parent | ae4ba88c8b39fc340fff8f3f3fea2628bf8b292e (diff) | |
| parent | cde6c2e042834d66649308093d5522c1a2001949 (diff) | |
| download | otp-1fed4d803c1eb6363f26585a439cd97390b9af72.tar.gz otp-1fed4d803c1eb6363f26585a439cd97390b9af72.tar.bz2 otp-1fed4d803c1eb6363f26585a439cd97390b9af72.zip | |
Merge branch 'rickard/nosuspend-bug/OTP-12082' into maint
* rickard/nosuspend-bug/OTP-12082:
Fix build of test port program
Update Makefile.src
Add async_ports test
Fix abort of nosuspend-tasks in erts_port_task_schedule()
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_port_task.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c index 31d9a1e26e..2fc95ed5d8 100644 --- a/erts/emulator/beam/erl_port_task.c +++ b/erts/emulator/beam/erl_port_task.c @@ -798,12 +798,13 @@ schedule_port_task_handle_list_free(ErtsPortTaskHandleList *pthlp) static ERTS_INLINE void abort_nosuspend_task(Port *pp, ErtsPortTaskType type, - ErtsPortTaskTypeData *tdp) + ErtsPortTaskTypeData *tdp, + int bpq_data) { ASSERT(type == ERTS_PORT_TASK_PROC_SIG); - if (!pp->sched.taskq.bpq) + if (!bpq_data) tdp->psig.callback(NULL, ERTS_PORT_SFLG_INVALID, ERTS_PROC2PORT_SIG_ABORT_NOSUSPEND, @@ -1345,7 +1346,7 @@ erts_port_task_abort_nosuspend_tasks(Port *pp) #endif schedule_port_task_handle_list_free(pthlp); - abort_nosuspend_task(pp, type, &td); + abort_nosuspend_task(pp, type, &td, pp->sched.taskq.bpq != NULL); } } @@ -1525,7 +1526,7 @@ abort_nosuspend: erts_port_dec_refc(pp); #endif - abort_nosuspend_task(pp, ptp->type, &ptp->u.alive.td); + abort_nosuspend_task(pp, ptp->type, &ptp->u.alive.td, 0); ASSERT(ns_pthlp); erts_free(ERTS_ALC_T_PT_HNDL_LIST, ns_pthlp); |