From cdeed349e3d474d35d160a5aaf8dced610a3973a Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Mon, 31 Oct 2016 19:47:21 +0000 Subject: [PATCH 1/2] gsdx: Replace platform-specific threads with std::thread GSThread now doesn't seem to have a purpose, so it's been removed. --- plugins/GSdx/CMakeLists.txt | 2 +- plugins/GSdx/GSPng.h | 2 - plugins/GSdx/GSThread.cpp | 129 ------------------------------ plugins/GSdx/GSThread_CXX11.h | 72 ++--------------- plugins/GSdx/GSdx.vcxproj | 3 +- plugins/GSdx/GSdx.vcxproj.filters | 9 ++- 6 files changed, 17 insertions(+), 200 deletions(-) delete mode 100644 plugins/GSdx/GSThread.cpp diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt index 79a2cf9fc5..e98c5ac28c 100644 --- a/plugins/GSdx/CMakeLists.txt +++ b/plugins/GSdx/CMakeLists.txt @@ -104,7 +104,6 @@ set(GSdxSources GSTextureOGL.cpp GSTextureNull.cpp GSTextureSW.cpp - GSThread.cpp GSUtil.cpp GSVector.cpp GSVertexTrace.cpp @@ -164,6 +163,7 @@ set(GSdxHeaders GSTextureCacheOGL.h GSTextureNull.h GSThread.h + GSThread_CXX11.h GSUtil.h GSVector.h GSVertex.h diff --git a/plugins/GSdx/GSPng.h b/plugins/GSdx/GSPng.h index 6dd623fee3..dd8a20d466 100644 --- a/plugins/GSdx/GSPng.h +++ b/plugins/GSdx/GSPng.h @@ -59,7 +59,5 @@ namespace GSPng { virtual ~Worker() {}; void Process(shared_ptr& item); - - int GetPixels(bool reset) {return 0;} }; } diff --git a/plugins/GSdx/GSThread.cpp b/plugins/GSdx/GSThread.cpp deleted file mode 100644 index 4e47cd8ffe..0000000000 --- a/plugins/GSdx/GSThread.cpp +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) 2007-2009 Gabest - * http://www.gabest.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#include "stdafx.h" -#include "GSThread_CXX11.h" - -GSThread::GSThread() -{ - #ifdef _WIN32 - - m_ThreadId = 0; - m_hThread = NULL; - - #else - - #endif -} - -GSThread::~GSThread() -{ -} - -#ifdef _WIN32 - -DWORD WINAPI GSThread::StaticThreadProc(void* lpParam) -{ - ((GSThread*)lpParam)->ThreadProc(); - - return 0; -} - -#else - -void* GSThread::StaticThreadProc(void* param) -{ - ((GSThread*)param)->ThreadProc(); -#ifndef _STD_THREAD_ // exit is done implicitly by std::thread - pthread_exit(NULL); -#endif - return NULL; -} - -#endif - -void GSThread::CreateThread() -{ - #ifdef _WIN32 - - m_hThread = ::CreateThread(NULL, 0, StaticThreadProc, (void*)this, 0, &m_ThreadId); - - #else - - #ifdef _STD_THREAD_ - t = new thread(StaticThreadProc,(void*)this); - #else - pthread_attr_init(&m_thread_attr); - pthread_create(&m_thread, &m_thread_attr, StaticThreadProc, (void*)this); - #endif - - #endif -} - -void GSThread::CloseThread() -{ - #ifdef _WIN32 - - if(m_hThread != NULL) - { - if(WaitForSingleObject(m_hThread, 5000) != WAIT_OBJECT_0) - { - printf("GSdx: WARNING: GSThread Thread did not close itself in time. Assuming hung. Terminating.\n"); - TerminateThread(m_hThread, 1); - } - - CloseHandle(m_hThread); - - m_hThread = NULL; - m_ThreadId = 0; - } - - #else - // Should be tested on windows too one day, native handle should be disabled there though, or adapted to windows thread - #ifdef _STD_THREAD_ - - #define _NATIVE_HANDLE_ // Using std::thread native handle, allows to just use posix stuff. - #ifdef _NATIVE_HANDLE_ // std::thread join seems to be bugged, have to test it again every now and then, it did work at some point(gcc 5), seems there is bug in system lib... - pthread_t m_thread = t->native_handle(); - void *ret = NULL; - pthread_join(m_thread, &ret); - /* We are sure thread is dead, not so bad. - * Still no way to to delete that crap though... Really, wtf is this standard?? - * I guess we will have to wait that someone debug either the implementation or change standard. - * There should be a moderate memory leak for now, I am trying to find a way to fix it. - * 3kinox - */ - #else - if(t->joinable()) - { - t->join(); - } - delete(t); - #endif - #else - void* ret = NULL; - - pthread_join(m_thread, &ret); - pthread_attr_destroy(&m_thread_attr); - #endif - #endif -} - diff --git a/plugins/GSdx/GSThread_CXX11.h b/plugins/GSdx/GSThread_CXX11.h index 49e5904e05..3b380ddb1a 100644 --- a/plugins/GSdx/GSThread_CXX11.h +++ b/plugins/GSdx/GSThread_CXX11.h @@ -24,65 +24,7 @@ #include "GSdx.h" #include "boost_spsc_queue.hpp" -class IGSThread -{ -protected: - virtual void ThreadProc() = 0; -}; - -// let us use std::thread for now, comment out the definition to go back to pthread -// There are currently some bugs/limitations to std::thread (see various comment) -// For the moment let's keep pthread but uses new std object (mutex, cond_var) -//#define _STD_THREAD_ - -#ifdef _WIN32 - -class GSThread : public IGSThread -{ - DWORD m_ThreadId; - HANDLE m_hThread; - - static DWORD WINAPI StaticThreadProc(void* lpParam); - -protected: - void CreateThread(); - void CloseThread(); - -public: - GSThread(); - virtual ~GSThread(); -}; - -#else - -#ifdef _STD_THREAD_ -#include -#else -#include -#endif - -class GSThread : public IGSThread -{ - #ifdef _STD_THREAD_ - std::thread *t; - #else - pthread_attr_t m_thread_attr; - pthread_t m_thread; - #endif - static void* StaticThreadProc(void* param); - -protected: - void CreateThread(); - void CloseThread(); - -public: - GSThread(); - virtual ~GSThread(); -}; - -#endif - -template class IGSJobQueue : public GSThread +template class IGSJobQueue { public: IGSJobQueue() {} @@ -93,12 +35,12 @@ public: virtual void Wait() = 0; virtual void Process(T& item) = 0; - virtual int GetPixels(bool reset) = 0; }; template class GSJobQueue : public IGSJobQueue { -protected: +private: + std::thread m_thread; std::atomic m_count; std::atomic m_exit; ringbuffer_base m_queue; @@ -143,15 +85,17 @@ public: m_count(0), m_exit(false) { - this->CreateThread(); + m_thread = std::thread(&GSJobQueue::ThreadProc, this); } - virtual ~GSJobQueue() { + virtual ~GSJobQueue() + { m_exit = true; do { m_notempty.notify_one(); } while (m_exit); - this->CloseThread(); + + m_thread.join(); } bool IsEmpty() const { diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj index e7f6988ac2..e6eb29af2c 100644 --- a/plugins/GSdx/GSdx.vcxproj +++ b/plugins/GSdx/GSdx.vcxproj @@ -195,7 +195,6 @@ - @@ -218,6 +217,7 @@ + @@ -278,6 +278,7 @@ + diff --git a/plugins/GSdx/GSdx.vcxproj.filters b/plugins/GSdx/GSdx.vcxproj.filters index 9e2983e577..9cf3c8bc00 100644 --- a/plugins/GSdx/GSdx.vcxproj.filters +++ b/plugins/GSdx/GSdx.vcxproj.filters @@ -171,9 +171,6 @@ Source Files - - Source Files - Source Files @@ -566,6 +563,12 @@ Header Files + + Header Files + + + Header Files + From ac78688a3235d9293aa0958f283201d8fd21f4db Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Wed, 9 Nov 2016 01:34:48 +0000 Subject: [PATCH 2/2] gsdx: Make GSJobQueue non-inheritable In the previous code, the threads were created and destroyed in the base class constructor and destructor, so the threads could potentially be active while the object is in a partially constructed or destroyed state. The thread however, relies on a virtual function to process the queue items, and the vtable might not be in the desired state when the object is partially constructed or destroyed. This probably only matters during object destruction - no items are in the queue during object construction so the virtual function won't be called, but items may still be queued up when the destructor is called, so the virtual function can be called. It wasn't an issue because all uses of the thread explicitly waited for the queues to be empty before invoking the destructor. Adjust the constructor to take a std::function parameter, which the thread will use instead to process queue items, and avoid inheriting from the GSJobQueue class. This will also eliminate the need to explicitly wait for all jobs to finish (unless there are other external factors, of course), which would probably make future code safer. --- plugins/GSdx/GSCapture.cpp | 6 +----- plugins/GSdx/GSPng.cpp | 2 +- plugins/GSdx/GSPng.h | 9 ++------- plugins/GSdx/GSRasterizer.cpp | 32 +---------------------------- plugins/GSdx/GSRasterizer.h | 38 +++++++++++++---------------------- plugins/GSdx/GSThread_CXX11.h | 23 ++++++--------------- plugins/GSdx/stdafx.h | 1 + 7 files changed, 26 insertions(+), 85 deletions(-) diff --git a/plugins/GSdx/GSCapture.cpp b/plugins/GSdx/GSCapture.cpp index bac3106172..8366302552 100644 --- a/plugins/GSdx/GSCapture.cpp +++ b/plugins/GSdx/GSCapture.cpp @@ -492,7 +492,7 @@ bool GSCapture::BeginCapture(float fps, GSVector2i recomendedResolution, float a m_size.y = theApp.GetConfigI("CaptureHeight"); for(int i = 0; i < m_threads; i++) { - m_workers.push_back(std::unique_ptr(new GSPng::Worker())); + m_workers.push_back(std::unique_ptr(new GSPng::Worker(&GSPng::Process))); } #endif @@ -555,10 +555,6 @@ bool GSCapture::EndCapture() } #elif defined(__unix__) - // XXX Might not be necessary to wait - for(size_t i = 0; i < m_workers.size(); i++) { - m_workers[i]->Wait(); - } m_workers.clear(); m_frame = 0; diff --git a/plugins/GSdx/GSPng.cpp b/plugins/GSdx/GSPng.cpp index 2f05774640..0787a51dde 100644 --- a/plugins/GSdx/GSPng.cpp +++ b/plugins/GSdx/GSPng.cpp @@ -140,7 +140,7 @@ namespace GSPng { _aligned_free(m_image); } - void Worker::Process(shared_ptr& item) + void Process(std::shared_ptr& item) { Save(item->m_fmt, item->m_file, item->m_image, item->m_w, item->m_h, item->m_pitch, item->m_compression); } diff --git a/plugins/GSdx/GSPng.h b/plugins/GSdx/GSPng.h index dd8a20d466..c0b918dc23 100644 --- a/plugins/GSdx/GSPng.h +++ b/plugins/GSdx/GSPng.h @@ -52,12 +52,7 @@ namespace GSPng { bool Save(GSPng::Format fmt, const string& file, uint8* image, int w, int h, int pitch, int compression, bool rb_swapped = false); - class Worker : public GSJobQueue, 16 > - { - public: - Worker() {}; - virtual ~Worker() {}; + void Process(std::shared_ptr &item); - void Process(shared_ptr& item); - }; + using Worker = GSJobQueue, 16>; } diff --git a/plugins/GSdx/GSRasterizer.cpp b/plugins/GSdx/GSRasterizer.cpp index 29685d4461..1254dce353 100644 --- a/plugins/GSdx/GSRasterizer.cpp +++ b/plugins/GSdx/GSRasterizer.cpp @@ -1158,11 +1158,6 @@ GSRasterizerList::GSRasterizerList(int threads, GSPerfMon* perfmon) GSRasterizerList::~GSRasterizerList() { - for(auto i = m_workers.begin(); i != m_workers.end(); i++) - { - delete *i; - } - _aligned_free(m_scanline); } @@ -1213,33 +1208,8 @@ int GSRasterizerList::GetPixels(bool reset) for(size_t i = 0; i < m_workers.size(); i++) { - pixels += m_workers[i]->GetPixels(reset); + pixels += m_r[i]->GetPixels(reset); } return pixels; } - -// GSRasterizerList::GSWorker - -GSRasterizerList::GSWorker::GSWorker(GSRasterizer* r) - : GSJobQueue, 65536>() - , m_r(r) -{ -} - -GSRasterizerList::GSWorker::~GSWorker() -{ - Wait(); - - delete m_r; -} - -int GSRasterizerList::GSWorker::GetPixels(bool reset) -{ - return m_r->GetPixels(reset); -} - -void GSRasterizerList::GSWorker::Process(shared_ptr& item) -{ - m_r->Draw(item.get()); -} diff --git a/plugins/GSdx/GSRasterizer.h b/plugins/GSdx/GSRasterizer.h index 3865ccb06f..c3a77f83db 100644 --- a/plugins/GSdx/GSRasterizer.h +++ b/plugins/GSdx/GSRasterizer.h @@ -181,23 +181,12 @@ public: class GSRasterizerList : public IRasterizer { protected: - class GSWorker : public GSJobQueue, 65536 > - { - GSRasterizer* m_r; - - public: - GSWorker(GSRasterizer* r); - virtual ~GSWorker(); - - int GetPixels(bool reset); - - // GSJobQueue - - void Process(shared_ptr& item); - }; + using GSWorker = GSJobQueue, 65536>; GSPerfMon* m_perfmon; - vector m_workers; + // Worker threads depend on the rasterizers, so don't change the order. + std::vector> m_r; + std::vector> m_workers; uint8* m_scanline; int m_thread_height; @@ -214,17 +203,18 @@ public: { return new GSRasterizer(new DS(), 0, 1, perfmon); } - else + + GSRasterizerList* rl = new GSRasterizerList(threads, perfmon); + + for(int i = 0; i < threads; i++) { - GSRasterizerList* rl = new GSRasterizerList(threads, perfmon); - - for(int i = 0; i < threads; i++) - { - rl->m_workers.push_back(new GSWorker(new GSRasterizer(new DS(), i, threads, perfmon))); - } - - return rl; + rl->m_r.push_back(std::unique_ptr(new GSRasterizer(new DS(), i, threads, perfmon))); + auto &r = *rl->m_r[i]; + rl->m_workers.push_back(std::unique_ptr(new GSWorker( + [&r](std::shared_ptr &item) { r.Draw(item.get()); }))); } + + return rl; } // IRasterizer diff --git a/plugins/GSdx/GSThread_CXX11.h b/plugins/GSdx/GSThread_CXX11.h index 3b380ddb1a..05a9b5889b 100644 --- a/plugins/GSdx/GSThread_CXX11.h +++ b/plugins/GSdx/GSThread_CXX11.h @@ -24,23 +24,11 @@ #include "GSdx.h" #include "boost_spsc_queue.hpp" -template class IGSJobQueue -{ -public: - IGSJobQueue() {} - virtual ~IGSJobQueue() {} - - virtual bool IsEmpty() const = 0; - virtual void Push(const T& item) = 0; - virtual void Wait() = 0; - - virtual void Process(T& item) = 0; -}; - -template class GSJobQueue : public IGSJobQueue +template class GSJobQueue final { private: std::thread m_thread; + std::function m_func; std::atomic m_count; std::atomic m_exit; ringbuffer_base m_queue; @@ -81,14 +69,15 @@ private: } public: - GSJobQueue() : + GSJobQueue(std::function func) : + m_func(func), m_count(0), m_exit(false) { m_thread = std::thread(&GSJobQueue::ThreadProc, this); } - virtual ~GSJobQueue() + ~GSJobQueue() { m_exit = true; do { @@ -129,6 +118,6 @@ public: } void operator() (T& item) { - this->Process(item); + m_func(item); } }; diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h index e0484a4235..6a7c9bd780 100644 --- a/plugins/GSdx/stdafx.h +++ b/plugins/GSdx/stdafx.h @@ -107,6 +107,7 @@ typedef int64 sint64; #include #include #include +#include using namespace std;