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

Merge similar source chunks

Browse Source 
#2468
This commit is contained in:
Wojtek Figat
2024-04-22 18:36:25 +02:00
parent b7dc0dd004
commit a01495cde1
1 changed files with 41 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
Source/Engine/Scripting/Scripting.cpp
View File

@@ -109,6 +109,45 @@ namespace
#if USE_EDITOR #if USE_EDITOR
bool LastBinariesLoadTriggeredCompilation = false; bool LastBinariesLoadTriggeredCompilation = false;
#endif #endif
void ReleaseObjects(bool gameOnly)
{
// Flush objects already enqueued objects to delete
ObjectsRemovalService::Flush();
// Give GC a try to cleanup old user objects and the other mess
MCore::GC::Collect();
MCore::GC::WaitForPendingFinalizers();
// Destroy objects from game assemblies (eg. not released objects that might crash if persist in memory after reload)
const auto flaxModule = GetBinaryModuleFlaxEngine();
_objectsLocker.Lock();
for (auto i = _objectsDictionary.Begin(); i.IsNotEnd(); ++i)
{
auto obj = i->Value;
if (gameOnly && obj->GetTypeHandle().Module == flaxModule)
continue;
#if USE_OBJECTS_DISPOSE_CRASHES_DEBUGGING
LOG(Info, "[OnScriptingDispose] obj = 0x{0:x}, {1}", (uint64)obj.Ptr, String(obj.TypeName));
#endif
obj->OnScriptingDispose();
}
_objectsLocker.Unlock();
// Release assets sourced from game assemblies
Array<Asset*> assets = Content::GetAssets();
for (auto asset : assets)
{
if (asset->GetTypeHandle().Module == flaxModule)
{
continue;
}
asset->DeleteObject();
}
ObjectsRemovalService::Flush();
}
} }
Delegate<BinaryModule*> Scripting::BinaryModuleLoaded; Delegate<BinaryModule*> Scripting::BinaryModuleLoaded;
@@ -566,36 +605,8 @@ void Scripting::Release()
// Fire event // Fire event
ScriptsUnload(); ScriptsUnload();
// Cleanup
ObjectsRemovalService::Flush();
// Cleanup some managed objects
MCore::GC::Collect();
MCore::GC::WaitForPendingFinalizers();
// Release managed objects instances for persistent objects (assets etc.) // Release managed objects instances for persistent objects (assets etc.)
_objectsLocker.Lock(); ReleaseObjects(false);
{
for (auto i = _objectsDictionary.Begin(); i.IsNotEnd(); ++i)
{
auto obj = i->Value;
#if USE_OBJECTS_DISPOSE_CRASHES_DEBUGGING
LOG(Info, "[OnScriptingDispose] obj = 0x{0:x}, {1}", (uint64)obj.Ptr, String(obj.TypeName));
#endif
obj->OnScriptingDispose();
}
}
_objectsLocker.Unlock();
// Release assets sourced from game assemblies
const auto flaxModule = GetBinaryModuleFlaxEngine();
for (auto asset : Content::GetAssets())
{
if (asset->GetTypeHandle().Module == flaxModule)
continue;
asset->DeleteObjectNow();
}
auto* flaxEngineModule = (NativeBinaryModule*)GetBinaryModuleFlaxEngine(); auto* flaxEngineModule = (NativeBinaryModule*)GetBinaryModuleFlaxEngine();
onEngineUnloading(flaxEngineModule->Assembly); onEngineUnloading(flaxEngineModule->Assembly);
@@ -673,39 +684,8 @@ void Scripting::Reload(bool canTriggerSceneReload)
LOG(Info, "Start user scripts reload"); LOG(Info, "Start user scripts reload");
ScriptsReloading(); ScriptsReloading();
// Flush cache (some objects may be deleted after reload start event)
ObjectsRemovalService::Flush();
// Give GC a try to cleanup old user objects and the other mess
MCore::GC::Collect();
MCore::GC::WaitForPendingFinalizers();
// Destroy objects from game assemblies (eg. not released objects that might crash if persist in memory after reload) // Destroy objects from game assemblies (eg. not released objects that might crash if persist in memory after reload)
const auto flaxModule = GetBinaryModuleFlaxEngine(); ReleaseObjects(true);
_objectsLocker.Lock();
{
for (auto i = _objectsDictionary.Begin(); i.IsNotEnd(); ++i)
{
auto obj = i->Value;
if (obj->GetTypeHandle().Module == flaxModule)
continue;
#if USE_OBJECTS_DISPOSE_CRASHES_DEBUGGING
LOG(Info, "[OnScriptingDispose] obj = 0x{0:x}, {1}", (uint64)obj.Ptr, String(obj.TypeName));
#endif
obj->OnScriptingDispose();
}
}
_objectsLocker.Unlock();
// Release assets sourced from game assemblies
for (auto asset : Content::GetAssets())
{
if (asset->GetTypeHandle().Module == flaxModule)
continue;
asset->DeleteObjectNow();
}
// Unload all game modules // Unload all game modules
LOG(Info, "Unloading game binary modules"); LOG(Info, "Unloading game binary modules");