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.h | |
| 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.h')
| -rw-r--r-- | erts/emulator/beam/erl_port_task.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_port_task.h b/erts/emulator/beam/erl_port_task.h index 2a6bd165a3..e3550e878e 100644 --- a/erts/emulator/beam/erl_port_task.h +++ b/erts/emulator/beam/erl_port_task.h @@ -188,13 +188,11 @@ erts_port_task_init_sched(ErtsPortTaskSched *ptsp, Eterm instr_id) ptsp->taskq.in.last = NULL; erts_smp_atomic32_init_nob(&ptsp->flags, 0); #ifdef ERTS_SMP - erts_mtx_init_x(&ptsp->mtx, lock_str, instr_id, #ifdef ERTS_ENABLE_LOCK_COUNT - (erts_lcnt_rt_options & ERTS_LCNT_OPT_PORTLOCK) -#else - 1 + if (!(erts_lcnt_rt_options & ERTS_LCNT_OPT_PORTLOCK)) + lock_str = NULL; #endif - ); + erts_mtx_init_x(&ptsp->mtx, lock_str, instr_id); #endif } |