GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix Asset.WaitForLoaded to yield or sleep thread for proper multithreading on some platforms

Browse Source
This commit is contained in:
Wojtek Figat
2025-07-28 18:35:37 +02:00
parent 0bfd38e065
commit ad6764e6d7
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Content/Content.cpp
View File

@@ -1107,11 +1107,21 @@ void Content::WaitForTask(ContentLoadTask* loadingTask, double timeoutInMillisec
const double timeoutInSeconds = timeoutInMilliseconds * 0.001; const double timeoutInSeconds = timeoutInMilliseconds * 0.001;
const double startTime = Platform::GetTimeSeconds(); const double startTime = Platform::GetTimeSeconds();
int32 loopCounter = 0;
Task* task = loadingTask; Task* task = loadingTask;
Array<ContentLoadTask*, InlinedAllocation<64>> localQueue; Array<ContentLoadTask*, InlinedAllocation<64>> localQueue;
#define CHECK_CONDITIONS() (!Engine::ShouldExit() && (timeoutInSeconds <= 0.0 || Platform::GetTimeSeconds() - startTime < timeoutInSeconds)) #define CHECK_CONDITIONS() (!Engine::ShouldExit() && (timeoutInSeconds <= 0.0 || Platform::GetTimeSeconds() - startTime < timeoutInSeconds))
do do
{ {
// Give opportunity for other threads to use the current core
if (loopCounter == 0)
; // First run is fast
else if (loopCounter < 10)
Platform::Yield();
else
Platform::Sleep(1);
loopCounter++;
// Try to execute content tasks // Try to execute content tasks
while (task->IsQueued() && CHECK_CONDITIONS()) while (task->IsQueued() && CHECK_CONDITIONS())
{ {