From e70b8c247219a7a4d3cf42f5181637337d13f2ef Mon Sep 17 00:00:00 2001
From: Francisco <francisco.paisana@softwareradiosystems.com>
Date: Wed, 23 Jun 2021 18:11:11 +0100
Subject: [PATCH] sched,bugfix: fix SI scheduler logging

---
 srsenb/src/stack/mac/sched_carrier.cc         |  4 ++--
 .../src/stack/mac/sched_phy_ch/sched_dci.cc   | 23 ++++++++++---------
 srsenb/src/stack/rrc/rrc.cc                   |  2 +-
 srsenb/src/stack/rrc/rrc_nr.cc                |  4 +++-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/srsenb/src/stack/mac/sched_carrier.cc b/srsenb/src/stack/mac/sched_carrier.cc
index f4b79efa6..ab13122e7 100644
--- a/srsenb/src/stack/mac/sched_carrier.cc
+++ b/srsenb/src/stack/mac/sched_carrier.cc
@@ -124,8 +124,8 @@ void bc_sched::alloc_sibs(sf_sched* tti_sched)
       }
     }
     if (ret != alloc_result::success) {
-      logger.warning("SCHED: Could not allocate SIB=%d, len=%d. Cause: %s",
-                     sib_idx + 1,
+      logger.warning("SCHED: Could not allocate SI message, idx=%d, len=%d. Cause: %s",
+                     sib_idx,
                      cc_cfg->cfg.sibs[sib_idx].len,
                      to_string(ret));
     }
diff --git a/srsenb/src/stack/mac/sched_phy_ch/sched_dci.cc b/srsenb/src/stack/mac/sched_phy_ch/sched_dci.cc
index 3756b9438..3e964082b 100644
--- a/srsenb/src/stack/mac/sched_phy_ch/sched_dci.cc
+++ b/srsenb/src/stack/mac/sched_phy_ch/sched_dci.cc
@@ -334,17 +334,18 @@ void log_broadcast_allocation(const sched_interface::dl_sched_bc_t& bc,
   fmt::format_to(str_buffer, "{}", rbg_range);
 
   if (bc.type == sched_interface::dl_sched_bc_t::bc_type::BCCH) {
-    get_mac_logger().debug("SCHED: SIB%d, cc=%d, rbgs=(%d,%d), dci=(%d,%d), rv=%d, len=%d, period=%d, mcs=%d",
-                           bc.index + 1,
-                           cell_params.enb_cc_idx,
-                           rbg_range.start(),
-                           rbg_range.stop(),
-                           bc.dci.location.L,
-                           bc.dci.location.ncce,
-                           bc.dci.tb[0].rv,
-                           cell_params.cfg.sibs[bc.index].len,
-                           cell_params.cfg.sibs[bc.index].period_rf,
-                           bc.dci.tb[0].mcs_idx);
+    get_mac_logger().debug(
+        "SCHED: SI message, cc=%d, idx=%d, rbgs=(%d,%d), dci=(%d,%d), rv=%d, len=%d, period=%d, mcs=%d",
+        bc.index,
+        cell_params.enb_cc_idx,
+        rbg_range.start(),
+        rbg_range.stop(),
+        bc.dci.location.L,
+        bc.dci.location.ncce,
+        bc.dci.tb[0].rv,
+        cell_params.cfg.sibs[bc.index].len,
+        cell_params.cfg.sibs[bc.index].period_rf,
+        bc.dci.tb[0].mcs_idx);
   } else {
     get_mac_logger().info("SCHED: PCH, cc=%d, rbgs=%s, dci=(%d,%d), tbs=%d, mcs=%d",
                           cell_params.enb_cc_idx,
diff --git a/srsenb/src/stack/rrc/rrc.cc b/srsenb/src/stack/rrc/rrc.cc
index a82cde2d0..9eb276698 100644
--- a/srsenb/src/stack/rrc/rrc.cc
+++ b/srsenb/src/stack/rrc/rrc.cc
@@ -756,7 +756,7 @@ uint32_t rrc::generate_sibs()
       if (msg[msg_index].msg.c1().type().value != asn1::rrc::bcch_dl_sch_msg_type_c::c1_c_::types_opts::sib_type1) {
         msg_str = msg[msg_index].msg.c1().sys_info().crit_exts.type().to_string();
       }
-      fmt::format_to(membuf, "{}, cc={}", msg_str, cc_idx);
+      fmt::format_to(membuf, "{}, cc={}, idx={}", msg_str, cc_idx, msg_index);
       log_broadcast_rrc_message(SRSRAN_SIRNTI, *cell_ctxt->sib_buffer.back(), msg[msg_index], srsran::to_c_str(membuf));
     }
 
diff --git a/srsenb/src/stack/rrc/rrc_nr.cc b/srsenb/src/stack/rrc/rrc_nr.cc
index 143edd1a4..b8c0f407d 100644
--- a/srsenb/src/stack/rrc/rrc_nr.cc
+++ b/srsenb/src/stack/rrc/rrc_nr.cc
@@ -264,7 +264,9 @@ int32_t rrc_nr::generate_sibs()
     sib_buffer.push_back(std::move(sib));
 
     // Log SIBs in JSON format
-    log_rrc_message("SIB payload", Tx, sib_buffer.back().get(), msg[msg_index]);
+    fmt::memory_buffer strbuf;
+    fmt::format_to(strbuf, "SI message={} payload", msg_index);
+    log_rrc_message(fmt::to_string(strbuf), Tx, sib_buffer.back().get(), msg[msg_index]);
   }
 
   nof_si_messages = sib_buffer.size() - 1;