Update main

Author: codebot

include/srsran/support/executors/concurrent_metrics_executor.h

@@ -164,6 +164,8 @@ class concurrent_metrics_executor : public task_executor
       (void)free_tasks->try_push(task_idx);
     });
     if (!success) {
+      task = {};
+      (void)free_tasks->try_push(task_idx);
       logger.debug("Unsuccessful execution of handle metrics.");
     }
   }

tests/e2e/tests/viavi/test_declaration.yml

@@ -56,7 +56,7 @@ tests:
           max_puschs_per_slot: 2
       cu_cp:
         rrc:
-          rrc_procedure_timeout_ms: 7200
+          rrc_procedure_timeout_ms: 2000
       expert_execution:
         queues:
           du_ue_data_executor_queue_size: 16384
@@ -283,6 +283,12 @@ tests:
           nof_dl_symbols: 10
           nof_ul_slots: 7
           nof_ul_symbols: 0
+      expert_execution:
+        threads:
+          upper_phy:
+            nof_dl_threads: 3
+            nof_ul_threads: 2
+            nof_pusch_decoder_threads: 3
     # Pass / Fail Criteria
     expected_dl_bitrate: 14.0e+3
     expected_ul_bitrate: 1.0e+3
@@ -308,6 +314,12 @@ tests:
           nof_dl_symbols: 10
           nof_ul_slots: 6
           nof_ul_symbols: 0
+      expert_execution:
+        threads:
+          upper_phy:
+            nof_dl_threads: 3
+            nof_ul_threads: 2
+            nof_pusch_decoder_threads: 3
     # Pass / Fail Criteria
     expected_dl_bitrate: 14.0e+3
     expected_ul_bitrate: 1.0e+3