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

Fix very rare cases of deadlocks in Asset::WaitForLoaded

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-30 15:52:58 +02:00
parent e0a2904dbf
commit 560d7153ae
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Engine/Content/Asset.cpp
View File

@@ -330,28 +330,44 @@ bool Asset::WaitForLoaded(double timeoutInMilliseconds)
// So during loading first material it will wait for child materials loaded calling this function
Task* task = loadingTask;
Array<ContentLoadTask*, InlinedAllocation<64>> localQueue;
while (!Engine::ShouldExit())
{
// Try to execute content tasks
while (task->IsQueued() && !Engine::ShouldExit())
{
// Pick this task from the queue
// Dequeue task from the loading queue
ContentLoadTask* tmp;
if (ContentLoadingManagerImpl::Tasks.try_dequeue(tmp))
{
if (tmp == task)
{
if (localQueue.Count() != 0)
{
// Put back queued tasks
ContentLoadingManagerImpl::Tasks.enqueue_bulk(localQueue.Get(), localQueue.Count());
localQueue.Clear();
}
thread->Run(tmp);
}
else
{
ContentLoadingManagerImpl::Tasks.enqueue(tmp);
localQueue.Add(tmp);
}
}
else
{
// No task in queue but it's queued so other thread could have stolen it into own local queue
break;
}
}
if (localQueue.Count() != 0)
{
// Put back queued tasks
ContentLoadingManagerImpl::Tasks.enqueue_bulk(localQueue.Get(), localQueue.Count());
localQueue.Clear();
}
// Wait some time
//Platform::Sleep(1);
// Check if task is done
if (task->IsEnded())
@@ -383,7 +399,7 @@ bool Asset::WaitForLoaded(double timeoutInMilliseconds)
Content::tryCallOnLoaded(this);
}
return IsLoaded() == false;
return _isLoaded == 0;
}
void Asset::InitAsVirtual()