MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use SdlThread in dthread.cpp

Browse source
This commit is contained in:
Vladimir Olteanu 2021-07-20 11:03:11 +03:00 • committed by Anders Jenbo
commit fc8fc46e17
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/dthread.cpp
View file

@ -9,7 +9,7 @@
#include "nthread.h"
#include "utils/sdl_cond.h"
#include "utils/thread.h"
#include "utils/sdl_thread.h"
namespace devilution {
@ -31,13 +31,12 @@ struct DThreadPkt {
namespace {
std::optional<SdlMutex> DthreadMutex;
SDL_threadID glpDThreadId;
std::list<DThreadPkt> InfoList;
bool DthreadRunning;
std::optional<SdlCond> WorkToDo;
/* rdata */
SDL_Thread *sghThread = nullptr;
SdlThread Thread;
void DthreadHandler()
{
@ -87,7 +86,7 @@ void dthread_start()
DthreadRunning = true;
DthreadMutex.emplace();
WorkToDo.emplace();
sghThread = CreateThread(DthreadHandler, &glpDThreadId);
Thread = { DthreadHandler };
}
void DThreadCleanup()
@ -102,11 +101,7 @@ void DThreadCleanup()
WorkToDo->signal();
}
if (sghThread != nullptr && glpDThreadId != SDL_GetThreadID(nullptr)) {
SDL_WaitThread(sghThread, nullptr);
sghThread = nullptr;
}
Thread.join();
DthreadMutex = std::nullopt;
WorkToDo = std::nullopt;
}