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

Fixed a rare case where async loading would not serialize all imports before postloading exports that depend on them

Browse Source 
#jira UE-68994
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4929453 in //UE4/Release-4.22/... via CL 4929465
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5067860 by robert manuszewski in Dev-Networking branch]
This commit is contained in:
robert manuszewski
2019-02-19 15:14:53 -05:00
parent d2354cfa13
commit 1bee18064c
1 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoading.cpp
+36 -5
View File
@@ -2421,10 +2421,7 @@ EAsyncPackageState::Type FAsyncPackage::SetupImports_Event()
if (ImportPackage)
{
if (!ImportedPackages.Contains(ImportPackage))
{
ImportedPackages.Add(ImportPackage);
}
ImportedPackages.Add(ImportPackage);
FLinkerLoad* ImportLinker = ImportPackage->LinkerLoad;
if (ImportLinker && ImportLinker->AsyncRoot)
@@ -5819,6 +5816,25 @@ EAsyncPackageState::Type FAsyncPackage::TickAsyncPackage(bool InbUseTimeLimit, b
SCOPED_LOADTIMER(Package_PreLoadObjects);
LoadingState = PreLoadObjects();
}
if (LoadingState == EAsyncPackageState::Complete || bLoadHasFailed)
{
const bool bInternalCallbacks = true;
CallCompletionCallbacks(bInternalCallbacks, bLoadHasFailed ? EAsyncLoadingResult::Failed : EAsyncLoadingResult::Succeeded);
}
if (LoadingState == EAsyncPackageState::Complete)
{
// We can only continue to PostLoad if all imported packages finished serializing their exports
for (UPackage* ImportedPackage : ImportedPackages)
{
if (ImportedPackage->LinkerLoad && ImportedPackage->LinkerLoad->AsyncRoot && !ImportedPackage->LinkerLoad->AsyncRoot->bAllExportsSerialized)
{
LoadingState = EAsyncPackageState::PendingImports;
break;
}
}
}
} // !GEventDrivenLoaderEnabled
if (LoadingState == EAsyncPackageState::Complete && !bLoadHasFailed)
@@ -6371,6 +6387,15 @@ EAsyncPackageState::Type FAsyncPackage::CreateImports()
// Make sure this object is not claimed by GC if it's triggered while streaming.
AddObjectReference(Object);
// Keep track of all imported packages that are also being loaded so that we can wait until they also finished serializing their exports
if (UPackage* ImportedPackage = Cast<UPackage>(Object))
{
if (ImportedPackage->LinkerLoad && ImportedPackage->LinkerLoad->AsyncRoot)
{
ImportedPackages.Add(ImportedPackage);
}
}
}
return ImportIndex == Linker->ImportMap.Num() ? EAsyncPackageState::Complete : EAsyncPackageState::TimeOut;
@@ -6464,7 +6489,13 @@ EAsyncPackageState::Type FAsyncPackage::CreateExports()
// We no longer need the referenced packages.
FreeReferencedImports();
return ExportIndex == Linker->ExportMap.Num() ? EAsyncPackageState::Complete : EAsyncPackageState::TimeOut;
EAsyncPackageState::Type Result = (ExportIndex == Linker->ExportMap.Num() ? EAsyncPackageState::Complete : EAsyncPackageState::TimeOut);
if (Result == EAsyncPackageState::Complete)
{
bAllExportsSerialized = true;
}
return Result;
}
/**