diff options
| author | Rickard Green <[email protected]> | 2011-03-10 14:29:59 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-03-10 14:29:59 +0100 |
| commit | 0213def22b5ab6f145a5529f9bbef0d26124abaf (patch) | |
| tree | 5c47bce2d933052236bc7b9f9b4253d2489f3557 /erts/include/internal/pthread/ethr_event.h | |
| parent | 839e24abdcc3e5a16ac78eb45e09736370e596fe (diff) | |
| parent | a37ee29884eaaf8b177cec19821159c938ddf6ff (diff) | |
| download | otp-0213def22b5ab6f145a5529f9bbef0d26124abaf.tar.gz otp-0213def22b5ab6f145a5529f9bbef0d26124abaf.tar.bz2 otp-0213def22b5ab6f145a5529f9bbef0d26124abaf.zip | |
Merge branch 'rickard/scheduler-wait/OTP-9105' into dev
* rickard/scheduler-wait/OTP-9105:
The emulator could get into a state where it didn't check for I/O.
Diffstat (limited to 'erts/include/internal/pthread/ethr_event.h')
| -rw-r--r-- | erts/include/internal/pthread/ethr_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/include/internal/pthread/ethr_event.h b/erts/include/internal/pthread/ethr_event.h index 93da8a0429..b74b76a443 100644 --- a/erts/include/internal/pthread/ethr_event.h +++ b/erts/include/internal/pthread/ethr_event.h @@ -62,7 +62,7 @@ static void ETHR_INLINE ETHR_INLINE_FUNC_NAME_(ethr_event_set)(ethr_event *e) { ethr_sint32_t val; - ETHR_WRITE_MEMORY_BARRIER; + ETHR_MEMORY_BARRIER; val = ethr_atomic32_xchg(&e->futex, ETHR_EVENT_ON__); if (val == ETHR_EVENT_OFF_WAITER__) { int res = ETHR_FUTEX__(&e->futex, ETHR_FUTEX_WAKE__, 1); @@ -99,7 +99,7 @@ static void ETHR_INLINE ETHR_INLINE_FUNC_NAME_(ethr_event_set)(ethr_event *e) { ethr_sint32_t val; - ETHR_WRITE_MEMORY_BARRIER; + ETHR_MEMORY_BARRIER; val = ethr_atomic32_xchg(&e->state, ETHR_EVENT_ON__); if (val == ETHR_EVENT_OFF_WAITER__) { int res = pthread_mutex_lock(&e->mtx); |