Merge branch 'episys/master-nsa' into episys/mel/merge_bw_testing_abs

nfapi/oai_integration/gnb_ind_vars.c

@@ -0,0 +1,7 @@
+#include "gnb_ind_vars.h"
+
+queue_t gnb_rach_ind_queue;
+queue_t gnb_rx_ind_queue;
+queue_t gnb_crc_ind_queue;
+queue_t gnb_uci_ind_queue;
+queue_t gnb_slot_ind_queue;

nfapi/oai_integration/gnb_ind_vars.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "openair2/PHY_INTERFACE/queue.h"
+
+extern queue_t gnb_rach_ind_queue;
+extern queue_t gnb_rx_ind_queue;
+extern queue_t gnb_crc_ind_queue;
+extern queue_t gnb_uci_ind_queue;
+extern queue_t gnb_slot_ind_queue;

nfapi/oai_integration/nfapi.c

@@ -40,15 +40,9 @@ typedef struct {
 static nfapi_params_t nfapi_params = {0};
 
 void set_thread_priority(int priority) {
-  //printf("%s(priority:%d)\n", __FUNCTION__, priority);
+  set_priority(priority);
+
   pthread_attr_t ptAttr;
-  struct sched_param schedParam;
-  schedParam.__sched_priority = priority; //79;
-
-  if(sched_setscheduler(0, SCHED_RR, &schedParam) != 0) {
-    printf("Failed to set scheduler to SCHED_RR\n");
-  }
-
   if(pthread_attr_setschedpolicy(&ptAttr, SCHED_RR) != 0) {
     printf("Failed to set pthread sched policy SCHED_RR\n");
   }

nfapi/oai_integration/nfapi_pnf.c

@@ -218,14 +218,9 @@ void pnf_nfapi_trace(nfapi_trace_level_t nfapi_level, const char *message, ...)
 }
 
 void pnf_set_thread_priority(int priority) {
+  set_priority(priority);
+
   pthread_attr_t ptAttr;
-  struct sched_param schedParam;
-  schedParam.__sched_priority = priority;
-
-  if(sched_setscheduler(0, SCHED_RR, &schedParam) != 0) {
-    printf("failed to set SCHED_RR\n");
-  }
-
   if(pthread_attr_setschedpolicy(&ptAttr, SCHED_RR) != 0) {
     printf("failed to set pthread SCHED_RR %d\n", errno);
   }

nfapi/oai_integration/nfapi_vnf.c

@@ -44,6 +44,7 @@
 
 #include "common/ran_context.h"
 #include "openair2/PHY_INTERFACE/queue.h"
+#include "gnb_ind_vars.h"
 
 #define TEST
 
@@ -172,12 +173,6 @@ typedef struct {
 
 } vnf_info;
 
-queue_t gnb_rach_ind_queue;
-queue_t gnb_rx_ind_queue;
-queue_t gnb_crc_ind_queue;
-queue_t gnb_uci_ind_queue;
-queue_t gnb_slot_ind_queue;
-
 int vnf_pack_vendor_extension_tlv(void *ve, uint8_t **ppWritePackedMsg, uint8_t *end, nfapi_p4_p5_codec_config_t *codec) {
   //NFAPI_TRACE(NFAPI_TRACE_INFO, "vnf_pack_vendor_extension_tlv\n");
   nfapi_tl_t *tlv = (nfapi_tl_t *)ve;

nfapi/open-nFAPI/pnf/src/pnf_p7.c

@@ -3264,10 +3264,6 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7)
 
 	struct timespec pselect_start;
 
-	struct timespec timeout;
-	timeout.tv_sec = 0;
-	timeout.tv_nsec = 500000;
-
 	struct timespec slot_duration;
 	slot_duration.tv_sec = 0;
 	slot_duration.tv_nsec = 0.5e6;
@@ -3286,6 +3282,7 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7)
 		struct timespec timeout;
 		timeout.tv_sec = 100;
 		timeout.tv_nsec = 0;
+		clock_gettime(CLOCK_MONOTONIC, &pselect_start);
 
 		//setting the timeout
 

nfapi/open-nFAPI/vnf/src/vnf_interface.c

@@ -1154,7 +1154,7 @@ int nfapi_vnf_allocate_phy(nfapi_vnf_config_t* config, int p5_idx, uint16_t* phy
 
 	info->timing_window = 30;       // This seems to override what gets set by the user - why??? //TODO: Change in NR in terms of microsecends,what should be the value?
 	info->timing_info_mode = 0x03;
-	info->timing_info_period = 10; // Melissa come back to this
+	info->timing_info_period = 10;
 
 	nfapi_vnf_phy_info_list_add(config, info);