From 24293c8f2b4b9458e4cc440bda5f42829608e7f9 Mon Sep 17 00:00:00 2001 From: George Tokmaji Date: Sun, 28 Jul 2024 22:38:56 +0200 Subject: [PATCH] Revert "Add Random() debug logging for testing purposes" This reverts commit f9c2a6844a262aab773404bbee430317836b39d0. --- CMakeLists.txt | 2 -- src/C4Random.cpp | 29 ----------------------------- src/C4Random.h | 24 ------------------------ 3 files changed, 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce15b26f1..eb289db80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -464,8 +464,6 @@ if (WIN32) target_link_options(clonk PRIVATE "/alternatename:_WINRT_IMPL_GetSystemTimePreciseAsFileTime@4=_Clonk_GetSystemTimePreciseAsFileTime@4") endif () endif () - - target_link_options(clonk PRIVATE "/PDBALTPATH:%_PDB%") endif () if (APPLE) diff --git a/src/C4Random.cpp b/src/C4Random.cpp index 13cdc6b77..d7cc960d7 100644 --- a/src/C4Random.cpp +++ b/src/C4Random.cpp @@ -19,37 +19,8 @@ #include #include -#ifdef LOG_RANDOM - -#include -#include - -#endif - C4Random C4Random::Default{0}; -#ifdef LOG_RANDOM - -void C4Random::Log(const int range) -{ - if (!logger) - { - logger = CreateLogger("C4Random::Default", {.GuiLogLevel = spdlog::level::off}); - } - - const std::stacktrace trace{std::stacktrace::current()}; - - const auto string = trace - | std::views::take(10) - | std::views::transform([](const auto &frame) { return std::to_string(frame); }) - | std::views::join_with('\n') - | std::ranges::to(); - - logger->debug("range: {}, randomCount: {}, randomHold: {}\n{}", range, randomCount, randomHold, string); -} - -#endif - // Random3 const int FRndRes = 500; diff --git a/src/C4Random.h b/src/C4Random.h index bfff28e76..86acf9ae7 100644 --- a/src/C4Random.h +++ b/src/C4Random.h @@ -24,14 +24,6 @@ #include #endif -#ifndef __APPLE__ -#define LOG_RANDOM -#endif - -#ifdef LOG_RANDOM -#include "C4Log.h" -#endif - #include #include #include @@ -50,14 +42,6 @@ class C4Random { // next pseudorandom value randomCount++; - -#ifdef LOG_RANDOM - if (this == &Default) - { - Log(range); - } -#endif - #ifdef DEBUGREC C4RCRandom rc; rc.Cnt = randomCount; @@ -83,10 +67,6 @@ class C4Random std::uint32_t GetRandomCount() const noexcept { return randomCount; } C4Random Clone() noexcept { return C4Random{randomHold}; } -#ifdef LOG_RANDOM - void Log(int range); -#endif - public: static C4Random Default; @@ -101,10 +81,6 @@ class C4Random std::uint32_t id{NextId.fetch_add(1, std::memory_order_acq_rel)}; #endif -#ifdef LOG_RANDOM - std::shared_ptr logger; -#endif - friend inline void FixedRandom(uint32_t); };