diff --git a/src/02mem_manager/include/mem_manager/mem_offset_calculator.h b/src/02mem_manager/include/mem_manager/mem_offset_calculator.h index 5dcbd9ff..668928ff 100644 --- a/src/02mem_manager/include/mem_manager/mem_offset_calculator.h +++ b/src/02mem_manager/include/mem_manager/mem_offset_calculator.h @@ -36,7 +36,7 @@ namespace refactor::mem_manager { }; std::optional _traceInfo; // trace format : - // alloc/free begin end size allocTimes freeTimes peak rate freeCount minBlockSize maxBlockSize + // CALCULATOR this alloc/free begin end size allocTimes freeTimes peak rate freeCount minBlockSize maxBlockSize void trace(std::string event); public: diff --git a/src/02mem_manager/src/mem_offset_calculator.cc b/src/02mem_manager/src/mem_offset_calculator.cc index 64691430..fd7f4a6b 100644 --- a/src/02mem_manager/src/mem_offset_calculator.cc +++ b/src/02mem_manager/src/mem_offset_calculator.cc @@ -1,7 +1,7 @@ #include "mem_manager/mem_offset_calculator.h" #include "common.h" #include "mem_manager/functions.h" -#include +#include namespace refactor::mem_manager { @@ -18,7 +18,13 @@ namespace refactor::mem_manager { _freeBlocks{}, _headAddrToBlockSize{}, _tailAddrToBlockSize{}, - _traceInfo(trace ? std::make_optional(TraceInfo{0, 0}) : std::nullopt) {} +#ifndef NDEBUG + _traceInfo(trace ? std::make_optional(TraceInfo{0, 0}) : std::nullopt) +#else + _traceInfo(std::nullopt) +#endif + { + } size_t OffsetCalculator::alloc(size_t size) { // pad the size to the multiple of alignment @@ -113,13 +119,14 @@ namespace refactor::mem_manager { } void OffsetCalculator::trace(std::string event) { - fmt::println("{} {:>5} {:>5} {:>#10} {:>#6f} {:>5} {:>#10} {:>#10}", - event, - _traceInfo->allocTimes, _traceInfo->freeTimes, - _peak, static_cast(_used) / _peak, - _freeBlocks.size(), - _freeBlocks.empty() ? 0 : _freeBlocks.begin()->blockSize, - _freeBlocks.empty() ? 0 : _freeBlocks.rbegin()->blockSize); + logi("CALCULATOR {} {} {:>5} {:>5} {:>#10} {:>#6f} {:>5} {:>#10} {:>#10}", + reinterpret_cast(this), + event, + _traceInfo->allocTimes, _traceInfo->freeTimes, + _peak, static_cast(_used) / _peak, + _freeBlocks.size(), + _freeBlocks.empty() ? 0 : _freeBlocks.begin()->blockSize, + _freeBlocks.empty() ? 0 : _freeBlocks.rbegin()->blockSize); } }// namespace refactor::mem_manager