diff options
| author | Rickard Green <[email protected]> | 2012-02-20 12:14:26 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-02-20 12:14:26 +0100 |
| commit | 520ddbc83ec87bcec262680bd915184182e3998e (patch) | |
| tree | 055f08a9a435b06f0e762e15954a9e309aef9651 /erts/emulator/beam/erl_thr_queue.c | |
| parent | 102c34e414f573081a93ca49162dd78cf91949b7 (diff) | |
| parent | a393026eb77ce06711c931bf68eed12d9f8ba9c9 (diff) | |
| download | otp-520ddbc83ec87bcec262680bd915184182e3998e.tar.gz otp-520ddbc83ec87bcec262680bd915184182e3998e.tar.bz2 otp-520ddbc83ec87bcec262680bd915184182e3998e.zip | |
Merge branch 'rickard/barriers/OTP-9922' into maint
* rickard/barriers/OTP-9922:
Reduce thread progress read operations in handle_aux_work()
Misc memory barrier fixes
Diffstat (limited to 'erts/emulator/beam/erl_thr_queue.c')
| -rw-r--r-- | erts/emulator/beam/erl_thr_queue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_thr_queue.c b/erts/emulator/beam/erl_thr_queue.c index efb8c635d7..70949ece76 100644 --- a/erts/emulator/beam/erl_thr_queue.c +++ b/erts/emulator/beam/erl_thr_queue.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2011. All Rights Reserved. + * Copyright Ericsson AB 2011-2012. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -418,10 +418,9 @@ clean(ErtsThrQ_t *q, int max_ops, int do_notify) } if (q->head.unref_end == (ErtsThrQElement_t *) ilast) - ERTS_THR_MEMORY_BARRIER; + ERTS_SMP_MEMORY_BARRIER; else { q->head.next.unref_end = (ErtsThrQElement_t *) ilast; - ERTS_THR_MEMORY_BARRIER; #ifdef ERTS_SMP q->head.next.thr_progress = erts_thr_progress_later(); #endif |