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

Merge remote-tracking branch 'origin/1.10' into sdl_platform

Browse Source 
# Conflicts:
#	Source/Editor/GUI/ContextMenu/ContextMenuBase.cs
#	Source/Engine/Platform/Linux/LinuxPlatform.cpp
This commit is contained in:
Ari Vuollet
2025-03-09 13:16:25 +02:00
parent 83d6f9fcf3 bc4f3668fe
commit 45c388c92d
594 changed files with 19183 additions and 15772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
Source/Engine/Platform/Base/PlatformBase.cpp
View File

@@ -50,6 +50,7 @@ float PlatformBase::CustomDpiScale = 1.0f;
Array<User*, FixedAllocation<8>> PlatformBase::Users;
Delegate<User*> PlatformBase::UserAdded;
Delegate<User*> PlatformBase::UserRemoved;
void* OutOfMemoryBuffer = nullptr;
const Char* ToString(NetworkConnectionType value)
{
@@ -151,6 +152,12 @@ bool PlatformBase::Init()
srand((unsigned int)Platform::GetTimeCycles());
// Preallocate safety dynamic buffer to be released before Out Of Memory reporting to ensure code can properly execute
#ifndef PLATFORM_OUT_OF_MEMORY_BUFFER_SIZE
#define PLATFORM_OUT_OF_MEMORY_BUFFER_SIZE (1ull * 1024 * 1024) // 1 MB
#endif
OutOfMemoryBuffer = Allocator::Allocate(PLATFORM_OUT_OF_MEMORY_BUFFER_SIZE);
return false;
}
@@ -168,6 +175,10 @@ void PlatformBase::LogInfo()
const MemoryStats memStats = Platform::GetMemoryStats();
LOG(Info, "Physical Memory: {0} total, {1} used ({2}%)", Utilities::BytesToText(memStats.TotalPhysicalMemory), Utilities::BytesToText(memStats.UsedPhysicalMemory), Utilities::RoundTo2DecimalPlaces((float)memStats.UsedPhysicalMemory * 100.0f / (float)memStats.TotalPhysicalMemory));
LOG(Info, "Virtual Memory: {0} total, {1} used ({2}%)", Utilities::BytesToText(memStats.TotalVirtualMemory), Utilities::BytesToText(memStats.UsedVirtualMemory), Utilities::RoundTo2DecimalPlaces((float)memStats.UsedVirtualMemory * 100.0f / (float)memStats.TotalVirtualMemory));
LOG(Info, "Program Size: {0}", Utilities::BytesToText(memStats.ProgramSizeMemory));
#if !BUILD_RELEASE && !PLATFORM_DESKTOP
LOG(Info, "Extra Development Memory: {0}", Utilities::BytesToText(memStats.ExtraDevelopmentMemory));
#endif
LOG(Info, "Main thread id: 0x{0:x}, Process id: {1}", Globals::MainThreadID, Platform::GetCurrentProcessId());
LOG(Info, "Desktop size: {0}", Platform::GetDesktopSize());
@@ -189,6 +200,8 @@ void PlatformBase::BeforeExit()
void PlatformBase::Exit()
{
Allocator::Free(OutOfMemoryBuffer);
OutOfMemoryBuffer = nullptr;
}
#if COMPILE_WITH_PROFILER
@@ -272,25 +285,35 @@ int32 PlatformBase::GetCacheLineSize()
return (int32)Platform::GetCPUInfo().CacheLineSize;
}
void PlatformBase::Fatal(const Char* msg, void* context)
void PlatformBase::Fatal(const StringView& msg, void* context, FatalErrorType error)
{
// Check if is already during fatal state
if (Globals::FatalErrorOccurred)
if (Engine::FatalError != FatalErrorType::None)
{
// Just send one more error to the log and back
LOG(Error, "Error after fatal error: {0}", msg);
return;
}
// Free OOM safety buffer
Allocator::Free(OutOfMemoryBuffer);
OutOfMemoryBuffer = nullptr;
// Set flags
PRAGMA_DISABLE_DEPRECATION_WARNINGS;
Globals::FatalErrorOccurred = true;
Globals::IsRequestingExit = true;
Globals::ExitCode = -1;
Globals::ExitCode = -Math::Max((int32)error, 1);
PRAGMA_ENABLE_DEPRECATION_WARNINGS;
Engine::IsRequestingExit = true;
Engine::ExitCode = -Math::Max((int32)error, 1);
Engine::FatalError = error;
Engine::RequestingExit();
// Collect crash info (platform-dependant implementation that might collect stack trace and/or create memory dump)
{
// Log separation for crash info
LOG_FLUSH();
Log::Logger::WriteFloor();
LOG(Error, "");
LOG(Error, "Critical error! Reason: {0}", msg);
@@ -338,14 +361,26 @@ void PlatformBase::Fatal(const Char* msg, void* context)
LOG(Error, "");
}
// Log process memory stats
// Log memory stats
{
const MemoryStats memoryStats = Platform::GetMemoryStats();
LOG(Error, "Used Physical Memory: {0} ({1}%)", Utilities::BytesToText(memoryStats.UsedPhysicalMemory), (int32)(100 * memoryStats.UsedPhysicalMemory / memoryStats.TotalPhysicalMemory));
LOG(Error, "Used Virtual Memory: {0} ({1}%)", Utilities::BytesToText(memoryStats.UsedVirtualMemory), (int32)(100 * memoryStats.UsedVirtualMemory / memoryStats.TotalVirtualMemory));
const ProcessMemoryStats processMemoryStats = Platform::GetProcessMemoryStats();
LOG(Error, "Process Used Physical Memory: {0}", Utilities::BytesToText(processMemoryStats.UsedPhysicalMemory));
LOG(Error, "Process Used Virtual Memory: {0}", Utilities::BytesToText(processMemoryStats.UsedVirtualMemory));
#define GET_MEM(totalUsed, processUsed) totalUsed > processUsed ? totalUsed - processUsed : 0
const uint64 externalUsedPhysical = GET_MEM(memoryStats.UsedPhysicalMemory, processMemoryStats.UsedPhysicalMemory);
const uint64 externalUsedVirtual = GET_MEM(memoryStats.UsedVirtualMemory, processMemoryStats.UsedVirtualMemory);
#undef GET_MEM
// Total memory usage
LOG(Error, "Total Used Physical Memory: {0} ({1}%)", Utilities::BytesToText(memoryStats.UsedPhysicalMemory), (int32)(100 * memoryStats.UsedPhysicalMemory / memoryStats.TotalPhysicalMemory));
LOG(Error, "Total Used Virtual Memory: {0} ({1}%)", Utilities::BytesToText(memoryStats.UsedVirtualMemory), (int32)(100 * memoryStats.UsedVirtualMemory / memoryStats.TotalVirtualMemory));
// Engine memory usage
LOG(Error, "Process Used Physical Memory: {0} ({1}%)", Utilities::BytesToText(processMemoryStats.UsedPhysicalMemory), (int32)(100 * processMemoryStats.UsedPhysicalMemory / memoryStats.TotalPhysicalMemory));
LOG(Error, "Process Used Virtual Memory: {0} ({1}%)", Utilities::BytesToText(processMemoryStats.UsedVirtualMemory), (int32)(100 * processMemoryStats.UsedVirtualMemory / memoryStats.TotalVirtualMemory));
// External apps memory usage
LOG(Error, "External Used Physical Memory: {0} ({1}%)", Utilities::BytesToText(externalUsedPhysical), (int32)(100 * externalUsedPhysical / memoryStats.TotalPhysicalMemory));
LOG(Error, "External Used Virtual Memory: {0} ({1}%)", Utilities::BytesToText(externalUsedVirtual), (int32)(100 * externalUsedVirtual / memoryStats.TotalVirtualMemory));
}
}
if (Log::Logger::LogFilePath.HasChars())
@@ -368,26 +403,29 @@ void PlatformBase::Fatal(const Char* msg, void* context)
}
// Show error message
Error(msg);
if (Engine::ReportCrash.IsBinded())
Engine::ReportCrash(msg, context);
else
Error(msg);
// Only main thread can call exit directly
if (IsInMainThread())
{
Engine::Exit(-1);
Engine::Exit(Engine::ExitCode, error);
}
}
void PlatformBase::Error(const Char* msg)
void PlatformBase::Error(const StringView& msg)
{
#if PLATFORM_HAS_HEADLESS_MODE
if (CommandLine::Options.Headless)
if (CommandLine::Options.Headless.IsTrue())
{
#if PLATFORM_TEXT_IS_CHAR16
StringAnsi ansi(msg);
ansi += PLATFORM_LINE_TERMINATOR;
printf("Error: %s\n", ansi.Get());
#else
std::cout << "Error: " << msg << std::endl;
std::cout << "Error: " << *msg << std::endl;
#endif
}
else
@@ -397,12 +435,12 @@ void PlatformBase::Error(const Char* msg)
}
}
void PlatformBase::Warning(const Char* msg)
void PlatformBase::Warning(const StringView& msg)
{
#if PLATFORM_HAS_HEADLESS_MODE
if (CommandLine::Options.Headless)
if (CommandLine::Options.Headless.IsTrue())
{
std::cout << "Warning: " << msg << std::endl;
std::cout << "Warning: " << *msg << std::endl;
}
else
#endif
@@ -411,12 +449,12 @@ void PlatformBase::Warning(const Char* msg)
}
}
void PlatformBase::Info(const Char* msg)
void PlatformBase::Info(const StringView& msg)
{
#if PLATFORM_HAS_HEADLESS_MODE
if (CommandLine::Options.Headless)
if (CommandLine::Options.Headless.IsTrue())
{
std::cout << "Info: " << msg << std::endl;
std::cout << "Info: " << *msg << std::endl;
}
else
#endif
@@ -425,24 +463,9 @@ void PlatformBase::Info(const Char* msg)
}
}
void PlatformBase::Fatal(const StringView& msg)
void PlatformBase::Fatal(const StringView& msg, FatalErrorType error)
{
Fatal(*msg);
}
void PlatformBase::Error(const StringView& msg)
{
Error(*msg);
}
void PlatformBase::Warning(const StringView& msg)
{
Warning(*msg);
}
void PlatformBase::Info(const StringView& msg)
{
Info(*msg);
Fatal(msg, nullptr, error);
}
void PlatformBase::Log(const StringView& msg)
@@ -458,28 +481,43 @@ void PlatformBase::Crash(int32 line, const char* file)
{
const StringAsUTF16<256> fileUTF16(file);
const String msg = String::Format(TEXT("Fatal crash!\nFile: {0}\nLine: {1}"), fileUTF16.Get(), line);
LOG_STR(Fatal, msg);
LOG_STR(Error, msg);
Fatal(msg, nullptr, FatalErrorType::Assertion);
}
void PlatformBase::OutOfMemory(int32 line, const char* file)
{
const StringAsUTF16<256> fileUTF16(file);
const String msg = String::Format(TEXT("Out of memory error!\nFile: {0}\nLine: {1}"), fileUTF16.Get(), line);
LOG_STR(Fatal, msg);
fmt_flax::allocator allocator;
fmt_flax::memory_buffer buffer(allocator);
static_assert(fmt::inline_buffer_size > 300, "Update stack buffer to prevent dynamic memory allocation on Out Of Memory.");
if (file)
{
const StringAsUTF16<256> fileUTF16(file);
fmt_flax::format(buffer, TEXT("Out of memory error!\nFile: {0}\nLine: {1}"), fileUTF16.Get(), line);
}
else
{
fmt_flax::format(buffer, TEXT("Out of memory error!"));
}
const StringView msg(buffer.data(), (int32)buffer.size());
LOG_STR(Error, msg);
Fatal(msg, nullptr, FatalErrorType::OutOfMemory);
}
void PlatformBase::MissingCode(int32 line, const char* file, const char* info)
{
const StringAsUTF16<256> fileUTF16(file);
const String msg = String::Format(TEXT("TODO: {0}\nFile: {1}\nLine: {2}"), String(info), fileUTF16.Get(), line);
LOG_STR(Fatal, msg);
LOG_STR(Error, msg);
Fatal(msg, nullptr, FatalErrorType::Assertion);
}
void PlatformBase::Assert(const char* message, const char* file, int line)
{
const StringAsUTF16<256> fileUTF16(file);
const String msg = String::Format(TEXT("Assertion failed!\nFile: {0}\nLine: {1}\n\nExpression: {2}"), fileUTF16.Get(), line, String(message));
LOG_STR(Fatal, msg);
LOG_STR(Error, msg);
Fatal(msg, nullptr, FatalErrorType::Assertion);
}
void PlatformBase::CheckFailed(const char* message, const char* file, int line)