Rename abortNotifiedFIFO() to abortNotifiedFIFOJob()

common/utils/threadPool/thread-pool.c

@@ -203,12 +203,12 @@ int main() {
   tmp=pullNotifiedFIFO(&myFifo);
   printf("pulled: %lu\n", tmp->key);
   displayList(&myFifo);
-  abortNotifiedFIFO(&myFifo,1005);
+  abortNotifiedFIFOJob(&myFifo,1005);
   printf("aborted 1005\n");
   displayList(&myFifo);
   pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 12345678, NULL, NULL));
   displayList(&myFifo);
-  abortNotifiedFIFO(&myFifo,12345678);
+  abortNotifiedFIFOJob(&myFifo,12345678);
   printf("aborted 12345678\n");
   displayList(&myFifo);
 

common/utils/threadPool/thread-pool.h

@@ -200,7 +200,7 @@ static inline time_stats_t exec_time_stats_NotifiedFIFO(const notifiedFIFO_elt_t
 // This function aborts all messages matching the key
 // If the queue is used in thread pools, it doesn't cancels already running processing
 // because the message has already been picked
-static inline int abortNotifiedFIFO(notifiedFIFO_t *nf, uint64_t key) {
+static inline int abortNotifiedFIFOJob(notifiedFIFO_t *nf, uint64_t key) {
   mutexlock(nf->lockF);
   int nbDeleted=0;
   notifiedFIFO_elt_t **start=&nf->outF;

executables/nr-ue.c

@@ -863,7 +863,7 @@ void *UE_thread(void *arg) {
   while (!oai_exit) {
     if (UE->lost_sync) {
       int nb = abortTpoolJob(&(get_nrUE_params()->Tpool),RX_JOB_ID);
-      nb += abortNotifiedFIFO(&nf, RX_JOB_ID);
+      nb += abortNotifiedFIFOJob(&nf, RX_JOB_ID);
       LOG_I(PHY,"Number of aborted slots %d\n",nb);
       for (int i=0; i<nb; i++)
         pushNotifiedFIFO_nothreadSafe(&freeBlocks, newNotifiedFIFO_elt(sizeof(nr_rxtx_thread_data_t), RX_JOB_ID,&nf,processSlotRX));

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c

@@ -208,7 +208,7 @@ bool nr_ue_postDecode(PHY_VARS_NR_UE *phy_vars_ue, notifiedFIFO_elt_t *req, bool
   } else {
     if ( !last ) {
       int nb=abortTpoolJob(&(pool_dl), req->key);
-      nb+=abortNotifiedFIFO(nf_p, req->key);
+      nb+=abortNotifiedFIFOJob(nf_p, req->key);
       LOG_D(PHY,"downlink segment error %d/%d, aborted %d segments\n",rdata->segment_r,rdata->nbSegments, nb);
       LOG_D(PHY, "DLSCH %d in error\n",rdata->dlsch_id);
       last = true;

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -1332,7 +1332,7 @@ void postDecode(L1_rxtx_proc_t *proc, notifiedFIFO_elt_t *req) {
   } else {
     if ( rdata->nbSegments != ulsch_harq->processedSegments ) {
       int nb=abortTpoolJob(proc->threadPool, req->key);
-      nb+=abortNotifiedFIFO(proc->respDecode, req->key);
+      nb+=abortNotifiedFIFOJob(proc->respDecode, req->key);
       proc->nbDecode-=nb;
       LOG_D(PHY,"uplink segment error %d/%d, aborted %d segments\n",rdata->segment_r,rdata->nbSegments, nb);
       AssertFatal(ulsch_harq->processedSegments+nb == rdata->nbSegments,"processed: %d, aborted: %d, total %d\n",

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -207,7 +207,7 @@ void nr_postDecode(PHY_VARS_gNB *gNB, notifiedFIFO_elt_t *req) {
   } else {
     if ( rdata->nbSegments != ulsch_harq->processedSegments ) {
       int nb = abortTpoolJob(&gNB->threadPool, req->key);
-      nb += abortNotifiedFIFO(&gNB->respDecode, req->key);
+      nb += abortNotifiedFIFOJob(&gNB->respDecode, req->key);
       gNB->nbDecode-=nb;
       LOG_D(PHY,"uplink segment error %d/%d, aborted %d segments\n",rdata->segment_r,rdata->nbSegments, nb);
       LOG_D(PHY, "ULSCH %d in error\n",rdata->ulsch_id);

openair1/SIMULATION/NR_PHY/ulschsim.c

@@ -88,7 +88,7 @@ int nr_postDecode_sim(PHY_VARS_gNB *gNB, notifiedFIFO_elt_t *req) {
   } else {
     if ( rdata->nbSegments != ulsch_harq->processedSegments ) {
       int nb=abortTpoolJob(&gNB->threadPool, req->key);
-      nb+=abortNotifiedFIFO(&gNB->respDecode, req->key);
+      nb+=abortNotifiedFIFOJob(&gNB->respDecode, req->key);
       gNB->nbDecode-=nb;
       AssertFatal(ulsch_harq->processedSegments+nb == rdata->nbSegments,"processed: %d, aborted: %d, total %d\n",
       ulsch_harq->processedSegments, nb, rdata->nbSegments);