From cd1c6732f70a6d01086f38a39bee1f619e794b6e Mon Sep 17 00:00:00 2001 From: faluco Date: Wed, 21 Apr 2021 13:10:23 +0200 Subject: [PATCH] Remove the creation of strings when preparing the contents of a log entry in sched_helpers. --- srsenb/src/stack/mac/sched_helpers.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srsenb/src/stack/mac/sched_helpers.cc b/srsenb/src/stack/mac/sched_helpers.cc index 5c7e003c4..8f6c0d502 100644 --- a/srsenb/src/stack/mac/sched_helpers.cc +++ b/srsenb/src/stack/mac/sched_helpers.cc @@ -12,9 +12,9 @@ #include "srsenb/hdr/stack/mac/sched_helpers.h" #include "srsran/common/standard_streams.h" +#include "srsran/common/string_helpers.h" #include "srsran/mac/pdu.h" #include "srsran/srslog/bundled/fmt/format.h" - #include #define Debug(fmt, ...) get_mac_logger().debug(fmt, ##__VA_ARGS__) @@ -125,9 +125,9 @@ void log_dl_cc_results(srslog::basic_logger& logger, uint32_t enb_cc_idx, const } if (strbuf.size() != 0) { if (logger.debug.enabled()) { - logger.debug("SCHED: DL MAC PDU payload cc=%d:\n%s", enb_cc_idx, fmt::to_string(strbuf).c_str()); + logger.debug("SCHED: DL MAC PDU payload cc=%d:\n%s", enb_cc_idx, srsran::to_c_str(strbuf)); } else { - logger.info("SCHED: DL MAC CEs cc=%d: %s", enb_cc_idx, fmt::to_string(strbuf).c_str()); + logger.info("SCHED: DL MAC CEs cc=%d: %s", enb_cc_idx, srsran::to_c_str(strbuf)); } } } @@ -137,7 +137,7 @@ void log_phich_cc_results(srslog::basic_logger& logger, const sched_interface::ul_sched_res_t& result) { using phich_t = sched_interface::ul_sched_phich_t; - if (!logger.info.enabled()) { + if (!logger.debug.enabled()) { return; } custom_mem_buffer strbuf; @@ -148,7 +148,7 @@ void log_phich_cc_results(srslog::basic_logger& logger, fmt::format_to(strbuf, "{}rnti=0x{:0x}, val={}", prefix, phich.rnti, val); } if (strbuf.size() != 0) { - logger.debug("SCHED: Allocated PHICHs, cc=%d: [%s]", enb_cc_idx, fmt::to_string(strbuf).c_str()); + logger.debug("SCHED: Allocated PHICHs, cc=%d: [%s]", enb_cc_idx, srsran::to_c_str(strbuf)); } }