sched: shorten MAC DL PDU logging for long lists of SDUs

Author: frankist

lib/mac/mac_dl/dl_sch_pdu_assembler.cpp

@@ -171,54 +171,81 @@ void dl_sch_pdu::encode_subheader(bool F_bit, lcid_dl_sch_t lcid, unsigned heade
 
 // /////////////////////////
 
-class dl_sch_pdu_assembler::dl_sch_pdu_logger
+class dl_sch_pdu_assembler::pdu_log_builder
 {
 public:
-  explicit dl_sch_pdu_logger(du_ue_index_t ue_index_, rnti_t rnti_, units::bytes tbs_, srslog::basic_logger& logger_) :
-    ue_index(ue_index_), rnti(rnti_), tbs(tbs_), logger(logger_)
+  explicit pdu_log_builder(du_ue_index_t         ue_index_,
+                           rnti_t                rnti_,
+                           units::bytes          tbs_,
+                           fmt::memory_buffer&   fmtbuf_,
+                           srslog::basic_logger& logger_) :
+    ue_index(ue_index_), rnti(rnti_), tbs(tbs_), logger(logger_), fmtbuf(fmtbuf_), enabled(logger.info.enabled())
   {
+    fmtbuf.clear();
   }
 
   void add_sdu(lcid_t lcid, unsigned len)
   {
-    if (not logger.info.enabled()) {
+    if (not enabled) {
       return;
     }
-    fmt::format_to(fmtbuf, "{}SDU: lcid={} size={}", separator(), lcid, len);
+    if (lcid != current_sdu_lcid) {
+      if (current_sdu_lcid != lcid_t::INVALID_LCID) {
+        fmt::format_to(fmtbuf, "SDU: lcid={} nof_sdus={} total_size={}", current_sdu_lcid, nof_sdus, sum_bytes);
+      }
+      current_sdu_lcid = lcid;
+      nof_sdus         = 1;
+      sum_bytes        = units::bytes{len};
+    } else {
+      nof_sdus++;
+      sum_bytes += units::bytes{len};
+    }
   }
 
   void add_conres_id(const ue_con_res_id_t& conres)
   {
-    if (not logger.info.enabled()) {
+    if (not enabled) {
       return;
     }
     fmt::format_to(fmtbuf, "{}CON_RES: id={:x}", separator(), fmt::join(conres, ""));
   }
 
   void add_ta_cmd(const ta_cmd_ce_payload& ce_payload)
   {
-    if (not logger.info.enabled()) {
+    if (not enabled) {
       return;
     }
     fmt::format_to(fmtbuf, "{}TA_CMD: tag_id={}, ta_cmd={}", separator(), ce_payload.tag_id, ce_payload.ta_cmd);
   }
 
   void log()
   {
-    if (not logger.info.enabled()) {
+    if (not enabled) {
       return;
     }
+
+    // Log pending LCID SDUs.
+    if (current_sdu_lcid != lcid_t::INVALID_LCID) {
+      fmt::format_to(fmtbuf, "SDU: lcid={} nof_sdus={} total_size={}", current_sdu_lcid, nof_sdus, sum_bytes);
+    }
+
     logger.info("DL PDU: ue={} rnti={} size={}: {}", ue_index, rnti, tbs, to_c_str(fmtbuf));
   }
 
 private:
   const char* separator() const { return fmtbuf.size() == 0 ? "" : ", "; }
 
-  du_ue_index_t         ue_index;
-  rnti_t                rnti;
-  units::bytes          tbs;
+  du_ue_index_t ue_index;
+  rnti_t        rnti;
+  units::bytes  tbs;
+
   srslog::basic_logger& logger;
-  fmt::memory_buffer    fmtbuf;
+  fmt::memory_buffer&   fmtbuf;
+  const bool            enabled;
+
+  lcid_t       current_sdu_lcid = lcid_t::INVALID_LCID;
+  unsigned     nof_sdus         = 0;
+  units::bytes sum_bytes{0U};
 };
 
 // /////////////////////////
@@ -247,7 +274,7 @@ span<const uint8_t> dl_sch_pdu_assembler::assemble_newtx_pdu(rnti_t
   }
   dl_sch_pdu ue_pdu(buffer.first(tb_size_bytes));
 
-  dl_sch_pdu_logger pdu_logger{ue_mng.get_ue_index(rnti), rnti, units::bytes{tb_size_bytes}, logger};
+  pdu_log_builder pdu_logger{ue_mng.get_ue_index(rnti), rnti, units::bytes{tb_size_bytes}, fmtbuf, logger};
 
   // Encode added subPDUs.
   for (const dl_msg_lc_info& sched_lch : tb_info.lc_chs_to_sched) {
@@ -275,7 +302,7 @@ span<const uint8_t> dl_sch_pdu_assembler::assemble_newtx_pdu(rnti_t
 void dl_sch_pdu_assembler::assemble_sdus(dl_sch_pdu&           ue_pdu,
                                          rnti_t                rnti,
                                          const dl_msg_lc_info& lc_grant_info,
-                                         dl_sch_pdu_logger&    pdu_logger)
+                                         pdu_log_builder&      pdu_logger)
 {
   // Note: Do not attempt to build an SDU if there is not enough space for the MAC subheader, min payload size and
   // potential RLC header.
@@ -354,7 +381,7 @@ void dl_sch_pdu_assembler::assemble_sdus(dl_sch_pdu&           ue_pdu,
 void dl_sch_pdu_assembler::assemble_ce(dl_sch_pdu&           ue_pdu,
                                        rnti_t                rnti,
                                        const dl_msg_lc_info& subpdu,
-                                       dl_sch_pdu_logger&    pdu_logger)
+                                       pdu_log_builder&      pdu_logger)
 {
   switch (subpdu.lcid.value()) {
     case lcid_dl_sch_t::UE_CON_RES_ID: {

lib/mac/mac_dl/dl_sch_pdu_assembler.h

@@ -110,16 +110,19 @@ class dl_sch_pdu_assembler
   span<const uint8_t> assemble_retx_pdu(rnti_t rnti, harq_id_t harq_id, unsigned tb_idx, unsigned tbs_bytes);
 
 private:
-  class dl_sch_pdu_logger;
+  class pdu_log_builder;
 
   /// Assemble MAC SDUs for a given LCID.
-  void assemble_sdus(dl_sch_pdu& ue_pdu, rnti_t rnti, const dl_msg_lc_info& subpdu, dl_sch_pdu_logger& pdu_logger);
+  void assemble_sdus(dl_sch_pdu& ue_pdu, rnti_t rnti, const dl_msg_lc_info& subpdu, pdu_log_builder& pdu_logger);
 
   /// Assemble MAC subPDU with a CE.
-  void assemble_ce(dl_sch_pdu& ue_pdu, rnti_t rnti, const dl_msg_lc_info& subpdu, dl_sch_pdu_logger& pdu_logger);
+  void assemble_ce(dl_sch_pdu& ue_pdu, rnti_t rnti, const dl_msg_lc_info& subpdu, pdu_log_builder& pdu_logger);
+
+  mac_dl_ue_manager& ue_mng;
 
-  mac_dl_ue_manager&    ue_mng;
   srslog::basic_logger& logger;
+  // memory buffer to avoid allocations during formatting of pdus
+  fmt::memory_buffer fmtbuf;
 };
 
 } // namespace srsran