diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-03 17:01:52 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-03 17:01:52 +0100 |
| commit | 69b928b12d9206d00879c08e46143f599f9dc34e (patch) | |
| tree | fde8905a6ca71c797725a33895321c67e81c3645 /erts/emulator/beam/erl_port_task.c | |
| parent | 4b97d656a9e1774fd4ff984014f085ad661a4fdb (diff) | |
| parent | 1923315e618bea9fb23fc3237541f95a0accc266 (diff) | |
| download | otp-69b928b12d9206d00879c08e46143f599f9dc34e.tar.gz otp-69b928b12d9206d00879c08e46143f599f9dc34e.tar.bz2 otp-69b928b12d9206d00879c08e46143f599f9dc34e.zip | |
Merge branch 'master' into sverker/enif_select
Diffstat (limited to 'erts/emulator/beam/erl_port_task.c')
| -rw-r--r-- | erts/emulator/beam/erl_port_task.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c index 3102e44c11..4836b9e2d3 100644 --- a/erts/emulator/beam/erl_port_task.c +++ b/erts/emulator/beam/erl_port_task.c @@ -936,7 +936,7 @@ enqueue_port(ErtsRunQueue *runq, Port *pp) erts_smp_inc_runq_len(runq, &runq->ports.info, ERTS_PORT_PRIO_LEVEL); #ifdef ERTS_SMP - if (runq->halt_in_progress) + if (ERTS_RUNQ_FLGS_GET_NOB(runq) & ERTS_RUNQ_FLG_HALTING) erts_non_empty_runq(runq); #endif } |