piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 15:49:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix FifoQueue's atomicity on ARM.

Browse Source 
Theoretically.
This commit is contained in:
comex
2013-08-29 19:19:44 -04:00
parent c3b9f3556f
commit 17e753faf3
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Common/Src/FifoQueue.h
View File

@ -33,11 +33,12 @@ public:
bool Empty() const bool Empty() const
{ {
return !m_read_ptr->next; return !AtomicLoad(m_read_ptr->next);
} }
T& Front() const T& Front() const
{ {
AtomicLoadAcquire(m_read_ptr->next);
return m_read_ptr->current; return m_read_ptr->current;
} }
@ -48,7 +49,9 @@ public:
m_write_ptr->current = std::move(t); m_write_ptr->current = std::move(t);
// set the next pointer to a new element ptr // set the next pointer to a new element ptr
// then advance the write pointer // then advance the write pointer
m_write_ptr = m_write_ptr->next = new ElementPtr(); ElementPtr* new_ptr = new ElementPtr();
AtomicStoreRelease(m_write_ptr->next, new_ptr);
m_write_ptr = new_ptr;
if (NeedSize) if (NeedSize)
Common::AtomicIncrement(m_size); Common::AtomicIncrement(m_size);
} }
@ -59,7 +62,7 @@ public:
Common::AtomicDecrement(m_size); Common::AtomicDecrement(m_size);
ElementPtr *tmpptr = m_read_ptr; ElementPtr *tmpptr = m_read_ptr;
// advance the read pointer // advance the read pointer
m_read_ptr = tmpptr->next; m_read_ptr = AtomicLoad(tmpptr->next);
// set the next element to NULL to stop the recursive deletion // set the next element to NULL to stop the recursive deletion
tmpptr->next = NULL; tmpptr->next = NULL;
delete tmpptr; // this also deletes the element delete tmpptr; // this also deletes the element
@ -70,9 +73,14 @@ public:
if (Empty()) if (Empty())
return false; return false;
t = std::move(Front()); if (NeedSize)
Pop(); Common::AtomicDecrement(m_size);
ElementPtr *tmpptr = m_read_ptr;
m_read_ptr = AtomicLoadAcquire(tmpptr->next);
t = std::move(tmpptr->current);
tmpptr->next = NULL;
delete tmpptr;
return true; return true;
} }
@ -116,7 +124,7 @@ public:
iterator erase(iterator itr) iterator erase(iterator itr)
{ {
ElementPtr *elp = *itr.m_pp; ElementPtr *elp = *itr.m_pp;
*itr.m_pp = elp->next; *itr.m_pp = AtomicLoadAcquire(elp->next);
delete elp; delete elp;
return itr; return itr;
} }