AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[*] Harden thread entrypoints and post-call deinit

Browse Source
This commit is contained in:
Reece Wilson 2023-09-23 20:32:01 +01:00
parent 3c8442d8ce
commit 53215e57b1
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Threading/Threads/AuOSThread.cpp
View File

@ -77,7 +77,8 @@ namespace Aurora::Threading::Threads
#endif
OSThread::OSThread(const ThreadInfo &info) : info_(info)
OSThread::OSThread(const ThreadInfo &info) : info_(info),
epExecEvent(false, false, true)
{
this->name_ = info.name.value_or("Aurora Thread");
@ -91,7 +92,8 @@ namespace Aurora::Threading::Threads
SysAssert(this->terminatedSignalLs_ && this->terminateSignalLs_ && this->terminated_ && this->terminateSignal_);
}
OSThread::OSThread() : info_(gDummyThreadInfo)
OSThread::OSThread() : info_(gDummyThreadInfo),
epExecEvent(false, false, true)
{
this->name_ = "Main Thread";
@ -102,7 +104,8 @@ namespace Aurora::Threading::Threads
this->bNotOwned = true;
}
OSThread::OSThread(AuUInt64 id) : info_(gDummyThreadInfo)
OSThread::OSThread(AuUInt64 id) : info_(gDummyThreadInfo),
epExecEvent(false, false, true)
{
this->name_ = "System Thread";
this->handle_ = reinterpret_cast<decltype(handle_)>(id);
@ -138,6 +141,13 @@ namespace Aurora::Threading::Threads
#endif
if (this->contextUsed_)
{
this->epExecEvent->Wait();
{
AU_LOCK_GUARD(this->pFlag->mutex);
this->pFlag->bLock = true;
}
if (this->detached_)
{
bDetached = true;
@ -569,19 +579,28 @@ namespace Aurora::Threading::Threads
this->bSupportsAltKill = true;
#endif
auto pFlag = this->pFlag;
try
{
if (task_)
if (auto task = task_)
{
task_();
this->epExecEvent->Set();
task();
}
}
#if !defined(AURORA_IS_POSIX_DERIVED)
catch (...)
{
SysPushErrorHAL("OS Thread Aborted");
}
AU_LOCK_GUARD(pFlag->mutex);
if (pFlag->bLock)
{
return;
}
Exit(true);
#else
#if defined(AURORA_COMPILER_GCC)
@ -592,6 +611,12 @@ namespace Aurora::Threading::Threads
#endif
catch (...)
{
AU_LOCK_GUARD(pFlag->mutex);
if (pFlag->bLock)
{
return;
}
bFailing = true;
if (!Aurora::kIsDebugBuild)
{
@ -617,6 +642,12 @@ namespace Aurora::Threading::Threads
}
}
AU_LOCK_GUARD(pFlag->mutex);
if (pFlag->bLock)
{
return;
}
if (!bFailing)
{
Exit(true);

7
Source/Threading/Threads/AuOSThread.hpp
View File

@ -93,6 +93,12 @@ namespace Aurora::Threading::Threads
bool contextUsed_{}; // can this thread instance execute code again?
Primitives::EventShared_t terminated_;
Primitives::EventShared_t terminateSignal_;
struct Lock
{
bool bLock {};
AuMutex mutex;
};
AuSPtr<Lock> pFlag = AuMakeSharedPanic<Lock>();
AuSPtr<AuLoop::ILSEvent> terminateSignalLs_;
AuSPtr<AuLoop::ILSEvent> terminatedSignalLs_;
bool bLongJmpOnce {};
@ -100,6 +106,7 @@ namespace Aurora::Threading::Threads
bool bNotOwned {};
Primitives::CriticalSection exitOnlyOnce_;
AuList<AuSPtr<IThreadFeature>> threadFeatures_;
AuBinarySemaphore epExecEvent;
AuFunction<void()> task_;