gnb: fix static initialization order problem

Author: sauka

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -1920,10 +1920,10 @@ static void configure_cli11_hal_args(CLI::App& app, optional<hal_appconfig>& con
 static error_type<std::string> is_valid_cpu_index(unsigned cpu_idx)
 {
   os_sched_affinity_bitmask one_cpu_mask(cpu_idx);
-  if (not one_cpu_mask.subtract(os_sched_affinity_bitmask::available_cpus).empty()) {
+  if (not one_cpu_mask.subtract(os_sched_affinity_bitmask::available_cpus()).empty()) {
     return fmt::format("Invalid CPU core selected '{}'. Valid CPU ids: {}",
                        cpu_idx,
-                       os_sched_affinity_bitmask::available_cpus.get_cpu_ids());
+                       os_sched_affinity_bitmask::available_cpus().get_cpu_ids());
   }
   return default_success_t();
 }

include/srsran/support/unique_thread.h

@@ -100,9 +100,6 @@ struct os_sched_affinity_bitmask {
 public:
   static constexpr size_t MAX_CPUS = 1024;
 
-  /// Bitmap of the total CPUs available to the application.
-  const static os_sched_affinity_bitmask available_cpus;
-
   os_sched_affinity_bitmask() : cpu_bitset(get_host_max_cpu_id() + 1) {}
 
   explicit os_sched_affinity_bitmask(size_t cpu_idx) : cpu_bitset(get_host_max_cpu_id() + 1) { set(cpu_idx); }
@@ -113,6 +110,9 @@ struct os_sched_affinity_bitmask {
 
   void set(size_t cpu_idx) { cpu_bitset.set(cpu_idx); }
 
+  /// Returns a bitmap of the CPUs available to the application.
+  static const os_sched_affinity_bitmask& available_cpus();
+
   /// \brief Finds, within a range of CPU indexes, the lowest CPU enabled.
   /// \param[in] start_cpu_index Starting CPU index for the search.
   /// \param[in] end_cpu_index End CPU index for the search.

lib/support/unique_thread.cpp

@@ -88,7 +88,7 @@ static bool thread_set_param(pthread_t t, os_thread_realtime_priority prio)
 
 static bool thread_set_affinity(pthread_t t, const os_sched_affinity_bitmask& bitmap, const std::string& name)
 {
-  auto invalid_ids = bitmap.subtract(os_sched_affinity_bitmask::available_cpus);
+  auto invalid_ids = bitmap.subtract(os_sched_affinity_bitmask::available_cpus());
   if (invalid_ids.size() > 0) {
     fmt::print(
         "Warning: The CPU affinity of thread \"{}\" contains the following invalid CPU ids: {}\n", name, invalid_ids);
@@ -170,15 +170,19 @@ static void print_thread_priority(pthread_t t, const char* tname, std::thread::i
   fmt::print("Thread [{}:{}]: Sched policy is \"{}\". Priority is {}.\n", tname, tid, p, param.sched_priority);
 }
 
-const os_sched_affinity_bitmask os_sched_affinity_bitmask::available_cpus = []() {
-  os_sched_affinity_bitmask bitmask;
-  for (size_t i = 0; i < bitmask.size(); ++i) {
-    if (CPU_ISSET(i, &host_desc.cpuset)) {
-      bitmask.cpu_bitset.set(i);
+const os_sched_affinity_bitmask& os_sched_affinity_bitmask::available_cpus()
+{
+  static os_sched_affinity_bitmask available_cpus_mask = []() {
+    os_sched_affinity_bitmask bitmask;
+    for (size_t i = 0; i < bitmask.size(); ++i) {
+      if (CPU_ISSET(i, &host_desc.cpuset)) {
+        bitmask.cpu_bitset.set(i);
+      }
     }
-  }
-  return bitmask;
-}();
+    return bitmask;
+  }();
+  return available_cpus_mask;
+}
 
 static_vector<size_t, os_sched_affinity_bitmask::MAX_CPUS>
 os_sched_affinity_bitmask::subtract(const os_sched_affinity_bitmask& rhs) const