BigfootDev/Bigfoot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cpptrace
Some checks failed
Bigfoot / Build And Upload Conan Dependencies to BigfootPackages (push) Failing after 3m9s
Details
Bigfoot / Build & Test Debug with ./ConanProfiles/clang (Unity Build: OFF) (push) Has been skipped
Details
Bigfoot / Build & Test Debug with ./ConanProfiles/clang (Unity Build: ON) (push) Has been skipped
Details
Bigfoot / Build & Test Debug with ./ConanProfiles/clang_asan (Unity Build: OFF) (push) Has been skipped
Details
Bigfoot / Build & Test Debug with ./ConanProfiles/clang_asan (Unity Build: ON) (push) Has been skipped
Details
Bigfoot / Build & Test RelWithDebInfo with ./ConanProfiles/clang (Unity Build: OFF) (push) Has been skipped
Details
Bigfoot / Build & Test RelWithDebInfo with ./ConanProfiles/clang (Unity Build: ON) (push) Has been skipped
Details
Bigfoot / Build & Test RelWithDebInfo with ./ConanProfiles/clang_asan (Unity Build: OFF) (push) Has been skipped
Details
Bigfoot / Build & Test RelWithDebInfo with ./ConanProfiles/clang_asan (Unity Build: ON) (push) Has been skipped
Details
Bigfoot / Build & Test Release with ./ConanProfiles/clang (Unity Build: OFF) (push) Has been skipped
Details
Bigfoot / Build & Test Release with ./ConanProfiles/clang (Unity Build: ON) (push) Has been skipped
Details
Bigfoot / Build & Test Release with ./ConanProfiles/clang_asan (Unity Build: OFF) (push) Has been skipped
Details
Bigfoot / Build & Test Release with ./ConanProfiles/clang_asan (Unity Build: ON) (push) Has been skipped
Details
Bigfoot / Clang Format Checks (push) Failing after 11s
Details

Browse Source
This commit is contained in:
Romain BOULLARD
2026-04-15 01:16:29 +02:00
parent a075526eb0
commit 5bf8d45521
6 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Bigfoot/Sources/Engine/Include/Engine/EngineAssertHandler.hpp
View File

@@ -33,23 +33,20 @@ class EngineAssertHandler
* Handle an assertion. * Handle an assertion.
* *
* \param p_location Location of the assertion. * \param p_location Location of the assertion.
* \param p_stacktrace The stack trace
* \param p_format Format string for the assertion message. * \param p_format Format string for the assertion message.
* \param p_args Arguments for the format string. * \param p_args Arguments for the format string.
*/ */
template<typename... ARGS> template<typename... ARGS>
static void Handle(const std::source_location& p_location, static void Handle(const std::source_location& p_location,
const std::string_view p_stacktrace,
std::format_string<ARGS...> p_format, std::format_string<ARGS...> p_format,
ARGS&&... p_args) ARGS&&... p_args)
{ {
BIGFOOT_LOG_FATAL(ENGINE_LOGGER, BIGFOOT_LOG_FATAL(ENGINE_LOGGER,
"Assert: {} (File:{}, Line:{}, Function:{}\n{}", "Assert: {} (File:{}, Line:{}, Function:{}\n",
std::format(p_format, std::forward<ARGS>(p_args)...), std::format(p_format, std::forward<ARGS>(p_args)...),
p_location.file_name(), p_location.file_name(),
p_location.line(), p_location.line(),
p_location.function_name(), p_location.function_name());
p_stacktrace);
} }
EngineAssertHandler& operator=(const EngineAssertHandler& p_handler) = delete; EngineAssertHandler& operator=(const EngineAssertHandler& p_handler) = delete;

7
Bigfoot/Sources/System/Include/System/SystemAssertHandler.hpp
View File

@@ -33,23 +33,20 @@ class SystemAssertHandler
* Handle an assertion. * Handle an assertion.
* *
* \param p_location Location of the assertion. * \param p_location Location of the assertion.
* \param p_stacktrace The stack trace
* \param p_format Format string for the assertion message. * \param p_format Format string for the assertion message.
* \param p_args Arguments for the format string. * \param p_args Arguments for the format string.
*/ */
template<typename... ARGS> template<typename... ARGS>
static void Handle(const std::source_location& p_location, static void Handle(const std::source_location& p_location,
const std::string_view p_stacktrace,
std::format_string<ARGS...> p_format, std::format_string<ARGS...> p_format,
ARGS&&... p_args) ARGS&&... p_args)
{ {
BIGFOOT_LOG_FATAL(SYSTEM_LOGGER, BIGFOOT_LOG_FATAL(SYSTEM_LOGGER,
"Assert: {} (File:{}, Line:{}, Function:{}\n{}", "Assert: {} (File:{}, Line:{}, Function:{}\n",
std::format(p_format, std::forward<ARGS>(p_args)...), std::format(p_format, std::forward<ARGS>(p_args)...),
p_location.file_name(), p_location.file_name(),
p_location.line(), p_location.line(),
p_location.function_name(), p_location.function_name());
p_stacktrace);
} }
SystemAssertHandler& operator=(const SystemAssertHandler& p_handler) = delete; SystemAssertHandler& operator=(const SystemAssertHandler& p_handler) = delete;

1
Bigfoot/Sources/Utils/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME)
project(${PackageName}) project(${PackageName})
set(PublicDependencies set(PublicDependencies
$<$<CONFIG:Debug,RelWithDebInfo>:cpptrace::cpptrace>
unordered_dense::unordered_dense) unordered_dense::unordered_dense)
set(PrivateDependencies) set(PrivateDependencies)
set(BigfootPublicDependencies) set(BigfootPublicDependencies)

26
Bigfoot/Sources/Utils/Include/Utils/Assert.hpp
View File

@@ -10,8 +10,6 @@
#if defined BIGFOOT_NOT_OPTIMIZED #if defined BIGFOOT_NOT_OPTIMIZED
#include <cpptrace/cpptrace.hpp>
#include <source_location> #include <source_location>
#include <string> #include <string>
@@ -39,13 +37,7 @@
constexpr std::source_location location = std::source_location::current(); \ constexpr std::source_location location = std::source_location::current(); \
if (!(p_assert)) [[unlikely]] \ if (!(p_assert)) [[unlikely]] \
{ \ { \
constexpr auto stacktrace = []() -> std::string \ HANDLER::Handle(location, p_message __VA_OPT__(, ) __VA_ARGS__); \
{ \
const cpptrace::stacktrace stacktrace = cpptrace::generate_trace(); \
return stacktrace.to_string(); \
}; \
\
HANDLER::Handle(location, stacktrace(), p_message __VA_OPT__(, ) __VA_ARGS__); \
BREAK; \ BREAK; \
} \ } \
} while (false) } while (false)
@@ -56,13 +48,7 @@
constexpr std::source_location location = std::source_location::current(); \ constexpr std::source_location location = std::source_location::current(); \
if (!(p_assert)) [[unlikely]] \ if (!(p_assert)) [[unlikely]] \
{ \ { \
constexpr auto stacktrace = []() -> std::string \ HANDLER::Handle(location, p_message __VA_OPT__(, ) __VA_ARGS__); \
{ \
const cpptrace::stacktrace stacktrace = cpptrace::generate_trace(); \
return stacktrace.to_string(); \
}; \
\
HANDLER::Handle(location, stacktrace(), p_message __VA_OPT__(, ) __VA_ARGS__); \
BREAK; \ BREAK; \
} \ } \
} while (false) } while (false)
@@ -73,13 +59,7 @@
constexpr std::source_location location = std::source_location::current(); \ constexpr std::source_location location = std::source_location::current(); \
if (!(p_assert)) [[unlikely]] \ if (!(p_assert)) [[unlikely]] \
{ \ { \
constexpr auto stacktrace = []() -> std::string \ HANDLER::Handle(location, p_message __VA_OPT__(, ) __VA_ARGS__); \
{ \
const cpptrace::stacktrace stacktrace = cpptrace::generate_trace(); \
return stacktrace.to_string(); \
}; \
\
HANDLER::Handle(location, stacktrace(), p_message __VA_OPT__(, ) __VA_ARGS__); \
if (Bigfoot::Singleton<Bigfoot::Log>::HasInstance()) \ if (Bigfoot::Singleton<Bigfoot::Log>::HasInstance()) \
{ \ { \
Bigfoot::Singleton<Bigfoot::Log>::Instance().Flush(); \ Bigfoot::Singleton<Bigfoot::Log>::Instance().Flush(); \

3
CMake/FindDependencies.cmake
View File

@@ -25,13 +25,10 @@ endif()
if(${IS_MULTI_CONFIG}) if(${IS_MULTI_CONFIG})
find_package(quill REQUIRED) find_package(quill REQUIRED)
find_package(cpptrace REQUIRED)
elseif(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo") elseif(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
find_package(quill REQUIRED) find_package(quill REQUIRED)
find_package(cpptrace REQUIRED)
endif() endif()
find_package(glm REQUIRED) find_package(glm REQUIRED)
find_package(lodepng REQUIRED) find_package(lodepng REQUIRED)
find_package(imgui REQUIRED) find_package(imgui REQUIRED)

2
conanfile.py
View File

@@ -64,14 +64,12 @@ class Bigfoot(ConanFile):
self.requires("mimalloc/3.2.8@bigfootdev/main", transitive_headers=True) self.requires("mimalloc/3.2.8@bigfootdev/main", transitive_headers=True)
self.requires("stduuid/1.2.3@bigfootdev/main", transitive_headers=True) self.requires("stduuid/1.2.3@bigfootdev/main", transitive_headers=True)
self.requires("sqlite3/3.51.2@bigfootdev/main", transitive_headers=True) self.requires("sqlite3/3.51.2@bigfootdev/main", transitive_headers=True)
self.requires("cli11/2.6.1@bigfootdev/main")
self.requires("rapidhash/3.0@bigfootdev/main", transitive_headers=True) self.requires("rapidhash/3.0@bigfootdev/main", transitive_headers=True)
self.requires("effolkronium-random/1.5.0", transitive_headers=True) self.requires("effolkronium-random/1.5.0", transitive_headers=True)
self.requires("flatbuffers/25.12.19@bigfootdev/main", transitive_headers=True) self.requires("flatbuffers/25.12.19@bigfootdev/main", transitive_headers=True)
if(self.settings.build_type == "RelWithDebInfo" or self.settings.build_type == "Debug"): if(self.settings.build_type == "RelWithDebInfo" or self.settings.build_type == "Debug"):
self.requires("quill/11.0.2", transitive_headers=True) self.requires("quill/11.0.2", transitive_headers=True)
self.requires("cpptrace/1.0.4", transitive_headers=True)
if(self.options.tracy): if(self.options.tracy):
self.requires("tracy/0.13.1", transitive_headers=True) self.requires("tracy/0.13.1", transitive_headers=True)