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

[*] Fix regressions in work groups

Browse Source
This commit is contained in:
Reece Wilson 2024-01-23 22:35:18 +00:00
parent cf3d4fc001
commit cb751d0286
7 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Async/AuGroupState.cpp
View File

@ -80,7 +80,7 @@ namespace Aurora::Async
continue;
}
pWorker->sync.SetEvent();
pWorker->sync.SetEvent(true, true);
}
}

10
Source/Async/AuGroupWorkQueue.cpp
View File

@ -13,7 +13,7 @@
namespace Aurora::Async
{
void GroupWorkQueue::AddWorkEntry(ThreadState *pState, WorkEntry_t entry)
void GroupWorkQueue::AddWorkEntry(WorkEntry_t entry)
{
AU_DEBUG_MEMCRUNCH;
@ -22,14 +22,6 @@ namespace Aurora::Async
AU_LOCK_GUARD(this->mutex);
this->sortedWork[prio].push_back(entry);
if (entry.first != kThreadIdAny)
{
if (auto pThat = pState->parent.lock()->GetThreadByIndex(entry.first))
{
AuAtomicAdd(&pThat->sync.cvHasWork, 1u);
}
}
}
bool GroupWorkQueue::IsEmpty()

2
Source/Async/AuGroupWorkQueue.hpp
View File

@ -24,7 +24,7 @@ namespace Aurora::Async
bool IsEmpty();
bool IsEmpty(ThreadPool *pPool, AuWorkerId_t id);
void AddWorkEntry(ThreadState *pState, WorkEntry_t entry);
void AddWorkEntry(WorkEntry_t entry);
void Dequeue(AuList<WorkEntry_t> &queue, int maxPopCount, AuAsync::ThreadId_t idd);
};

7
Source/Async/AuThreadState.cpp
View File

@ -54,7 +54,7 @@ namespace Aurora::Async
return true;
}
void ThreadStateSync::SetEvent(bool bBoth)
void ThreadStateSync::SetEvent(bool bBoth, bool bHasWork)
{
if (auto pEvent = this->eventLs)
{
@ -64,6 +64,11 @@ namespace Aurora::Async
}
}
if (bHasWork)
{
AuAtomicAdd(&this->cvHasWork, 1u);
}
if (bBoth)
{
this->cvWorkMutex->Lock();

2
Source/Async/AuThreadState.hpp
View File

@ -33,7 +33,7 @@ namespace Aurora::Async
AuAUInt32 cvHasWork {};
AuSPtr<AuLoop::ILSEvent> eventLs;
void SetEvent(bool bBoth = true);
void SetEvent(bool bBoth = true, bool bHasWork = false);
bool Init();
void UpdateCVState(ThreadState *pState);
};

35
Source/Async/ThreadPool.cpp
View File

@ -137,20 +137,24 @@ namespace Aurora::Async
void ThreadPool::Run(WorkerId_t target, AuSPtr<IAsyncRunnable> runnable, bool bIncrement)
{
auto state = GetGroup(target.first);
SysAssert(static_cast<bool>(state), "couldn't dispatch a task to an offline group");
AuSPtr<ThreadState> pWorker;
auto pGroupState = GetGroup(target.first);
SysAssert(static_cast<bool>(pGroupState), "couldn't dispatch a task to an offline group");
auto pWorker = state->GetThreadByIndex(target.second);
if (!pWorker)
if (target.second != Async::kThreadIdAny)
{
runnable->CancelAsync();
return;
}
pWorker = pGroupState->GetThreadByIndex(target.second);
if (!pWorker)
{
runnable->CancelAsync();
return;
}
if (pWorker->shutdown.bDropSubmissions)
{
runnable->CancelAsync();
return;
if (pWorker->shutdown.bDropSubmissions)
{
runnable->CancelAsync();
return;
}
}
if (bIncrement)
@ -158,15 +162,15 @@ namespace Aurora::Async
AuAtomicAdd(&this->uAtomicCounter, 1u);
}
state->workQueue.AddWorkEntry(pWorker.get(), AuMakePair(target.second, runnable));
pGroupState->workQueue.AddWorkEntry(AuMakePair(target.second, runnable));
if (target.second == Async::kThreadIdAny)
{
state->SignalAll();
pGroupState->SignalAll();
}
else
{
pWorker->sync.SetEvent();
pWorker->sync.SetEvent(true, true);
}
}
@ -441,7 +445,7 @@ namespace Aurora::Async
for (const auto &item : state->pendingWorkItems)
{
group->workQueue.AddWorkEntry(state.get(), item);
group->workQueue.AddWorkEntry(item);
}
state->pendingWorkItems.clear();
@ -1102,6 +1106,7 @@ namespace Aurora::Async
return false;
}
pGroup->group = workerId.first;
this->threadGroups_[workerId.first] = pGroup;
}
}

2
Source/Async/WorkItem.cpp
View File

@ -26,6 +26,8 @@ namespace Aurora::Async
worker_(worker), task_(task), owner_(owner),
finishedEvent_(false, true, true)
{
SysAssert(owner, "Unable to dispatch on an unspecified pool");
this->uShutdownCookie = owner->uAtomicShutdownCookie;
if (auto pWorker = this->GetState())