UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made thread worker processing limits configurable at runtime (bug 5326, r=psychonic).

Browse Source
This commit is contained in:
Asher Baker 2012-12-14 15:16:35 -05:00
parent e77ad244ad
commit 439986e3fe
5 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/logic/thread/BaseWorker.cpp
View File

@ -124,11 +124,6 @@ void BaseWorker::AddThreadToQueue(SWThreadHandle *pHandle)
m_ThreadQueue.push_back(pHandle); m_ThreadQueue.push_back(pHandle);
} }
unsigned int BaseWorker::GetMaxThreadsPerFrame()
{
return m_perFrame;
}
WorkerState BaseWorker::GetStatus(unsigned int *threads) WorkerState BaseWorker::GetStatus(unsigned int *threads)
{ {
if (threads) if (threads)
@ -140,7 +135,7 @@ WorkerState BaseWorker::GetStatus(unsigned int *threads)
unsigned int BaseWorker::RunFrame() unsigned int BaseWorker::RunFrame()
{ {
unsigned int done = 0; unsigned int done = 0;
unsigned int max = GetMaxThreadsPerFrame(); unsigned int max = m_perFrame;
SWThreadHandle *swt = NULL; SWThreadHandle *swt = NULL;
IThread *pThread = NULL; IThread *pThread = NULL;

4
core/logic/thread/BaseWorker.h
View File

@ -84,6 +84,8 @@ public: //IWorker
virtual unsigned int Flush(bool flush_cancel); virtual unsigned int Flush(bool flush_cancel);
//returns status and number of threads in queue //returns status and number of threads in queue
virtual WorkerState GetStatus(unsigned int *numThreads); virtual WorkerState GetStatus(unsigned int *numThreads);
virtual void SetMaxThreadsPerFrame(unsigned int threads);
virtual void SetThinkTimePerFrame(unsigned int thinktime) {}
public: //IThreadCreator public: //IThreadCreator
virtual void MakeThread(IThread *pThread); virtual void MakeThread(IThread *pThread);
virtual IThreadHandle *MakeThread(IThread *pThread, ThreadFlags flags); virtual IThreadHandle *MakeThread(IThread *pThread, ThreadFlags flags);
@ -92,8 +94,6 @@ public: //IThreadCreator
public: //BaseWorker public: //BaseWorker
virtual void AddThreadToQueue(SWThreadHandle *pHandle); virtual void AddThreadToQueue(SWThreadHandle *pHandle);
virtual SWThreadHandle *PopThreadFromQueue(); virtual SWThreadHandle *PopThreadFromQueue();
virtual void SetMaxThreadsPerFrame(unsigned int threads);
virtual unsigned int GetMaxThreadsPerFrame();
protected: protected:
SourceHook::List<SWThreadHandle *> m_ThreadQueue; SourceHook::List<SWThreadHandle *> m_ThreadQueue;
unsigned int m_perFrame; unsigned int m_perFrame;

5
core/logic/thread/ThreadWorker.cpp
View File

@ -209,6 +209,11 @@ WorkerState ThreadWorker::GetStatus(unsigned int *threads)
return state; return state;
} }
void ThreadWorker::SetThinkTimePerFrame(unsigned int thinktime)
{
m_think_time = thinktime;
}
bool ThreadWorker::Start() bool ThreadWorker::Start()
{ {
if (m_state == Worker_Invalid) if (m_state == Worker_Invalid)

2
core/logic/thread/ThreadWorker.h
View File

@ -53,6 +53,8 @@ public: //IWorker
virtual bool Stop(bool flush_cancel); virtual bool Stop(bool flush_cancel);
//returns status and number of threads in queue //returns status and number of threads in queue
virtual WorkerState GetStatus(unsigned int *numThreads); virtual WorkerState GetStatus(unsigned int *numThreads);
//virtual void SetMaxThreadsPerFrame(unsigned int threads);
virtual void SetThinkTimePerFrame(unsigned int thinktime);
public: //BaseWorker public: //BaseWorker
virtual void AddThreadToQueue(SWThreadHandle *pHandle); virtual void AddThreadToQueue(SWThreadHandle *pHandle);
virtual SWThreadHandle *PopThreadFromQueue(); virtual SWThreadHandle *PopThreadFromQueue();

19
public/IThreader.h
View File

@ -40,7 +40,7 @@
#include <IShareSys.h> #include <IShareSys.h>
#define SMINTERFACE_THREADER_NAME "IThreader" #define SMINTERFACE_THREADER_NAME "IThreader"
#define SMINTERFACE_THREADER_VERSION 2 #define SMINTERFACE_THREADER_VERSION 3
namespace SourceMod namespace SourceMod
{ {
@ -362,6 +362,23 @@ namespace SourceMod
* @return State of the worker. * @return State of the worker.
*/ */
virtual WorkerState GetStatus(unsigned int *numThreads) =0; virtual WorkerState GetStatus(unsigned int *numThreads) =0;
/**
* @brief Sets the number of threads to run per frame.
* Default value is 1 thread per frame.
*
* @param threads Number of threads to run per frame.
*/
virtual void SetMaxThreadsPerFrame(unsigned int threads) =0;
/**
* @brief For threaded workers, the think time of a frame.
* Has no effect for non-threaded workers.
* Default value is 50ms.
*
* @param thinktime Number of ms to sleep between frame execution.
*/
virtual void SetThinkTimePerFrame(unsigned int thinktime) =0;
}; };
/** /**