diff options
author | Rickard Green <rickard@erlang.org> | 2010-06-01 13:50:50 +0000 |
---|---|---|
committer | Erlang/OTP <otp@erlang.org> | 2010-06-01 13:50:50 +0000 |
commit | b53f8a67649a371a38dc6d97b0dfe52111236a3e (patch) | |
tree | ae954fdc12817e287dab6cdce7030c9d54e83219 /erts/include/internal/i386/atomic.h | |
parent | 6999e909a9ad22d90b64263fd5edd186ac93a990 (diff) | |
download | otp-b53f8a67649a371a38dc6d97b0dfe52111236a3e.tar.gz otp-b53f8a67649a371a38dc6d97b0dfe52111236a3e.tar.bz2 otp-b53f8a67649a371a38dc6d97b0dfe52111236a3e.zip |
OTP-8658 Add missing memory barriers in erts_poll()
Missing memory barriers in erts_poll() could cause the runtime system to
hang indefinitely.
Diffstat (limited to 'erts/include/internal/i386/atomic.h')
-rw-r--r-- | erts/include/internal/i386/atomic.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/erts/include/internal/i386/atomic.h b/erts/include/internal/i386/atomic.h index 3291ad38e5..90b4c5f773 100644 --- a/erts/include/internal/i386/atomic.h +++ b/erts/include/internal/i386/atomic.h @@ -1,19 +1,19 @@ /* * %CopyrightBegin% - * - * Copyright Ericsson AB 2005-2009. All Rights Reserved. - * + * + * Copyright Ericsson AB 2005-2010. 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 * compliance with the License. You should have received a copy of the * Erlang Public License along with this software. If not, it can be * retrieved online at http://www.erlang.org/. - * + * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. - * + * * %CopyrightEnd% */ @@ -32,6 +32,16 @@ typedef struct { volatile long counter; } ethr_native_atomic_t; +#ifdef __x86_64__ +#define ETHR_MEMORY_BARRIER __asm__ __volatile__("mfence" : : : "memory") +#else +#define ETHR_MEMORY_BARRIER \ +do { \ + volatile long x___ = 0; \ + __asm__ __volatile__("lock; incl %0" : "=m"(x___) : "m"(x___) : "memory"); \ +} while (0) +#endif + #ifdef ETHR_TRY_INLINE_FUNCS #ifdef __x86_64__ |