edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::vector for jobpool threads

Browse source 
To simplify the usage and to support an arbitrary number of threads.
This commit is contained in:
Robert Müller 2023-10-15 21:27:50 +02:00
parent 97c1046104
commit 2dcec6496f
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/engine/shared/jobs.cpp
View file

@ -19,7 +19,6 @@ int IJob::Status()
CJobPool::CJobPool()
{
// empty the pool
m_NumThreads = 0;
m_Shutdown = false;
m_Lock = lock_create();
sphore_init(&m_Semaphore);
@ -69,21 +68,19 @@ void CJobPool::WorkerThread(void *pUser)
void CJobPool::Init(int NumThreads)
{
// start threads
m_NumThreads = NumThreads > MAX_THREADS ? MAX_THREADS : NumThreads;
m_vpThreads.reserve(NumThreads);
for(int i = 0; i < NumThreads; i++)
m_apThreads[i] = thread_init(WorkerThread, this, "CJobPool worker");
m_vpThreads.push_back(thread_init(WorkerThread, this, "CJobPool worker"));
}
void CJobPool::Destroy()
{
m_Shutdown = true;
for(int i = 0; i < m_NumThreads; i++)
for(size_t i = 0; i < m_vpThreads.size(); i++)
sphore_signal(&m_Semaphore);
for(int i = 0; i < m_NumThreads; i++)
{
if(m_apThreads[i])
thread_wait(m_apThreads[i]);
}
for(void *pThread : m_vpThreads)
thread_wait(pThread);
m_vpThreads.clear();
lock_destroy(m_Lock);
sphore_destroy(&m_Semaphore);
}

8
src/engine/shared/jobs.h
View file

@ -7,6 +7,7 @@
#include <atomic>
#include <memory>
#include <vector>
class CJobPool;
@ -37,12 +38,7 @@ public:
class CJobPool
{
enum
{
MAX_THREADS = 32
};
int m_NumThreads;
void *m_apThreads[MAX_THREADS];
std::vector<void *> m_vpThreads;
std::atomic<bool> m_Shutdown;
LOCK m_Lock;