From 0280c08391987ca079939da2037c3ffc536324ca Mon Sep 17 00:00:00 2001
From: Sakthivel Velumani <sakthivel.velumani@eurecom.fr>
Date: Tue, 16 Mar 2021 12:43:43 +0100
Subject: [PATCH] Threadsafe FIFOs 1. Changed FIFO types to threadsafe to
 ensure order of execution 2. Changed RB_NB_TH to 1 because PUCCH have some
 issues when running 2 slots in parallel (race). Dont know exactly where it
 happens.

---
 executables/nr-ue.c                       | 10 +++++-----
 openair1/PHY/defs_common.h                |  4 ++--
 openair1/SCHED_NR/phy_procedures_nr_gNB.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index cb9440e174..c0b0af0618 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -394,10 +394,10 @@ void processSlotRX(void *arg) {
     // under the assumption that no two slots with same slot index of different frames are processed at the same time
       res = pullTpool(UE->respPdsch,&(get_nrUE_params()->Tpool));
       if (res->key == proc->nr_slot_rx) check_rx_finish = false;
-      pushNotifiedFIFO_nothreadSafe(UE->respPdsch, res);
+      pushNotifiedFIFO(UE->respPdsch, res);
       res = pullTpool(UE->txFifo,&(get_nrUE_params()->Tpool));
       if (res->key == proc->nr_slot_tx) check_tx_finish = false;
-      pushNotifiedFIFO_nothreadSafe(UE->txFifo, res);
+      pushNotifiedFIFO(UE->txFifo, res);
     }
 
   } else {
@@ -565,9 +565,9 @@ void *UE_thread(void *arg) {
   int absolute_slot=0, decoded_frame_rx=-1, trashed_frames=0;
 
   for (int i=0; i<RX_NB_TH; i++) {
-    pushNotifiedFIFO_nothreadSafe(&rxFifo, newNotifiedFIFO_elt(sizeof(nr_rxtx_thread_data_t), RX_JOB_ID,&rxFifo,processSlotRX));
-    pushNotifiedFIFO_nothreadSafe(&txFifo, newNotifiedFIFO_elt(sizeof(nr_rxtx_thread_data_t), 1,&txFifo,processSlotTX));
-    pushNotifiedFIFO_nothreadSafe(&respPdsch, newNotifiedFIFO_elt(sizeof(pdsch_rx_thread_data_t), 1,&respPdsch,processPdsch));
+    pushNotifiedFIFO(&rxFifo, newNotifiedFIFO_elt(sizeof(nr_rxtx_thread_data_t), RX_JOB_ID,&rxFifo,processSlotRX));
+    pushNotifiedFIFO(&txFifo, newNotifiedFIFO_elt(sizeof(nr_rxtx_thread_data_t), 1,&txFifo,processSlotTX));
+    pushNotifiedFIFO(&respPdsch, newNotifiedFIFO_elt(sizeof(pdsch_rx_thread_data_t), 1,&respPdsch,processPdsch));
   }
 
   while (!oai_exit) {
diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h
index 3e80002c8d..f9deac949f 100644
--- a/openair1/PHY/defs_common.h
+++ b/openair1/PHY/defs_common.h
@@ -74,8 +74,8 @@
 #include "nfapi_interface.h"
 
 #define RX_NB_TH_MAX 2
-#define RX_NB_TH 2
-#define RX_NB_TH_PL 2 //number of parallel jobs per slot
+#define RX_NB_TH 1
+#define RX_NB_TH_PL 3 //number of parallel jobs per slot
 #define RX_NB_TH_DL 14
 
 #define LTE_SLOTS_PER_SUBFRAME 2
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index 5328dc99aa..2f4a325893 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -577,7 +577,7 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
 
           offset = pucch_pdu->start_symbol_index*gNB->frame_parms.ofdm_symbol_size + (gNB->frame_parms.first_carrier_offset+pucch_pdu->prb_start*12);
           power_rxF = signal_energy_nodc(&gNB->common_vars.rxdataF[0][offset],12);
-          LOG_I(PHY,"frame %d, slot %d: PUCCH signal energy %d\n",frame_rx,slot_rx,power_rxF);
+          LOG_D(PHY,"frame %d, slot %d: PUCCH signal energy %d\n",frame_rx,slot_rx,power_rxF);
 
           nr_decode_pucch0(gNB,
 	                   slot_rx,