ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-01 00:45:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #434 from joshuawarner32/master

Browse Source 
fix concurrency bugs on ios+arm64 in `enter`
This commit is contained in:
Joel Dice 2015-05-08 15:48:39 -06:00
commit d42a354f7d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine.cpp
View File

@ -4040,6 +4040,8 @@ void enter(Thread* t, Thread::State s)
t->state = s; t->state = s;
STORE_LOAD_MEMORY_BARRIER;
if (t->m->exclusive) { if (t->m->exclusive) {
ACQUIRE_LOCK; ACQUIRE_LOCK;
@ -4091,6 +4093,8 @@ void enter(Thread* t, Thread::State s)
t->state = s; t->state = s;
STORE_LOAD_MEMORY_BARRIER;
if (t->m->exclusive) { if (t->m->exclusive) {
// another thread has entered the exclusive state, so we // another thread has entered the exclusive state, so we
// return to idle and use the slow path to become active // return to idle and use the slow path to become active