diff options
| author | Rickard Green <[email protected]> | 2011-12-08 15:18:51 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-12-08 15:18:51 +0100 |
| commit | 9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6 (patch) | |
| tree | 9e6ec33806e1a6cf1dd96754d0f5b52b83011ac4 /erts/emulator/beam/erl_process.c | |
| parent | 18589c852aa7a535bb518cf79a2c510caa830110 (diff) | |
| parent | d51b42b76fb9d6826ee282352ca878c02a7b459d (diff) | |
| download | otp-9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6.tar.gz otp-9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6.tar.bz2 otp-9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6.zip | |
Merge branch 'rickard/generic-thr-queue/OTP-9632'
* rickard/generic-thr-queue/OTP-9632:
Give elements of lock-free queues some time to be deallocated
Fix cleanup of elements in lock-free queues
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 055211ad9b..b8c6b64fc0 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -769,8 +769,8 @@ misc_aux_work_clean(ErtsThrQ_t *q, case ERTS_THR_Q_DIRTY: set_aux_work_flags(awdp->ssi, ERTS_SSI_AUX_WORK_MISC); return aux_work | ERTS_SSI_AUX_WORK_MISC; -#ifdef ERTS_SMP case ERTS_THR_Q_NEED_THR_PRGR: +#ifdef ERTS_SMP set_aux_work_flags(awdp->ssi, ERTS_SSI_AUX_WORK_MISC_THR_PRGR); erts_thr_progress_wakeup(awdp->esdp, erts_thr_q_need_thr_progress(q)); |