Commit bfd042ba authored by gauthier's avatar gauthier

Removed logs for better RT behaviour

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6141 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 3ff3abca
...@@ -472,31 +472,38 @@ boolean_t pdcp_data_ind( ...@@ -472,31 +472,38 @@ boolean_t pdcp_data_ind(
rb_id = rb_idP % maxDRB; rb_id = rb_idP % maxDRB;
AssertError (rb_id < maxDRB, return FALSE, "RB id is too high (%u/%d) %u %u!\n", rb_id, maxDRB, ue_mod_idP, enb_mod_idP); AssertError (rb_id < maxDRB, return FALSE, "RB id is too high (%u/%d) %u %u!\n", rb_id, maxDRB, ue_mod_idP, enb_mod_idP);
AssertError (rb_id > 0, return FALSE, "RB id is too low (%u/%d) %u %u!\n", rb_id, maxDRB, ue_mod_idP, enb_mod_idP); AssertError (rb_id > 0, return FALSE, "RB id is too low (%u/%d) %u %u!\n", rb_id, maxDRB, ue_mod_idP, enb_mod_idP);
if (enb_flagP == ENB_FLAG_NO) { if (enb_flagP == ENB_FLAG_NO) {
if (srb_flagP) { if (srb_flagP) {
pdcp_p = &pdcp_array_srb_ue[ue_mod_idP][rb_id-1]; pdcp_p = &pdcp_array_srb_ue[ue_mod_idP][rb_id-1];
#if 0
LOG_D(PDCP, "Data indication notification for PDCP entity from eNB %u to UE %u " LOG_D(PDCP, "Data indication notification for PDCP entity from eNB %u to UE %u "
"and signalling radio bearer ID %d rlc sdu size %d enb_flagP %d\n", "and signalling radio bearer ID %d rlc sdu size %d enb_flagP %d\n",
enb_mod_idP, ue_mod_idP, rb_id, sdu_buffer_sizeP, enb_flagP); enb_mod_idP, ue_mod_idP, rb_id, sdu_buffer_sizeP, enb_flagP);
#endif
} else { } else {
pdcp_p = &pdcp_array_drb_ue[ue_mod_idP][rb_id-1]; pdcp_p = &pdcp_array_drb_ue[ue_mod_idP][rb_id-1];
#if 0
LOG_D(PDCP, "Data indication notification for PDCP entity from eNB %u to UE %u " LOG_D(PDCP, "Data indication notification for PDCP entity from eNB %u to UE %u "
"and data radio bearer ID %d rlc sdu size %d enb_flagP %d\n", "and data radio bearer ID %d rlc sdu size %d enb_flagP %d\n",
enb_mod_idP, ue_mod_idP, rb_id, sdu_buffer_sizeP, enb_flagP); enb_mod_idP, ue_mod_idP, rb_id, sdu_buffer_sizeP, enb_flagP);
#endif
} }
} else { } else {
if (srb_flagP) { if (srb_flagP) {
pdcp_p = &pdcp_array_srb_eNB[enb_mod_idP][ue_mod_idP][rb_id-1]; pdcp_p = &pdcp_array_srb_eNB[enb_mod_idP][ue_mod_idP][rb_id-1];
#if 0
LOG_D(PDCP, "Data indication notification for PDCP entity from UE %u to eNB %u " LOG_D(PDCP, "Data indication notification for PDCP entity from UE %u to eNB %u "
"and signalling radio bearer ID %d rlc sdu size %d enb_flagP %d eNB_id %d\n", "and signalling radio bearer ID %d rlc sdu size %d enb_flagP %d eNB_id %d\n",
ue_mod_idP, enb_mod_idP , rb_id, sdu_buffer_sizeP, enb_flagP, enb_mod_idP); ue_mod_idP, enb_mod_idP , rb_id, sdu_buffer_sizeP, enb_flagP, enb_mod_idP);
#endif
} else { } else {
pdcp_p = &pdcp_array_drb_eNB[enb_mod_idP][ue_mod_idP][rb_id-1]; pdcp_p = &pdcp_array_drb_eNB[enb_mod_idP][ue_mod_idP][rb_id-1];
#if 0
LOG_D(PDCP, "Data indication notification for PDCP entity from UE %u to eNB %u " LOG_D(PDCP, "Data indication notification for PDCP entity from UE %u to eNB %u "
"and data radio bearer ID %d rlc sdu size %d enb_flagP %d eNB_id %d\n", "and data radio bearer ID %d rlc sdu size %d enb_flagP %d eNB_id %d\n",
ue_mod_idP, enb_mod_idP , rb_id, sdu_buffer_sizeP, enb_flagP, enb_mod_idP); ue_mod_idP, enb_mod_idP , rb_id, sdu_buffer_sizeP, enb_flagP, enb_mod_idP);
#endif
} }
} }
...@@ -554,7 +561,9 @@ boolean_t pdcp_data_ind( ...@@ -554,7 +561,9 @@ boolean_t pdcp_data_ind(
} }
if (pdcp_is_rx_seq_number_valid(sequence_number, pdcp_p, srb_flagP) == TRUE) { if (pdcp_is_rx_seq_number_valid(sequence_number, pdcp_p, srb_flagP) == TRUE) {
#if 0
LOG_T(PDCP, "Incoming PDU has a sequence number (%d) in accordance with RX window\n", sequence_number); LOG_T(PDCP, "Incoming PDU has a sequence number (%d) in accordance with RX window\n", sequence_number);
#endif
/* if (dc == PDCP_DATA_PDU ) /* if (dc == PDCP_DATA_PDU )
LOG_D(PDCP, "Passing piggybacked SDU to NAS driver...\n"); LOG_D(PDCP, "Passing piggybacked SDU to NAS driver...\n");
else else
...@@ -570,7 +579,7 @@ boolean_t pdcp_data_ind( ...@@ -570,7 +579,7 @@ boolean_t pdcp_data_ind(
free_mem_block(sdu_buffer); free_mem_block(sdu_buffer);
return FALSE; return FALSE;
#else #else
LOG_W(PDCP, "Delivering out-of-order SDU to upper layer...\n"); //LOG_W(PDCP, "Delivering out-of-order SDU to upper layer...\n");
#endif #endif
} }
// SRB1/2: control-plane data // SRB1/2: control-plane data
...@@ -711,13 +720,6 @@ boolean_t pdcp_data_ind( ...@@ -711,13 +720,6 @@ boolean_t pdcp_data_ind(
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).ue_index = ue_mod_idP; GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).ue_index = ue_mod_idP;
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rab_id = rb_id + 4; GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rab_id = rb_id + 4;
itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p); itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p);
/*gtpv1u_new_data_req(
enb_mod_idP, //gtpv1u_data_t *gtpv1u_data_p,
ue_mod_idP,//rb_id/maxDRB, TO DO UE ID
rb_id + 4,
&sdu_buffer_pP->data[payload_offset],
sdu_buffer_sizeP - payload_offset);
*/
packet_forwarded = TRUE; packet_forwarded = TRUE;
} }
#else #else
......
...@@ -151,8 +151,9 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_ ...@@ -151,8 +151,9 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_
uint16_t reordering_window = 0; uint16_t reordering_window = 0;
#if 0
LOG_D(PDCP, "Incoming RX Sequence number is %04d\n", seq_num); LOG_D(PDCP, "Incoming RX Sequence number is %04d\n", seq_num);
#endif
if (pdcp_is_seq_num_size_valid(pdcp_entity) == FALSE || pdcp_is_seq_num_valid(seq_num, pdcp_entity->seq_num_size) == FALSE) if (pdcp_is_seq_num_size_valid(pdcp_entity) == FALSE || pdcp_is_seq_num_valid(seq_num, pdcp_entity->seq_num_size) == FALSE)
return FALSE; return FALSE;
...@@ -161,7 +162,9 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_ ...@@ -161,7 +162,9 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_
* (and to build PDCP Control PDU for PDCP status report) * (and to build PDCP Control PDU for PDCP status report)
*/ */
if (pdcp_mark_current_pdu_as_received(seq_num, pdcp_entity) == TRUE) { if (pdcp_mark_current_pdu_as_received(seq_num, pdcp_entity) == TRUE) {
#if 0
LOG_I(PDCP, "Received sequence number successfuly marked\n"); LOG_I(PDCP, "Received sequence number successfuly marked\n");
#endif
} else { } else {
LOG_W(PDCP, "Cannot mark received sequence number on the bitmap!\n"); LOG_W(PDCP, "Cannot mark received sequence number on the bitmap!\n");
} }
...@@ -186,8 +189,10 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_ ...@@ -186,8 +189,10 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_
// same the old next_pdcp_rx_sn to revert otherwise // same the old next_pdcp_rx_sn to revert otherwise
pdcp_entity->next_pdcp_rx_sn_before_integrity = pdcp_entity->next_pdcp_rx_sn; pdcp_entity->next_pdcp_rx_sn_before_integrity = pdcp_entity->next_pdcp_rx_sn;
#if 0
if (seq_num != pdcp_entity->next_pdcp_rx_sn) if (seq_num != pdcp_entity->next_pdcp_rx_sn)
LOG_D(PDCP,"Re-adjusting the sequence number to %d\n", seq_num); LOG_D(PDCP,"Re-adjusting the sequence number to %d\n", seq_num);
#endif
//set Next_PDCP_RX_SN to the received PDCP SN +1 ; //set Next_PDCP_RX_SN to the received PDCP SN +1 ;
pdcp_entity->next_pdcp_rx_sn = seq_num; pdcp_entity->next_pdcp_rx_sn = seq_num;
pdcp_advance_rx_window(pdcp_entity); // + 1, and check if it is larger than Maximum_PDCP_SN: pdcp_advance_rx_window(pdcp_entity); // + 1, and check if it is larger than Maximum_PDCP_SN:
...@@ -238,7 +243,9 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_ ...@@ -238,7 +243,9 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_
//set Next_PDCP_RX_SN to the received PDCP SN +1 ; //set Next_PDCP_RX_SN to the received PDCP SN +1 ;
pdcp_entity->next_pdcp_rx_sn = seq_num; pdcp_entity->next_pdcp_rx_sn = seq_num;
pdcp_advance_rx_window(pdcp_entity); // + 1, anc check if it is larger than Maximum_PDCP_SN: pdcp_advance_rx_window(pdcp_entity); // + 1, anc check if it is larger than Maximum_PDCP_SN:
#if 0
LOG_D(PDCP,"Re-adjusting the sequence number to %d\n", seq_num); LOG_D(PDCP,"Re-adjusting the sequence number to %d\n", seq_num);
#endif
} else if (seq_num < pdcp_entity->next_pdcp_rx_sn){ } else if (seq_num < pdcp_entity->next_pdcp_rx_sn){
// use COUNT based on RX_HFN and the received PDCP SN for deciphering the PDCP PDU; // use COUNT based on RX_HFN and the received PDCP SN for deciphering the PDCP PDU;
pdcp_entity->rx_hfn_offset = 0; pdcp_entity->rx_hfn_offset = 0;
...@@ -295,9 +302,12 @@ boolean_t pdcp_mark_current_pdu_as_received(uint16_t seq_num, pdcp_t* pdcp_entit ...@@ -295,9 +302,12 @@ boolean_t pdcp_mark_current_pdu_as_received(uint16_t seq_num, pdcp_t* pdcp_entit
/* /*
* Set relevant bit * Set relevant bit
*/ */
#if 0
LOG_D(PDCP, "Marking %d. bit of %d. octet of status bitmap\n", (seq_num % 8) + 1, octet_index); LOG_D(PDCP, "Marking %d. bit of %d. octet of status bitmap\n", (seq_num % 8) + 1, octet_index);
#endif
util_mark_nth_bit_of_octet(&pdcp_entity->missing_pdu_bitmap[octet_index], seq_num % 8); util_mark_nth_bit_of_octet(&pdcp_entity->missing_pdu_bitmap[octet_index], seq_num % 8);
#if 0
util_print_binary_representation((uint8_t*)"Current state of relevant octet: ", pdcp_entity->missing_pdu_bitmap[octet_index]); util_print_binary_representation((uint8_t*)"Current state of relevant octet: ", pdcp_entity->missing_pdu_bitmap[octet_index]);
#endif
return TRUE; return TRUE;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment