Update main

# Conflicts:
#	CMakeLists.txt
#	include/srsran/adt/detail/has_member.h
#	include/srsran/adt/detail/tuple_utils.h
#	include/srsran/adt/ranges/filter_view.h
#	include/srsran/ngap/ngap_reset.h
#	include/srsran/support/executors/concurrent_metrics_executor.h
#	include/srsran/support/memory_pool/bounded_queue_object_pool.h
#	lib/cu_up/routines/initial_cu_up_setup_routine.cpp
#	lib/du/du_high/du_manager/procedures/initial_du_setup_procedure.cpp
#	lib/phy/upper/signal_processors/signal_processor_factories.cpp
#	tests/unittests/adt/filter_view_test.cpp
#	tests/unittests/phy/lower/modulation/ofdm_prach_demodulator_test_data.tar.gz
#	tests/unittests/phy/upper/channel_coding/short/short_block_detector_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/prach_detector_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/channel_estimator/port_channel_estimator_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/nzp_csi_rs/nzp_csi_rs_generator_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/pdcch/dmrs_pdcch_processor_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/pdsch/dmrs_pdsch_processor_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/pucch/dmrs_pucch_estimator_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/pusch/dmrs_pusch_estimator_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/srs/srs_estimator_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/ssb/dmrs_pbch_processor_test_data.tar.gz

Author: codebot

.gdbinit

@@ -22,13 +22,18 @@
 #            Pretty-Printers
 ############################################
 
+# If you add a pretty printer, please create the corresponding test in
+# tests/utils/gdb/pretty_printers
+
 python
 
 import struct
 
 ###### static_vector<T, N> ########
 
 class StaticVectorPrinter(object):
+    # Test: tests/utils/gdb/pretty_printers/pretty_printer_static_vector_test.cpp
+
     def __init__(self, val):
         self.val = val
         self.value_type = self.val.type.template_argument(0)
@@ -58,25 +63,27 @@ gdb.pretty_printers.append(make_static_vector)
 ###### bounded_bitset<N, reversed> ########
 
 class BoundedBitsetPrinter(object):
-  def __init__(self, val):
-      self.val = val
-  
-  def to_string(self):
-      length = int(self.val['cur_size'])
-      capacity = int(self.val.type.template_argument(0))
-      buffer = self.val['buffer']['_M_elems']
-      bitstring = ''
-      nof_words = (length + 63) // 64
-      nof_bits_in_word = 64
-      for idx in reversed(range(nof_words)):
-          bitstring += '{:064b}'.format(int(buffer[idx]))
-      # last word might have a lower number of bits
-      last_word_nof_bits = length % 64
-      bitstring = bitstring[64-last_word_nof_bits::] 
-      return f'bounded_bitset of length {length}, capacity {capacity} = {bitstring}'
-  
-  def display_hint(self):
-      return 'string'
+    # Test: tests/utils/gdb/pretty_printers/pretty_printer_bounded_bitset_test.cpp
+
+    def __init__(self, val):
+        self.val = val
+
+    def to_string(self):
+        length = int(self.val['cur_size'])
+        capacity = int(self.val.type.template_argument(0))
+        buffer = self.val['buffer']['_M_elems']
+        bitstring = ''
+        nof_words = (length + 63) // 64
+        nof_bits_in_word = 64
+        for idx in reversed(range(nof_words)):
+            bitstring += '{:064b}'.format(int(buffer[idx]))
+        # last word might have a lower number of bits
+        last_word_nof_bits = length % 64
+        bitstring = bitstring[64-last_word_nof_bits::]
+        return f'bounded_bitset of length {length}, capacity {capacity} = {bitstring}'
+
+    def display_hint(self):
+        return 'array'
 
 
 def make_bounded_bitset(val):
@@ -86,40 +93,11 @@ def make_bounded_bitset(val):
 
 gdb.pretty_printers.append(make_bounded_bitset)
 
-###### optional<T> #######
-
-class OptionalPrinter(object):
-  def __init__(self, val):
-      self.val = val
-      self.value_type = self.val.type.strip_typedefs().template_argument(0)
-
-  def children(self):
-      has_val = bool(self.val['storage']['has_val'])
-      if has_val:
-          payload = self.val['storage']['payload']['val']
-          yield '[0]', payload
-
-  def to_string(self):
-      has_val = bool(self.val['storage']['has_val'])
-      if has_val:
-          return 'optional (present)'
-      return 'optional (empty)'
-
-  def display_hint(self):
-      return 'string'
-
-
-def make_optional(val):
-    s = str(val.type.strip_typedefs())
-    if s.startswith('srsran::optional<') and s.endswith('>'):
-        return OptionalPrinter(val)
-
-gdb.pretty_printers.append(make_optional)
-
-
 ###### tiny_optional<T> #######
 
 class TinyOptionalPrinter(object):
+    # Test: tests/utils/gdb/pretty_printers/pretty_printer_tiny_optional_test.cpp
+
     def __init__(self, val):
         self.val = val
         self.has_val = TinyOptionalPrinter.get_has_value(self.val)
@@ -134,15 +112,15 @@ class TinyOptionalPrinter(object):
         return 'tiny_optional (empty)'
 
     def display_hint(self):
-        return 'string'
+        return 'array'
 
     @staticmethod
     def get_has_value(gdb_val):
         fields = gdb_val.type.strip_typedefs().fields()
         assert len(fields) > 0
         f_type_str = str(fields[0].type.strip_typedefs())
-        if f_type_str.startswith('srsran::optional<'):
-            return bool(gdb_val['storage']['has_val'])
+        if f_type_str.startswith('std::optional<'):
+            return gdb_val['_M_payload']['_M_engaged']
         if 'std::unique_ptr<' in str(gdb_val['val'].type):
             val_str = str(gdb_val['val'])
             val_str = val_str[val_str.find('get() = ') + len('get() = ')::]
@@ -155,8 +133,8 @@ class TinyOptionalPrinter(object):
     def get_value(gdb_val):
         fields = gdb_val.type.strip_typedefs().fields()
         f_type_str = str(fields[0].type.strip_typedefs())
-        if f_type_str.startswith('srsran::optional<'):
-            return gdb_val['storage']['payload']['val']
+        if f_type_str.startswith('std::optional<'):
+            return gdb_val['_M_payload']['_M_payload']['_M_value']
         return gdb_val['val']
 
 
@@ -170,23 +148,31 @@ gdb.pretty_printers.append(make_tiny_optional)
 ###### slotted_array<T, N> #######
 
 class SlotArrayPrinter(object):
-  def __init__(self, val):
-      self.val = val
-      self.value_type = self.val.type.strip_typedefs().template_argument(0)
-      self.capacity = int(self.val.type.strip_typedefs().template_argument(1))
-      self.nof_elems = int(self.val['nof_elems'])
+    # Test: tests/utils/gdb/pretty_printers/pretty_printer_slotted_array_test.cpp
+
+    def __init__(self, val):
+        self.val = val
+        self.value_type = self.val.type.strip_typedefs().template_argument(0)
+        self.capacity = int(self.val.type.strip_typedefs().template_argument(1))
+        self.nof_elems = int(self.val['nof_elems'])
 
-  def children(self):
-      vec = self.val['vec']['_M_elems']
-      for idx in range(self.capacity):
-          if TinyOptionalPrinter.get_has_value(vec[idx]):
-              yield f'[{idx}]', TinyOptionalPrinter.get_value(vec[idx])
+    def children(self):
+        opt_value = gdb.lookup_type(f'srsran::tiny_optional<{self.value_type}>')
+        vec_size = self.val['vec']['sz']
+        vec = self.val['vec']['array']['_M_elems'].cast(opt_value.pointer())
+        count = 0
+        for idx in range(vec_size):
+            if TinyOptionalPrinter.get_has_value(vec[idx]):
+                yield f'{count}', f'{idx}'
+                count += 1
+                yield f'{count}', TinyOptionalPrinter.get_value(vec[idx])
+                count += 1
 
-  def to_string(self):
-      return f'slotted_array of {self.nof_elems} elements, capacity {self.capacity}'
+    def to_string(self):
+        return f'slotted_array of {self.nof_elems} elements, capacity {self.capacity}'
 
-  def display_hint(self):
-      return 'string'
+    def display_hint(self):
+        return 'map'
 
 def make_slotted_array(val):
     s = str(val.type.strip_typedefs())
@@ -198,6 +184,8 @@ gdb.pretty_printers.append(make_slotted_array)
 ###### slotted_vector<T> #######
 
 class SlotVectorPrinter(object):
+    # Test: tests/utils/gdb/pretty_printers/pretty_printer_slotted_vector_test.cpp
+
     def __init__(self, val):
         self.val = val
         self.value_type = self.val.type.strip_typedefs().template_argument(0)
@@ -210,15 +198,19 @@ class SlotVectorPrinter(object):
         max_int = 2**64 - 1
         indexmapper_ptr = indexmapper['_M_impl']['_M_start']
         object_ptr = self.objects['_M_impl']['_M_start']
+        count = 0
         for idx in range(nof_idxs):
             if int(indexmapper_ptr[idx]) != max_int:
-                yield f'[{idx}]', object_ptr[indexmapper_ptr[idx]]
+                yield f'{count}', f'{idx}'
+                count += 1
+                yield f'{count}', object_ptr[indexmapper_ptr[idx]]
+                count += 1
 
     def to_string(self):
         return f'slotted_vector of {self.nof_elems} elements'
 
     def display_hint(self):
-        return 'string'
+        return 'map'
 
 def make_slotted_vector(val):
     s = str(val.type.strip_typedefs())
@@ -230,6 +222,8 @@ gdb.pretty_printers.append(make_slotted_vector)
 ###### Brain Floating Point 16 (bf16_t) ######
 
 class BFloat16(object):
+    # Test: tests/utils/gdb/pretty_printers/pretty_printer_bf16_test.cpp
+
     def __init__(self, val):
         self.__val = val
 
@@ -250,6 +244,8 @@ def make_bf16_t(val):
 gdb.pretty_printers.append(make_bf16_t)
 
 class BFloat16Complex(object):
+    # Test: tests/utils/gdb/pretty_printers/pretty_printer_cbf16_test.cpp
+
     def __init__(self, val):
         self.__val = val
 

.gitlab-ci.yml

@@ -334,7 +334,7 @@ plugin nightly:
 ## Static
 ################################################################################
 headers:
-  image: ubuntu
+  image: ubuntu:24.04
   stage: static
   variables:
     GIT_LFS_SKIP_SMUDGE: 1

.gitlab/ci-shared/build.yml

@@ -62,6 +62,7 @@ variables:
     ENABLE_RTSAN: "" # Empty for cmake default
     ENABLE_WERROR: "" # Empty for cmake default
     ENABLE_PLUGINS: "" # Empty for cmake default
+    TEST_GDB_PRINTERS: "" # Empty for cmake default
     FORCE_DEBUG_INFO: "" # Empty for cmake default
     MARCH: "" # Empty for cmake default
     MTUNE: "" # Empty for cmake default
@@ -93,8 +94,8 @@ variables:
         ENABLE_UHD ENABLE_DPDK ENABLE_ZEROMQ \
         ENABLE_ASAN ENABLE_TSAN ENABLE_GCOV \
         ENABLE_UBSAN ENABLE_UBSAN_MIN ENABLE_RTSAN \
-        ENABLE_WERROR ENABLE_PLUGINS FORCE_DEBUG_INFO \
-        MARCH MTUNE \
+        ENABLE_WERROR ENABLE_PLUGINS TEST_GDB_PRINTERS \
+        FORCE_DEBUG_INFO MARCH MTUNE \
       ; do
         if [ -n "${!var}" ]; then
           BUILD_ARGS="-D${var}=${!var} ${BUILD_ARGS}"

.gitlab/ci-shared/e2e.yml

@@ -52,6 +52,7 @@ variables:
 
 .load retina variables:
   stage: ci
+  image: ubuntu:24.04
   variables:
     GIT_LFS_SKIP_SMUDGE: 1
   retry: 2
@@ -194,17 +195,19 @@ variables:
       echo "*******************************************************************************************************************************"
     # Artifact transfer
     - |
-      # Saving artifacts to the FTP server
-      # Verify if SSH connection is active
-      if ! nc -z -v "$FTP_SERVER_IP" 22 >/dev/null 2>&1; then
-          echo "Error: SSH server ${FTP_SERVER_IP}:22 is not active or is not reachable."
-          exit 1
+      if [ "$CLUSTER" = "new-retina-e2e-amd64" ]; then
+        # Saving artifacts to the FTP server
+        # Verify if SSH connection is active
+        if ! nc -z -v "$FTP_SERVER_IP" 22 >/dev/null 2>&1; then
+            echo "Error: SSH server ${FTP_SERVER_IP}:22 is not active or is not reachable."
+            exit 1
+        fi
+        artifacts_dir="${SRSRANDIR}/tests/e2e/log"
+        compressed_artifact="artifacts_${CI_JOB_NAME_SLUG}_${CI_JOB_ID}.zip"
+        remote_path="E:/artifacts/"
+        # Compress the artifacts
+        zip -q -r "${compressed_artifact}" "${artifacts_dir}"
+        # Send the artifacts to the server
+        sshpass -p "${SSH_PASS}" scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P 22 "${compressed_artifact}" "${SSH_USER}@${FTP_SERVER_IP}:${remote_path}"  >/dev/null 2>&1
+        echo "Artifacts saved at ${FTP_SERVER_IP}:${remote_path}/${compressed_artifact}"
       fi
-      artifacts_dir="${SRSRANDIR}/tests/e2e/log"
-      compressed_artifact="artifacts_${CI_JOB_NAME_SLUG}_${CI_JOB_ID}.zip"
-      remote_path="E:/artifacts/"
-      # Compress the artifacts
-      zip -q -r "${compressed_artifact}" "${artifacts_dir}"
-      # Send the artifacts to the server
-      sshpass -p "${SSH_PASS}" scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P 22 "${compressed_artifact}" "${SSH_USER}@${FTP_SERVER_IP}:${remote_path}"  >/dev/null 2>&1
-      echo "Artifacts saved at ${FTP_SERVER_IP}:${remote_path}/${compressed_artifact}"