set core8-11 to rcc and core1-4 to rru

common/utils/LOG/log.c

@@ -789,10 +789,6 @@ void log_output_memory(const char *file, const char *func, int line, int comp, i
     //len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%08lx]", thread_id);
     //if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
 
-    len += vsnprintf(&log_buffer[len], MAX_LOG_TOTAL - len, format, args);
-    if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-    log_end = log_buffer + len;
-
     struct timeval gettime;
     gettimeofday(&gettime,NULL);
     len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%ld.%06ld]", gettime.tv_sec, gettime.tv_usec);
@@ -803,6 +799,10 @@ void log_output_memory(const char *file, const char *func, int line, int comp, i
           log_level_highlight_end[level]);
       if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
     }
+
+    len += vsnprintf(&log_buffer[len], MAX_LOG_TOTAL - len, format, args);
+    if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
+    log_end = log_buffer + len;
   }
 
   //va_end(args);

nfapi/oai_integration/nfapi_pnf.c

@@ -276,7 +276,7 @@ void* pnf_p7_thread_start(void* ptr) {
 #ifdef CPU_AFFINITY
   if (get_nprocs() >= 8)
   {
-    for (j = 5; j < 9; j++) {
+    for (j = 1; j < 5; j++) {
       CPU_SET(j, &cpuset);
     }
   } else if (get_nprocs() > 2) {
@@ -1638,7 +1638,7 @@ void* pnf_start_thread(void* ptr) {
 #ifdef CPU_AFFINITY
   if (get_nprocs() >= 8)
   {
-    for (j = 5; j < 9; j++) {
+    for (j = 1; j < 5; j++) {
       CPU_SET(j, &cpuset);
     }
   } else if (get_nprocs() > 2) {

nfapi/oai_integration/nfapi_vnf.c

@@ -383,12 +383,13 @@ int wake_eNB_rxtx(PHY_VARS_eNB *eNB, uint16_t sfn, uint16_t sf) {
 
   // wake up TX for subframe n+sf_ahead
   // lock the TX mutex and make sure the thread is ready
+  LOG_D(MAC,"before pthread_mutex_timedlock: frame %d subframe %d\n",proc->frame_rx,proc->subframe_rx);
   if (pthread_mutex_timedlock(&L1_proc->mutex,&wait) != 0) {
       LOG_E( PHY, "[eNB] ERROR pthread_mutex_lock for eNB RXTX thread %d (IC %d)\n", L1_proc->subframe_rx&1,L1_proc->instance_cnt );
       exit_fun( "error locking mutex_rxtx" );
       return(-1);
   }
-
+  LOG_D(MAC,"after  pthread_mutex_timedlock: frame %d subframe %d\n",proc->frame_rx,proc->subframe_rx);
   if(L1_proc->instance_cnt < 0){
     ++L1_proc->instance_cnt;
   }else{
@@ -398,7 +399,7 @@ int wake_eNB_rxtx(PHY_VARS_eNB *eNB, uint16_t sfn, uint16_t sf) {
   }
 
   pthread_mutex_unlock( &L1_proc->mutex );
-
+  LOG_D(MAC,"after  pthread_mutex_unlock: frame %d subframe %d\n",proc->frame_rx,proc->subframe_rx);
   //LOG_D( PHY,"[VNF-subframe_ind] sfn/sf:%d:%d proc[frame_rx:%d subframe_rx:%d] L1_proc->instance_cnt_rxtx:%d \n", sfn, sf, proc->frame_rx, proc->subframe_rx, L1_proc->instance_cnt_rxtx);
 
   // We have just received and processed the common part of a subframe, say n.
@@ -1038,7 +1039,7 @@ void* vnf_p7_start_thread(void *ptr) {
   if (get_nprocs() >= 8)
   {
 //    for (j = 1; j < 4; j++) {
-      CPU_SET(4, &cpuset);
+      CPU_SET(11, &cpuset);
 //    }
   } else if (get_nprocs() > 2) {
     for (j = 1; j < get_nprocs(); j++) {
@@ -1377,7 +1378,7 @@ void vnf_start_thread(void* ptr) {
 #ifdef CPU_AFFINITY
   if (get_nprocs() >= 8)
   {
-    for (j = 1; j < 4; j++) {
+    for (j = 8; j < 11; j++) {
       CPU_SET(j, &cpuset);
     }
   } else if (get_nprocs() > 2) {

targets/RT/USER/rt_wrapper.c

@@ -308,7 +308,7 @@ void thread_top_init(char *thread_name,
     else {
       if (nfapi_mode == 2) {
         if (get_nprocs() >= 8) {
-          for (j = 1; j < 4; j++) {
+          for (j = 8; j < 11; j++) {
              CPU_SET(j, &cpuset);
            }
         } else {
@@ -318,7 +318,7 @@ void thread_top_init(char *thread_name,
         }
       } else if (nfapi_mode == 1) {
         if (get_nprocs() >= 8) {
-          for (j = 5; j < 7; j++) {
+          for (j = 1; j < 5; j++) {
             CPU_SET(j, &cpuset);
           }
         } else {