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

Merge remote-tracking branch 'origin/master' into 1.7

Browse Source
This commit is contained in:
Wojtek Figat
2023-08-10 18:34:27 +02:00
parent 1958adb126 09be2375f6
commit e27f1a8a41
17 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Scripting/ManagedCLR/MCore.h
View File

@@ -47,7 +47,7 @@ public:
#if USE_EDITOR
// Called by Scripting in a middle of hot-reload (after unloading modules but before loading them again).
static void OnMidHotReload();
static void ReloadScriptingAssemblyLoadContext();
#endif
public:

18
Source/Engine/Scripting/Runtime/DotNet.cpp
View File

@@ -160,6 +160,7 @@ DECLARE_ENUM_OPERATORS(MTypeAttributes);
DECLARE_ENUM_OPERATORS(MMethodAttributes);
DECLARE_ENUM_OPERATORS(MFieldAttributes);
// Multiple AppDomains are superseded by AssemblyLoadContext in .NET
extern MDomain* MRootDomain;
extern MDomain* MActiveDomain;
extern Array<MDomain*, FixedAllocation<4>> MDomains;
@@ -301,11 +302,14 @@ void MCore::UnloadEngine()
#if USE_EDITOR
void MCore::OnMidHotReload()
void MCore::ReloadScriptingAssemblyLoadContext()
{
// Clear any cached class attributes (see https://github.com/FlaxEngine/FlaxEngine/issues/1108)
for (auto e : CachedClassHandles)
e.Value->_attributes.Clear();
static void* ReloadScriptingAssemblyLoadContextPtr = GetStaticMethodPointer(TEXT("ReloadScriptingAssemblyLoadContext"));
CallStaticMethod<void>(ReloadScriptingAssemblyLoadContextPtr);
}
#endif
@@ -723,16 +727,12 @@ bool MAssembly::LoadImage(const String& assemblyPath, const StringView& nativePa
bool MAssembly::UnloadImage(bool isReloading)
{
if (_handle)
if (_handle && isReloading)
{
// TODO: closing assembly on reload only is copy-paste from mono, do we need do this on .NET too?
if (isReloading)
{
LOG(Info, "Unloading managed assembly \'{0}\' (is reloading)", String(_name));
LOG(Info, "Unloading managed assembly \'{0}\' (is reloading)", String(_name));
static void* CloseAssemblyPtr = GetStaticMethodPointer(TEXT("CloseAssembly"));
CallStaticMethod<void, const void*>(CloseAssemblyPtr, _handle);
}
static void* CloseAssemblyPtr = GetStaticMethodPointer(TEXT("CloseAssembly"));
CallStaticMethod<void, const void*>(CloseAssemblyPtr, _handle);
CachedAssemblyHandles.Remove(_handle);
_handle = nullptr;

2
Source/Engine/Scripting/Runtime/Mono.cpp
View File

@@ -716,7 +716,7 @@ void MCore::UnloadEngine()
#if USE_EDITOR
void MCore::OnMidHotReload()
void MCore::ReloadScriptingAssemblyLoadContext()
{
}

2
Source/Engine/Scripting/Runtime/None.cpp
View File

@@ -61,7 +61,7 @@ void MCore::UnloadEngine()
#if USE_EDITOR
void MCore::OnMidHotReload()
void MCore::ReloadScriptingAssemblyLoadContext()
{
}

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

@@ -706,7 +706,9 @@ void Scripting::Reload(bool canTriggerSceneReload)
modules.Clear();
_nonNativeModules.ClearDelete();
_hasGameModulesLoaded = false;
MCore::OnMidHotReload();
// Release and create a new assembly load context for user assemblies
MCore::ReloadScriptingAssemblyLoadContext();
// Give GC a try to cleanup old user objects and the other mess
MCore::GC::Collect();