Do not start processSlotTx before it is ready to run.

Implement run-to-completion for processSlotTX. This is achieved by using a new
dynamic_barrier_t which allows to specify callback after the first join has been
made.

openair1/PHY/INIT/phy_init.h

@@ -25,7 +25,6 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/defs_UE.h"
 #include "PHY/defs_gNB.h"
-#include "PHY/defs_nr_UE.h"
 
 #include "LTE_SystemInformationBlockType2.h"
 //#include "RadioResourceConfigCommonSIB.h"

openair1/PHY/TOOLS/CMakeLists.txt

@@ -53,7 +53,7 @@ if(ENABLE_UESCOPE OR ENABLE_ENBSCOPE OR ENABLE_NRSCOPE)
   target_link_libraries(uescope PUBLIC forms PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
   add_library(nrscope MODULE nr_phy_scope.c)
-  target_link_libraries(nrscope PUBLIC forms PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+  target_link_libraries(nrscope PUBLIC forms PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs UTIL)
 
   # all libraries should be written to root build dir (default creates the same hierarchie under build as existing for sources)
   set_target_properties(enbscope uescope nrscope 

openair1/PHY/defs_nr_UE.h

@@ -50,6 +50,7 @@
 #include "common_lib.h"
 #include "fapi_nr_ue_interface.h"
 #include "assertions.h"
+#include "barrier.h"
 //#include "openair1/SCHED_NR_UE/defs.h"
 
 #ifdef MEX
@@ -74,16 +75,6 @@
 #define openair_free(y,x) free((y))
 #define PAGE_SIZE 4096
 
-#ifdef NR_UNIT_TEST
-  #define FILE_NAME                " "
-  #define LINE_FILE                (0)
-  #define NR_TST_PHY_PRINTF(...)   printf(__VA_ARGS__)
-#else
-  #define FILE_NAME                (__FILE__)
-  #define LINE_FILE                (__LINE__)
-  #define NR_TST_PHY_PRINTF(...)
-#endif
-
 #define PAGE_MASK 0xfffff000
 #define virt_to_phys(x) (x)
 #define openair_sched_exit() exit(-1)
@@ -530,7 +521,7 @@ typedef struct PHY_VARS_NR_UE_s {
   void *phy_sim_pdsch_dl_ch_estimates_ext;
   uint8_t *phy_sim_dlsch_b;
 
-  notifiedFIFO_t tx_resume_ind_fifo[NR_MAX_SLOTS_PER_FRAME];
+  dynamic_barrier_t process_slot_tx_barriers[NR_MAX_SLOTS_PER_FRAME];
 
   // Gain change required for automation RX gain change
   int adjust_rxgain;

openair1/SCHED_NR/phy_frame_config_nr.c

@@ -31,10 +31,19 @@
 
 #include "PHY/defs_nr_common.h"
 #include "PHY/defs_gNB.h"
-#include "PHY/defs_nr_UE.h"
 #include "SCHED_NR/phy_frame_config_nr.h"
 #include "common/utils/nr/nr_common.h"
 
+#ifdef NR_UNIT_TEST
+  #define FILE_NAME                " "
+  #define LINE_FILE                (0)
+  #define NR_TST_PHY_PRINTF(...)   printf(__VA_ARGS__)
+#else
+  #define FILE_NAME                (__FILE__)
+  #define LINE_FILE                (__LINE__)
+  #define NR_TST_PHY_PRINTF(...)
+#endif
+
 /*******************************************************************
 *
 * NAME :         set_tdd_configuration

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -632,18 +632,6 @@ static int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue,
   return 0;
 }
 
-// This function release the Tx working thread for one pending information, like dlsch ACK/NACK
-static void send_dl_done_to_tx_thread(notifiedFIFO_t *nf, int rx_slot)
-{
-  if (nf) {
-    notifiedFIFO_elt_t *newElt = newNotifiedFIFO_elt(sizeof(int), 0, NULL, NULL);
-    // We put rx slot only for tracing purpose
-    int *msgData = (int *) NotifiedFifoData(newElt);
-    *msgData = rx_slot;
-    pushNotifiedFIFO(nf, newElt);
-  }
-}
-
 static uint32_t compute_csi_rm_unav_res(fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config)
 {
   uint32_t unav_res = 0;
@@ -737,7 +725,7 @@ static bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
     // don't wait anymore
     LOG_E(NR_PHY, "Internal error  nr_ue_dlsch_procedure() called but no active cw on slot %d, harq %d\n", nr_slot_rx, harq_pid);
     const int ack_nack_slot = (proc->nr_slot_rx + dlsch[0].dlsch_config.k1_feedback) % ue->frame_parms.slots_per_frame;
-    send_dl_done_to_tx_thread(ue->tx_resume_ind_fifo + ack_nack_slot, proc->nr_slot_rx);
+    dynamic_barrier_join(&ue->process_slot_tx_barriers[ack_nack_slot]);
     return false;
   }
 
@@ -873,7 +861,7 @@ static bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
   // DLSCH decoding finished! don't wait anymore in Tx process, we know if we should answer ACK/NACK PUCCH
   if (dlsch[0].rnti_type == TYPE_C_RNTI_) {
     const int ack_nack_slot = (proc->nr_slot_rx + dlsch[0].dlsch_config.k1_feedback) % ue->frame_parms.slots_per_frame;
-    send_dl_done_to_tx_thread(ue->tx_resume_ind_fifo + ack_nack_slot, proc->nr_slot_rx);
+    dynamic_barrier_join(&ue->process_slot_tx_barriers[ack_nack_slot]);
   }
 
   if (ue->phy_sim_dlsch_b)
@@ -1152,9 +1140,8 @@ void pdsch_processing(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc, nr_phy_
       nr_ue_dlsch_procedures(ue, proc, dlsch, llr, G);
     else {
       LOG_E(NR_PHY, "Demodulation impossible, internal error\n");
-      send_dl_done_to_tx_thread(
-          ue->tx_resume_ind_fifo + (proc->nr_slot_rx + dlsch_config->k1_feedback) % ue->frame_parms.slots_per_frame,
-          proc->nr_slot_rx);
+      int ack_nack_slot = (proc->nr_slot_rx + dlsch_config->k1_feedback) % ue->frame_parms.slots_per_frame;
+      dynamic_barrier_join(&ue->process_slot_tx_barriers[ack_nack_slot]);
       LOG_W(NR_PHY, "nr_ue_pdsch_procedures failed in slot %d\n", proc->nr_slot_rx);
     }