ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx sw: minor fix on the thread management 

* Upgrade the counter to signed 32 bits. 16 bits is too small to contains the 64K value.
* Read ThreadProc/m_count when the mutex is locked
* Use old value of the fetch instead to read back the new value
This commit is contained in:
Gregory Hainaut 2016-12-31 16:59:38 +01:00
parent 14a76a8499
commit 1be3f48017
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/GSdx/GSThread_CXX11.h
View File

@ -29,7 +29,7 @@ template<class T, int CAPACITY> class GSJobQueue final
private: private:
std::thread m_thread; std::thread m_thread;
std::function<void(T&)> m_func; std::function<void(T&)> m_func;
std::atomic<int16_t> m_count; std::atomic<int32_t> m_count;
std::atomic<bool> m_exit; std::atomic<bool> m_exit;
ringbuffer_base<T, CAPACITY> m_queue; ringbuffer_base<T, CAPACITY> m_queue;
@ -50,19 +50,21 @@ private:
m_notempty.wait(l); m_notempty.wait(l);
} }
int32_t nb = m_count
l.unlock(); l.unlock();
int16_t consumed = 0; int32_t consumed = 0;
for (int16_t nb = m_count; nb >= 0; nb--) { for (; nb >= 0; nb--) {
if (m_queue.consume_one(*this)) if (m_queue.consume_one(*this))
consumed++; consumed++;
} }
l.lock(); l.lock();
m_count -= consumed; int32_t old_count = m_count.fetch_sub(consumed);
if (m_count <= 0) if (old_count == consumed)
m_empty.notify_one(); m_empty.notify_one();
} }