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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-31 14:21:00 +01:00
parent 2d1d8cc310 5ef3f66274
commit 37a6ea9beb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@
#include <mono/metadata/metadata.h> #include <mono/metadata/metadata.h>
#include <mono/metadata/threads.h> #include <mono/metadata/threads.h>
#include <mono/metadata/reflection.h> #include <mono/metadata/reflection.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/mono-private-unstable.h> #include <mono/metadata/mono-private-unstable.h>
typedef char char_t; typedef char char_t;
#define DOTNET_HOST_MONO_DEBUG 0 #define DOTNET_HOST_MONO_DEBUG 0
@@ -522,7 +523,8 @@ void MCore::GC::FreeMemory(void* ptr, bool coTaskMem)
void MCore::Thread::Attach() void MCore::Thread::Attach()
{ {
#if DOTNET_HOST_MONO // TODO: find a way to properly register native thread so Mono Stop The World (stw) won't freeze when native threads (eg. Job System) are running native code only
#if DOTNET_HOST_MONO && !USE_MONO_AOT
if (!IsInMainThread() && !mono_domain_get()) if (!IsInMainThread() && !mono_domain_get())
{ {
mono_thread_attach(MonoDomainHandle); mono_thread_attach(MonoDomainHandle);
@@ -2056,7 +2058,7 @@ bool InitHostfxr()
// Setup debugger // Setup debugger
{ {
int32 debuggerLogLevel = 0; int32 debuggerLogLevel = 0;
if (CommandLine::Options.MonoLog.IsTrue()) if (CommandLine::Options.MonoLog.IsTrue() || DOTNET_HOST_MONO_DEBUG)
{ {
LOG(Info, "Using detailed Mono logging"); LOG(Info, "Using detailed Mono logging");
mono_trace_set_level_string("debug"); mono_trace_set_level_string("debug");
@@ -2139,6 +2141,7 @@ bool InitHostfxr()
LOG(Fatal, "Failed to initialize Mono."); LOG(Fatal, "Failed to initialize Mono.");
return true; return true;
} }
mono_gc_init_finalizer_thread();
// Log info // Log info
char* buildInfo = mono_get_runtime_build_info(); char* buildInfo = mono_get_runtime_build_info();