izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

UE4 - Fix hang in FTaskGraphInterface::BroadcastSlow_OnlyUseForSpecialPurposes caused by back to back calls.

Browse Source 
#lockdown nick.penwarden

[CL 2949490 by Gil Gribb in Main branch]
This commit is contained in:
Gil Gribb
2016-04-20 08:00:05 -04:00
committed by gil.gribb@epicgames.com
parent fc87933546
commit 191dfe7cab
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Engine/Source/Runtime/Core/Private/Async/TaskGraph.cpp
View File

@@ -2671,11 +2671,13 @@ public:
Function(CurrentThread);
if (StallForTaskThread)
{
StallForTaskThread->Decrement();
// we wait for the others to finish here so that we do all task threads
while (StallForTaskThread->GetValue())
if (StallForTaskThread->Decrement())
{
FPlatformProcess::SleepNoStats(.0002f);
// we wait for the others to finish here so that we do all task threads
while (StallForTaskThread->GetValue())
{
FPlatformProcess::SleepNoStats(.0002f);
}
}
}
}
@@ -2697,18 +2699,18 @@ void FTaskGraphInterface::BroadcastSlow_OnlyUseForSpecialPurposes(bool bDoBackgr
return;
}
// these are static because we don't actually wait for the tasks to clear
static FThreadSafeCounter StallForTaskThread;
FThreadSafeCounter StallForTaskThread;
int32 Workers = FTaskGraphInterface::Get().GetNumWorkerThreads();
StallForTaskThread.Reset();
StallForTaskThread.Add(Workers * (1 + (bDoBackgroundThreads && ENamedThreads::bHasBackgroundThreads) + !!(ENamedThreads::bHasHighPriorityThreads)));
FGraphEventArray TaskThreadTasks;
{
for (int32 Index = 0; Index < Workers; Index++)
{
TGraphTask<FBroadcastTask>::CreateTask().ConstructAndDispatchWhenReady(Callback, ENamedThreads::AnyNormalThreadHiPriTask, &StallForTaskThread);
TaskThreadTasks.Add(TGraphTask<FBroadcastTask>::CreateTask().ConstructAndDispatchWhenReady(Callback, ENamedThreads::AnyNormalThreadHiPriTask, &StallForTaskThread));
}
}
@@ -2716,14 +2718,14 @@ void FTaskGraphInterface::BroadcastSlow_OnlyUseForSpecialPurposes(bool bDoBackgr
{
for (int32 Index = 0; Index < Workers; Index++)
{
TGraphTask<FBroadcastTask>::CreateTask().ConstructAndDispatchWhenReady(Callback, ENamedThreads::AnyHiPriThreadHiPriTask, &StallForTaskThread);
TaskThreadTasks.Add(TGraphTask<FBroadcastTask>::CreateTask().ConstructAndDispatchWhenReady(Callback, ENamedThreads::AnyHiPriThreadHiPriTask, &StallForTaskThread));
}
}
if (bDoBackgroundThreads && ENamedThreads::bHasBackgroundThreads)
{
for (int32 Index = 0; Index < Workers; Index++)
{
TGraphTask<FBroadcastTask>::CreateTask().ConstructAndDispatchWhenReady(Callback, ENamedThreads::AnyBackgroundHiPriTask, &StallForTaskThread);
TaskThreadTasks.Add(TGraphTask<FBroadcastTask>::CreateTask().ConstructAndDispatchWhenReady(Callback, ENamedThreads::AnyBackgroundHiPriTask, &StallForTaskThread));
}
}
FGraphEventArray Tasks;
@@ -2752,9 +2754,10 @@ void FTaskGraphInterface::BroadcastSlow_OnlyUseForSpecialPurposes(bool bDoBackgr
else if (FPlatformTime::Seconds() - StartTime > 3.0)
{
StartTime = FPlatformTime::Seconds();
UE_LOG(LogTaskGraph, Error, TEXT("Broadcast failed after three seconds"));
UE_LOG(LogTaskGraph, Error, TEXT("FTaskGraphInterface::BroadcastSlow_OnlyUseForSpecialPurposes Broadcast failed after three seconds"));
}
}
FTaskGraphInterface::Get().WaitUntilTasksComplete(TaskThreadTasks, ENamedThreads::GameThread_Local);
}