From 72337e2c7ef57879e6a964ce6ff2ab6268029770 Mon Sep 17 00:00:00 2001 From: chn Date: Sat, 26 Jul 2025 10:00:44 +0800 Subject: [PATCH] packages.biu: update to boost 1.87, fix logger --- packages/biu/CMakeLists.txt | 8 +++++--- packages/biu/biuConfig.cmake | 2 +- packages/biu/include/biu/logger.hpp | 1 + packages/biu/include/biu/logger.tpp | 10 ---------- packages/default.nix | 4 +++- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/packages/biu/CMakeLists.txt b/packages/biu/CMakeLists.txt index ba938e5a..53246a16 100644 --- a/packages/biu/CMakeLists.txt +++ b/packages/biu/CMakeLists.txt @@ -13,7 +13,8 @@ endif() find_package(magic_enum REQUIRED) find_package(fmt REQUIRED) -find_package(Boost REQUIRED COMPONENTS headers iostreams filesystem system) +find_package(Boost REQUIRED COMPONENTS headers iostreams filesystem system process) +# stacktrace_backtrace find_package(range-v3 REQUIRED) find_path(NAMEOF_INCLUDE_DIR nameof.hpp REQUIRED) find_package(Eigen3 REQUIRED) @@ -35,7 +36,7 @@ target_include_directories(biu PUBLIC $ +# define BOOST_STACKTRACE_USE_BACKTRACE # include # include diff --git a/packages/biu/include/biu/logger.tpp b/packages/biu/include/biu/logger.tpp index 0b9fad2e..95be5489 100644 --- a/packages/biu/include/biu/logger.tpp +++ b/packages/biu/include/biu/logger.tpp @@ -1,5 +1,4 @@ # pragma once -# define BOOST_STACKTRACE_USE_BACKTRACE # include # include # include @@ -115,14 +114,10 @@ namespace biu void Logger::Guard::operator()() const { debug("reached after {} ms."_f(get_time_ms())); } template void Logger::Guard::log(const std::string& message) const { -# ifndef BIU_LOGGER_DEBUG - if constexpr (L == Level::Debug) return; -# endif if (auto&& lock = LoggerConfig_.lock(); lock->Level >= L) { static_assert(std::same_as); auto time = std::chrono::time_point_cast(std::chrono::system_clock::now()); -# ifdef BIU_LOGGER_DEBUG boost::stacktrace::stacktrace stack; # ifdef BIU_LOGGER_SOURCE_ROOT auto source_root = std::string_view(BIU_LOGGER_SOURCE_ROOT "/"); @@ -141,11 +136,6 @@ namespace biu stack[0].source_line() == 0 ? "??"s : "{}"_f(stack[0].source_line()), stack[0].name() ) << std::flush; -# else - *lock->Stream << "[ {:%T} {:02x} {:02} ] {}\n"_f - (time, get_thread_id() % std::numeric_limits::max(), Indent_, message) - << std::flush; -# endif } } void Logger::Guard::error(const std::string& message) const { log(message); } diff --git a/packages/default.nix b/packages/default.nix index d789199b..1de87f9e 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -76,7 +76,9 @@ inputs: rec # TODO: report glaze bug to upstream inherit (inputs.pkgs.pkgs-2411) glaze; stdenv = inputs.pkgs.clang18Stdenv; - boost = inputs.pkgs.boost186; + boost = inputs.pkgs.boost187; + # boost = (inputs.pkgs.boost188.override { extraB2Args = [ "boost.stacktrace.backtrace=on" ]; }).overrideAttrs + # (prev: { buildInputs = prev.buildInputs ++ [(inputs.pkgs.libbacktrace.override { enableStatic = true; })]; }); fmt = inputs.pkgs.fmt_11.overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./biu/fmt.patch ]; }); }; hpcstat = inputs.pkgs.callPackage ./hpcstat