Core/Threading: Create ThreadPool class
# Conflicts: # src/server/worldserver/Main.cpp
This commit is contained in:
1 parent
1528eda26e
commit
6daa2ce262
2 files changed
+54
-10
No files matched your search
@@ -48,6 +48,7 @@
|
||||
#include "ScriptReloadMgr.h"
|
||||
#include "TCSoap.h"
|
||||
#include "TerrainMgr.h"
|
||||
#include "ThreadPool.h"
|
||||
#include "World.h"
|
||||
#include "WorldSocket.h"
|
||||
#include "WorldSocketMgr.h"
|
||||
@@ -239,20 +240,13 @@ extern int main(int argc, char** argv)
|
||||
|
||||
// Start the Boost based thread pool
|
||||
int numThreads = sConfigMgr->GetIntDefault("ThreadPool", 1);
|
||||
std::shared_ptr<std::vector<std::thread>> threadPool(new std::vector<std::thread>(), [ioContext](std::vector<std::thread>* del)
|
||||
{
|
||||
ioContext->stop();
|
||||
for (std::thread& thr : *del)
|
||||
thr.join();
|
||||
|
||||
delete del;
|
||||
});
|
||||
|
||||
if (numThreads < 1)
|
||||
numThreads = 1;
|
||||
|
||||
std::shared_ptr<Trinity::ThreadPool> threadPool = std::make_shared<Trinity::ThreadPool>(numThreads);
|
||||
|
||||
for (int i = 0; i < numThreads; ++i)
|
||||
threadPool->push_back(std::thread([ioContext]() { ioContext->run(); }));
|
||||
threadPool->PostWork([ioContext]() { ioContext->run(); });
|
||||
|
||||
// Set process priority according to configuration settings
|
||||
SetProcessPriority("server.worldserver", sConfigMgr->GetIntDefault(CONFIG_PROCESSOR_AFFINITY, 0), sConfigMgr->GetBoolDefault(CONFIG_HIGH_PRIORITY, false));
|
||||
@@ -389,6 +383,8 @@ extern int main(int argc, char** argv)
|
||||
WorldUpdateLoop();
|
||||
|
||||
// Shutdown starts here
|
||||
ioContext->stop();
|
||||
|
||||
threadPool.reset();
|
||||
|
||||
sLog->SetSynchronous();
|
||||
|
||||
Reference in new issue
Block a user