From 3388c48980e3071bdae9548bb2154f2ee429bb4f Mon Sep 17 00:00:00 2001 From: Valentin Balaschenko <13349202+vlntb@users.noreply.github.com> Date: Mon, 23 Feb 2026 16:14:19 +0000 Subject: [PATCH] switching to std::int64_t --- include/xrpl/basics/MallocTrim.h | 11 ++++++----- src/libxrpl/basics/MallocTrim.cpp | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/xrpl/basics/MallocTrim.h b/include/xrpl/basics/MallocTrim.h index 828b707523..8a1b9f3ccb 100644 --- a/include/xrpl/basics/MallocTrim.h +++ b/include/xrpl/basics/MallocTrim.h @@ -3,6 +3,7 @@ #include #include +#include #include #include @@ -28,13 +29,13 @@ struct MallocTrimReport { bool supported{false}; int trimResult{-1}; - long rssBeforeKB{-1}; - long rssAfterKB{-1}; + std::int64_t rssBeforeKB{-1}; + std::int64_t rssAfterKB{-1}; std::chrono::microseconds durationUs{-1}; - long minfltDelta{-1}; - long majfltDelta{-1}; + std::int64_t minfltDelta{-1}; + std::int64_t majfltDelta{-1}; - [[nodiscard]] long + [[nodiscard]] std::int64_t deltaKB() const noexcept { if (rssBeforeKB < 0 || rssAfterKB < 0) diff --git a/src/libxrpl/basics/MallocTrim.cpp b/src/libxrpl/basics/MallocTrim.cpp index 0395c1fff8..91ff00bd30 100644 --- a/src/libxrpl/basics/MallocTrim.cpp +++ b/src/libxrpl/basics/MallocTrim.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -128,7 +129,9 @@ mallocTrim([[maybe_unused]] std::optional const& tag, beast::Journa report.majfltDelta = ru1.ru_majflt - ru0.ru_majflt; } - long const deltaKB = (rssBeforeKB < 0 || rssAfterKB < 0) ? 0 : (rssAfterKB - rssBeforeKB); + std::int64_t const deltaKB = (rssBeforeKB < 0 || rssAfterKB < 0) + ? 0 + : (static_cast(rssAfterKB) - static_cast(rssBeforeKB)); JLOG(journal.debug()) << "malloc_trim tag=" << tagStr << " result=" << report.trimResult << " pad=" << TRIM_PAD << " bytes"