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

Merge branch 'master' into 1.1

Browse Source
This commit is contained in:
Wojtek Figat
2021-02-27 16:42:53 +01:00
parent ca3948ad69 c3e3e70f96
commit 93541b6ed5
5 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp
View File

@@ -118,6 +118,8 @@ void* MonoCalloc(size_t count, size_t size)
#if USE_MONO_PROFILER
#include "Engine/Core/Types/StringBuilder.h"
struct FlaxMonoProfiler
{
};
@@ -126,7 +128,7 @@ FlaxMonoProfiler Profiler;
struct StackWalkDataResult
{
StringAnsi Buffer;
StringBuilder Buffer;
};
mono_bool OnStackWalk(MonoMethod* method, int32_t native_offset, int32_t il_offset, mono_bool managed, void* data)
@@ -138,16 +140,16 @@ mono_bool OnStackWalk(MonoMethod* method, int32_t native_offset, int32_t il_offs
auto mName = mono_method_get_name(method);
auto mKlassNameSpace = mono_class_get_namespace(mono_method_get_class(method));
auto mKlassName = mono_class_get_name(mono_method_get_class(method));
result->Buffer += mKlassNameSpace;
result->Buffer += ".";
result->Buffer += mKlassName;
result->Buffer += "::";
result->Buffer += mName;
result->Buffer += "\n";
result->Buffer.Append(mKlassNameSpace);
result->Buffer.Append(TEXT("."));
result->Buffer.Append(mKlassName);
result->Buffer.Append(TEXT("::"));
result->Buffer.Append(mName);
result->Buffer.Append(TEXT("\n"));
}
else if (!managed)
{
result->Buffer += "<unmanaged>\n";
result->Buffer.Append(TEXT("<unmanaged>\n"));
}
return 0;
@@ -170,10 +172,10 @@ void OnGCAllocation(MonoProfiler* profiler, MonoObject* obj)
if (details)
{
StackWalkDataResult stackTrace;
stackTrace.Buffer.reserve(1024);
stackTrace.Buffer.SetCapacity(1024);
mono_stack_walk(&OnStackWalk, &stackTrace);
LOG(Info, "GC new: {0}.{1} ({2} bytes). Stack Trace:\n{3}", name_space, name, size, stackTrace.Buffer.c_str());
LOG(Info, "GC new: {0}.{1} ({2} bytes). Stack Trace:\n{3}", String(name_space), String(name), size, stackTrace.Buffer.ToStringView());
}
}
#endif