Merge remote-tracking branch 'origin/develop_integration_w46' into develop

Summary of changes:

- minor changes in RA code (functionality not changed, only notation)
- automatic indentation of some files (with indent -kr)
- bugfixes for TDD in RRU (IF4p5) and timing statistics of fronthaul and
  compression

openair1/PHY/LTE_TRANSPORT/if4_tools.c

@@ -58,7 +58,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
   uint16_t db_fulllength, db_halflength; 
   int slotoffsetF=0, blockoffsetF=0; 
 
-  uint16_t *data_block=NULL, *i=NULL;
+  uint16_t *data_block=NULL, *i=NULL, *d=NULL;
 
   IF4p5_header_t *packet_header=NULL;
   eth_state_t *eth = (eth_state_t*) (ru->ifdevice.priv);
@@ -138,23 +138,48 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
 
     if (packet_type == IF4p5_PULFFT) {
 
+      uint16_t *rx0 = (uint16_t*) &rxdataF[0][blockoffsetF];
+      uint16_t *rx1 = (uint16_t*) &rxdataF[0][slotoffsetF];
+
+
       for (symbol_id=fp->symbols_per_tti-nsym; symbol_id<fp->symbols_per_tti; symbol_id++) {	     
     VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SEND_IF4_SYMBOL, symbol_id );
 	VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_COMPR_IF, 1 );		
 
-	for (element_id=0; element_id<db_halflength; element_id++) {
-	  i = (uint16_t*) &rxdataF[0][blockoffsetF+element_id];
-	  data_block[element_id] = ((uint16_t) lin2alaw_if4p5[*i]) | ((uint16_t)(lin2alaw_if4p5[*(i+1)]<<8));
 
-	  i = (uint16_t*) &rxdataF[0][slotoffsetF+element_id];
-	  data_block[element_id+db_halflength] = ((uint16_t) lin2alaw_if4p5[*i]) | ((uint16_t)(lin2alaw_if4p5[*(i+1)]<<8));
-	  //if (element_id==0) LOG_I(PHY,"send_if4p5: symbol %d rxdata0 = (%d,%d)\n",symbol_id,*i,*(i+1));
+	start_meas(&ru->compression);
+
+       for (element_id=0; element_id<db_halflength; element_id+=8) {
+         i = (uint16_t*) &rx0[element_id];
+          d = (uint16_t*) &data_block[element_id];
+          d[0] = ((uint16_t) lin2alaw_if4p5[i[0]])  | ((uint16_t)(lin2alaw_if4p5[i[1]]<<8));
+          d[1] = ((uint16_t) lin2alaw_if4p5[i[2]])  | ((uint16_t)(lin2alaw_if4p5[i[3]]<<8));
+          d[2] = ((uint16_t) lin2alaw_if4p5[i[4]])  | ((uint16_t)(lin2alaw_if4p5[i[5]]<<8));
+          d[3] = ((uint16_t) lin2alaw_if4p5[i[6]])  | ((uint16_t)(lin2alaw_if4p5[i[7]]<<8));
+          d[4] = ((uint16_t) lin2alaw_if4p5[i[8]])  | ((uint16_t)(lin2alaw_if4p5[i[9]]<<8));
+          d[5] = ((uint16_t) lin2alaw_if4p5[i[10]]) | ((uint16_t)(lin2alaw_if4p5[i[11]]<<8));
+          d[6] = ((uint16_t) lin2alaw_if4p5[i[12]]) | ((uint16_t)(lin2alaw_if4p5[i[13]]<<8));
+          d[7] = ((uint16_t) lin2alaw_if4p5[i[14]]) | ((uint16_t)(lin2alaw_if4p5[i[15]]<<8));
+
+          i = (uint16_t*) &rx1[element_id];
+          d = (uint16_t*) &data_block[element_id+db_halflength];
+          d[0] = ((uint16_t) lin2alaw_if4p5[i[0]])  | ((uint16_t)(lin2alaw_if4p5[i[1]]<<8));
+          d[1] = ((uint16_t) lin2alaw_if4p5[i[2]])  | ((uint16_t)(lin2alaw_if4p5[i[3]]<<8));
+          d[2] = ((uint16_t) lin2alaw_if4p5[i[4]])  | ((uint16_t)(lin2alaw_if4p5[i[5]]<<8));
+          d[3] = ((uint16_t) lin2alaw_if4p5[i[6]])  | ((uint16_t)(lin2alaw_if4p5[i[7]]<<8));
+          d[4] = ((uint16_t) lin2alaw_if4p5[i[8]])  | ((uint16_t)(lin2alaw_if4p5[i[9]]<<8));
+          d[5] = ((uint16_t) lin2alaw_if4p5[i[10]]) | ((uint16_t)(lin2alaw_if4p5[i[11]]<<8));
+          d[6] = ((uint16_t) lin2alaw_if4p5[i[12]]) | ((uint16_t)(lin2alaw_if4p5[i[13]]<<8));
+          d[7] = ((uint16_t) lin2alaw_if4p5[i[14]]) | ((uint16_t)(lin2alaw_if4p5[i[15]]<<8));
 
         }
+
+        stop_meas(&ru->compression);
         VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_COMPR_IF, 0 );   	
 	    packet_header->frame_status &= ~(0x000f<<26);
 	    packet_header->frame_status |= (symbol_id&0x000f)<<26; 
 	VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_IF, 1 );  
+    start_meas(&ru->transport);
 	if ((ru->ifdevice.trx_write_func(&ru->ifdevice,
 					 symbol_id,
 					 &tx_buffer,
@@ -163,6 +188,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
 					 IF4p5_PULFFT)) < 0) {
 	  perror("ETHERNET write for IF4p5_PULFFT\n");
 	}
+    stop_meas(&ru->transport);
 	VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_IF, 0 );
 	slotoffsetF  += fp->ofdm_symbol_size;
 	blockoffsetF += fp->ofdm_symbol_size;
@@ -181,7 +207,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
   } else if (packet_type >= IF4p5_PRACH && 
 	     packet_type <= IF4p5_PRACH+4) {
     // FIX: hard coded prach samples length
-    LOG_D(PHY,"IF4p5_PRACH: frame %d, subframe %d\n",frame,subframe);
+    LOG_D(PHY,"IF4p5_PRACH: frame %d, subframe %d,packet type %x\n",frame,subframe,packet_type);
     db_fulllength = PRACH_NUM_SAMPLES;
     
     if (eth->flags == ETH_RAW_IF4p5_MODE) {
@@ -222,6 +248,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
 				     packet_type)) < 0) {
       perror("ETHERNET write for IF4p5_PRACH\n");
     }
+
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_IF, 0 );      
   } else {    
     AssertFatal(1==0, "send_IF4p5 - Unknown packet_type %x", packet_type);     
@@ -283,7 +310,7 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
   *subframe = ((packet_header->frame_status)>>22)&0x000f;
 
   *packet_type = packet_header->sub_type; 
-
+  LOG_D(PHY,"recv_IF4p5: Frame %d, Subframe %d: packet_type %x\n",*frame,*subframe,*packet_type);
   if (*packet_type == IF4p5_PDLFFT) {          
     *symbol_number = ((packet_header->frame_status)>>26)&0x000f;         
     VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RECV_IF4_SYMBOL, *symbol_number );
@@ -313,7 +340,6 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
     slotoffsetF = (*symbol_number)*(fp->ofdm_symbol_size);
     blockoffsetF = slotoffsetF + fp->ofdm_symbol_size - db_halflength; 
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_DECOMPR_IF, 1 );  
-    if (ru->idx==0) LOG_D(PHY,"UL_IF4p5: CC_id %d : frame %d, subframe %d, symbol %d\n",ru->idx,*frame,*subframe,*symbol_number);
     for (element_id=0; element_id<db_halflength; element_id++) {
       i = (uint16_t*) &rxdataF[0][blockoffsetF+element_id];
       *i = alaw2lin_if4p5[ (data_block[element_id] & 0xff) ]; 
@@ -353,8 +379,8 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
              PRACH_BLOCK_SIZE_BYTES);
     }
 
-    //LOG_D(PHY,"PRACH_IF4p5: CC_id %d : frame %d, subframe %d => %d dB\n",ru->idx,*frame,*subframe,
-	//  dB_fixed(signal_energy((int*)&prach_rxsigF[0][0],839)));
+    LOG_D(PHY,"PRACH_IF4p5: CC_id %d : frame %d, subframe %d => %d dB\n",ru->idx,*frame,*subframe,
+	  dB_fixed(signal_energy((int*)&prach_rxsigF[0][0],839)));
     for (idx=0;idx<ru->num_eNB;idx++) ru->wakeup_prach_eNB(ru->eNB_list[idx],ru,*frame,*subframe);
 
   } else if (*packet_type == IF4p5_PULTICK) {

openair1/PHY/LTE_TRANSPORT/if4_tools.h

@@ -39,11 +39,11 @@
 #define IF4p5_PULFFT 0x0019 
 #define IF4p5_PDLFFT 0x0020
 #define IF4p5_PRACH 0x0021
-#define IF4p5_PRACH_BR_CE0 0x0021
-#define IF4p5_PRACH_BR_CE1 0x0022
-#define IF4p5_PRACH_BR_CE2 0x0023
-#define IF4p5_PRACH_BR_CE3 0x0024
-#define IF4p5_PULTICK 0x0025
+#define IF4p5_PRACH_BR_CE0 0x0022
+#define IF4p5_PRACH_BR_CE1 0x0023
+#define IF4p5_PRACH_BR_CE2 0x0024
+#define IF4p5_PRACH_BR_CE3 0x0025
+#define IF4p5_PULTICK 0x0026
 
 struct IF4p5_header {  
   /// Type

openair1/PHY/defs.h

@@ -756,6 +756,10 @@ typedef struct RU_t_s{
   time_stats_t rx_fhaul;
   /// Timing statistics (TX Fronthaul + Compression)
   time_stats_t tx_fhaul; 
+  /// Timong statistics (Compression)
+  time_stats_t compression;
+  /// Timing statistics (Fronthaul transport)
+  time_stats_t transport;
   /// RX and TX buffers for precoder output
   RU_COMMON            common;
   /// beamforming weight vectors per eNB

openair2/LAYER2/MAC/extern.h

@@ -102,5 +102,3 @@ extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2;
 extern DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E;
 
 #endif				//DEF_H
-
-

openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.c

@@ -44,8 +44,11 @@ int queue_initialized = 0;
 //uint32_t period = 10;
 //uint32_t sched [] = {1, 2, 3};
 
-void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
-				     int *mbsfn_flag, Protocol__FlexranMessage **dl_info) {
+void
+flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame,
+				uint32_t subframe, int *mbsfn_flag,
+				Protocol__FlexranMessage ** dl_info)
+{
 
 
     //if ((subframe == skip_subframe) && (frame % period == 0)) {
@@ -72,29 +75,36 @@ void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subf
     dl_mac_config_element_t *dl_config_elem;
 
     int diff;
-  LOG_D(MAC, "[TEST] Current frame and subframe %d, %d\n", frame, subframe);
+    LOG_D(MAC, "[TEST] Current frame and subframe %d, %d\n", frame,
+	  subframe);
     // First we check to see if we have a scheduling decision for this sfn_sf already in our queue
-  while(queue_head.tqh_first != NULL) {
+    while (queue_head.tqh_first != NULL) {
 	dl_config_elem = queue_head.tqh_first;
 
-    diff = get_sf_difference(mod_id, dl_config_elem->dl_info->dl_mac_config_msg->sfn_sf);
+	diff =
+	    get_sf_difference(mod_id,
+			      dl_config_elem->dl_info->
+			      dl_mac_config_msg->sfn_sf);
 	// Check if this decision is for now, for a later or a previous subframe
-    if ( diff == 0) { // Now
-      LOG_D(MAC, "Found a decision for this subframe in the queue. Let's use it!\n");
+	if (diff == 0) {	// Now
+	    LOG_D(MAC,
+		  "Found a decision for this subframe in the queue. Let's use it!\n");
 	    TAILQ_REMOVE(&queue_head, queue_head.tqh_first, configs);
 	    *dl_info = dl_config_elem->dl_info;
 	    free(dl_config_elem);
 	    eNB->eNB_stats[mod_id].sched_decisions++;
 	    return;
 	} else if (diff < 0) {	//previous subframe , delete message and free memory
-      LOG_D(MAC, "Found a decision for a previous subframe in the queue. Let's get rid of it\n");
+	    LOG_D(MAC,
+		  "Found a decision for a previous subframe in the queue. Let's get rid of it\n");
 	    TAILQ_REMOVE(&queue_head, queue_head.tqh_first, configs);
 	    flexran_agent_mac_destroy_dl_config(dl_config_elem->dl_info);
 	    free(dl_config_elem);
 	    eNB->eNB_stats[mod_id].sched_decisions++;
 	    eNB->eNB_stats[mod_id].missed_deadlines++;
 	} else {		// next subframe, nothing to do now
-      LOG_D(MAC, "Found a decision for a future subframe in the queue. Nothing to do now\n");
+	    LOG_D(MAC,
+		  "Found a decision for a future subframe in the queue. Nothing to do now\n");
 	    flexran_agent_mac_create_empty_dl_config(mod_id, dl_info);
 	    return;
 	}
@@ -104,21 +114,27 @@ void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subf
     flexran_agent_get_pending_dl_mac_config(mod_id, dl_info);
     while (*dl_info != NULL) {
 
-    diff = get_sf_difference(mod_id, (*dl_info)->dl_mac_config_msg->sfn_sf);
+	diff =
+	    get_sf_difference(mod_id,
+			      (*dl_info)->dl_mac_config_msg->sfn_sf);
 	if (diff == 0) {	// Got a command for this sfn_sf
-      LOG_D(MAC, "Found a decision for this subframe pending. Let's use it\n");
+	    LOG_D(MAC,
+		  "Found a decision for this subframe pending. Let's use it\n");
 	    eNB->eNB_stats[mod_id].sched_decisions++;
 	    return;
 	} else if (diff < 0) {
-      LOG_D(MAC, "Found a decision for a previous subframe. Let's get rid of it\n");
+	    LOG_D(MAC,
+		  "Found a decision for a previous subframe. Let's get rid of it\n");
 	    flexran_agent_mac_destroy_dl_config(*dl_info);
 	    *dl_info = NULL;
 	    flexran_agent_get_pending_dl_mac_config(mod_id, dl_info);
 	    eNB->eNB_stats[mod_id].sched_decisions++;
 	    eNB->eNB_stats[mod_id].missed_deadlines++;
 	} else {		// Intended for future subframe. Store it in local cache
-      LOG_D(MAC, "Found a decision for a future subframe in the queue. Let's store it in the cache\n");
-      dl_mac_config_element_t *e = malloc(sizeof(dl_mac_config_element_t));
+	    LOG_D(MAC,
+		  "Found a decision for a future subframe in the queue. Let's store it in the cache\n");
+	    dl_mac_config_element_t *e =
+		malloc(sizeof(dl_mac_config_element_t));
 	    e->dl_info = *dl_info;
 	    TAILQ_INSERT_TAIL(&queue_head, e, configs);
 	    flexran_agent_mac_create_empty_dl_config(mod_id, dl_info);
@@ -131,7 +147,8 @@ void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subf
     flexran_agent_mac_create_empty_dl_config(mod_id, dl_info);
 }
 
-int get_sf_difference(mid_t mod_id, uint32_t sfn_sf) {
+int get_sf_difference(mid_t mod_id, uint32_t sfn_sf)
+{
     int diff_in_subframes;
 
     uint16_t current_frame = flexran_get_current_system_frame_num(mod_id);
@@ -142,18 +159,21 @@ int get_sf_difference(mid_t mod_id, uint32_t sfn_sf) {
 	return 0;
     }
 
-  uint16_t frame_mask = ((1<<12) - 1);
+    uint16_t frame_mask = ((1 << 12) - 1);
     uint16_t frame = (sfn_sf & (frame_mask << 4)) >> 4;
 
-  uint16_t sf_mask = ((1<<4) - 1);
+    uint16_t sf_mask = ((1 << 4) - 1);
     uint16_t subframe = (sfn_sf & sf_mask);
 
- LOG_D(MAC, "[TEST] Target frame and subframe %d, %d\n", frame, subframe);
+    LOG_D(MAC, "[TEST] Target frame and subframe %d, %d\n", frame,
+	  subframe);
 
     if (frame == current_frame) {
 	return subframe - current_subframe;
     } else if (frame > current_frame) {
-    diff_in_subframes = ((frame*10)+subframe) - ((current_frame*10)+current_subframe);
+	diff_in_subframes =
+	    ((frame * 10) + subframe) - ((current_frame * 10) +
+					 current_subframe);
 
 	//    diff_in_subframes = 9 - current_subframe;
 	//diff_in_subframes += (subframe + 1);
@@ -170,7 +190,9 @@ int get_sf_difference(mid_t mod_id, uint32_t sfn_sf) {
 	//  diff_in_subframes += (frame - 1) * 10;
 	//}
 	//diff_in_subframes += (1023 - current_frame) * 10;
-    diff_in_subframes = 10240 - ((current_frame*10)+current_subframe) + ((frame*10)+subframe);
+	diff_in_subframes =
+	    10240 - ((current_frame * 10) + current_subframe) +
+	    ((frame * 10) + subframe);
 	if (diff_in_subframes > SCHED_AHEAD_SUBFRAMES) {
 	    return -1;
 	} else {

openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.h

@@ -55,8 +55,9 @@ TAILQ_HEAD(DlMacConfigHead, dl_mac_config_element_s);
 /*
  * Default scheduler used by the eNB agent
  */
-void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
-			     int *mbsfn_flag, Protocol__FlexranMessage **dl_info);
+void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame,
+				     uint32_t subframe, int *mbsfn_flag,
+				     Protocol__FlexranMessage ** dl_info);
 
 
 // Find the difference in subframes from the given subframe

targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c

@@ -235,7 +235,8 @@ int trx_eth_write_udp_IF4p5(openair0_device *device, openair0_timestamp timestam
     packet_size = UDP_IF4p5_PULFFT_SIZE_BYTES(nblocks); 
   } else if (flags == IF4p5_PULTICK) {
     packet_size = UDP_IF4p5_PULTICK_SIZE_BYTES; 
-  } else if (flags == IF4p5_PRACH) {  
+  } else if ((flags >= IF4p5_PRACH)&&
+             (flags <= (IF4p5_PRACH+4))) {  
     packet_size = UDP_IF4p5_PRACH_SIZE_BYTES;   
   } else {
     printf("trx_eth_write_udp_IF4p5: unknown flags %d\n",flags);