support: remove default byte buffer pool segment size from header

Author: frankist

apps/gnb/gnb_appconfig.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "gnb_os_sched_affinity_manager.h"
+#include "srsran/adt/byte_buffer.h"
 #include "srsran/adt/optional.h"
 #include "srsran/adt/variant.h"
 #include "srsran/ran/band_helper.h"
@@ -1019,7 +1020,7 @@ struct ru_ofh_appconfig {
 
 struct buffer_pool_appconfig {
   std::size_t nof_segments = 1048576;
-  std::size_t segment_size = 1024;
+  std::size_t segment_size = byte_buffer_segment_pool_default_segment_size();
 };
 
 /// CPU isolation configuration in the gNB app.

include/srsran/adt/byte_buffer.h

@@ -16,7 +16,7 @@
 namespace srsran {
 
 /// Default byte buffer segment size in the byte buffer pool.
-constexpr static size_t default_byte_buffer_segment_size = 1024;
+size_t byte_buffer_segment_pool_default_segment_size();
 
 /// \brief Sets the default size of the default byte_buffer segment pool.
 ///
@@ -25,7 +25,7 @@ constexpr static size_t default_byte_buffer_segment_size = 1024;
 /// \param memory_block_size Number, in bytes, for each memory block on which a buffer_byte_segment header and payload
 /// will be stored.
 void init_byte_buffer_segment_pool(std::size_t nof_segments,
-                                   std::size_t memory_block_size = default_byte_buffer_segment_size);
+                                   std::size_t memory_block_size = byte_buffer_segment_pool_default_segment_size());
 
 /// \brief Non-owning view to a byte sequence.
 /// The underlying byte sequence is not contiguous in memory. Instead, it is represented as an intrusive linked list of

lib/support/byte_buffer.cpp

@@ -13,14 +13,19 @@
 
 using namespace srsran;
 
+size_t srsran::byte_buffer_segment_pool_default_segment_size()
+{
+  return 1024;
+}
+
 /// Get default byte buffer segment pool. Initialize pool if not initialized before.
 detail::byte_buffer_segment_pool& srsran::detail::get_default_byte_buffer_segment_pool()
 {
   // Initialize byte buffer segment pool, if not yet initialized.
   // Note: In case of unit tests, this function will be called rather than init_byte_buffer_segment_pool(...)
   constexpr static size_t default_byte_buffer_segment_pool_size = 16384;
   static auto&            pool = detail::byte_buffer_segment_pool::get_instance(default_byte_buffer_segment_pool_size,
-                                                                     default_byte_buffer_segment_size);
+                                                                     byte_buffer_segment_pool_default_segment_size());
   return pool;
 }