Commit 941db969 authored by chenyi's avatar chenyi

Remove measurement log

parent 49ee5d31
...@@ -139,9 +139,7 @@ static void tx_func(void *param) ...@@ -139,9 +139,7 @@ static void tx_func(void *param)
} }
start_meas(&gNB->slot_indication_stats); start_meas(&gNB->slot_indication_stats);
LOG_I(NFAPI_PNF,"[x1] Call NR_slot_indication\n");
ifi->NR_slot_indication(module_id, CC_id, frame_tx, slot_tx); ifi->NR_slot_indication(module_id, CC_id, frame_tx, slot_tx);
LOG_I(NFAPI_PNF,"[x2] Finish NR_slot_indication\n");
stop_meas(&gNB->slot_indication_stats); stop_meas(&gNB->slot_indication_stats);
gNB->msgDataTx->timestamp_tx = info->timestamp_tx; gNB->msgDataTx->timestamp_tx = info->timestamp_tx;
info = gNB->msgDataTx; info = gNB->msgDataTx;
......
...@@ -2116,7 +2116,6 @@ void handle_nr_slot_ind(uint16_t sfn, uint16_t slot) ...@@ -2116,7 +2116,6 @@ void handle_nr_slot_ind(uint16_t sfn, uint16_t slot)
//send VNF slot indication, which is aligned with TX thread, so that it can call the scheduler //send VNF slot indication, which is aligned with TX thread, so that it can call the scheduler
//we give four additional slots (2ms) which should be enough time for the VNF to //we give four additional slots (2ms) which should be enough time for the VNF to
//answer //answer
LOG_I(NFAPI_PNF,"[x1-1] Call oai_nfapi_nr_slot_indication\n");
uint8_t slot_ahead = 2; uint8_t slot_ahead = 2;
uint32_t sfn_slot_tx = sfnslot_add_slot(sfn, slot, slot_ahead); uint32_t sfn_slot_tx = sfnslot_add_slot(sfn, slot, slot_ahead);
uint16_t sfn_tx = NFAPI_SFNSLOT2SFN(sfn_slot_tx); uint16_t sfn_tx = NFAPI_SFNSLOT2SFN(sfn_slot_tx);
...@@ -2124,10 +2123,8 @@ void handle_nr_slot_ind(uint16_t sfn, uint16_t slot) ...@@ -2124,10 +2123,8 @@ void handle_nr_slot_ind(uint16_t sfn, uint16_t slot)
nfapi_nr_slot_indication_scf_t ind = { .sfn = sfn_tx, .slot = slot_tx }; nfapi_nr_slot_indication_scf_t ind = { .sfn = sfn_tx, .slot = slot_tx };
oai_nfapi_nr_slot_indication(&ind); oai_nfapi_nr_slot_indication(&ind);
LOG_I(NFAPI_PNF,"[x1-2] Finish oai_nfapi_nr_slot_indication\n");
//copy data from appropriate p7 slot buffers into channel structures for PHY processing //copy data from appropriate p7 slot buffers into channel structures for PHY processing
nfapi_pnf_p7_slot_ind(p7_config_g, p7_config_g->phy_id, sfn, slot); nfapi_pnf_p7_slot_ind(p7_config_g, p7_config_g->phy_id, sfn, slot);
LOG_I(NFAPI_PNF,"[x1-3] Finish nfapi_pnf_p7_slot_ind\n");
return; return;
} }
......
...@@ -1941,7 +1941,6 @@ void pnf_handle_tx_data_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7 ...@@ -1941,7 +1941,6 @@ void pnf_handle_tx_data_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
pnf_p7->slot_buffer[buffer_index].sfn = req.SFN; pnf_p7->slot_buffer[buffer_index].sfn = req.SFN;
pnf_p7->slot_buffer[buffer_index].slot = req.Slot; pnf_p7->slot_buffer[buffer_index].slot = req.Slot;
cp_nr_tx_data_req(&pnf_p7->slot_buffer[buffer_index].tx_data_req, &req); cp_nr_tx_data_req(&pnf_p7->slot_buffer[buffer_index].tx_data_req, &req);
LOG_I(NFAPI_PNF,"[t5] Fill tx_data in buf[%d] , %d/%d\n",buffer_index,req.SFN,req.Slot);
pnf_p7->stats.tx_data_ontime++; pnf_p7->stats.tx_data_ontime++;
} }
...@@ -2488,7 +2487,6 @@ void pnf_nr_dispatch_p7_message(void *pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7 ...@@ -2488,7 +2487,6 @@ void pnf_nr_dispatch_p7_message(void *pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
pnf_handle_ul_dci_request(pRecvMsg, recvMsgLen, pnf_p7); pnf_handle_ul_dci_request(pRecvMsg, recvMsgLen, pnf_p7);
break; break;
case NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST: case NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST:
LOG_I(NFAPI_PNF,"[t4] pnf_nr_dispatch_p7_message , %d/%d\n",pnf_p7->sfn,pnf_p7->slot);
pnf_handle_tx_data_request(pRecvMsg, recvMsgLen, pnf_p7); pnf_handle_tx_data_request(pRecvMsg, recvMsgLen, pnf_p7);
break; break;
default: default:
...@@ -3181,7 +3179,6 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7) ...@@ -3181,7 +3179,6 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7)
if(FD_ISSET(pnf_p7->p7_sock, &rfds)) if(FD_ISSET(pnf_p7->p7_sock, &rfds))
{ {
LOG_I(NFAPI_PNF,"[t3] socket receive\n");
pnf_nr_nfapi_p7_read_dispatch_message(pnf_p7, now_hr_time); pnf_nr_nfapi_p7_read_dispatch_message(pnf_p7, now_hr_time);
} }
} }
......
...@@ -461,7 +461,6 @@ int send_mac_subframe_indications(vnf_p7_t* vnf_p7) ...@@ -461,7 +461,6 @@ int send_mac_subframe_indications(vnf_p7_t* vnf_p7)
int vnf_send_p7_msg(vnf_p7_t* vnf_p7, nfapi_vnf_p7_connection_info_t* p7_info, uint8_t* msg, const uint32_t len) int vnf_send_p7_msg(vnf_p7_t* vnf_p7, nfapi_vnf_p7_connection_info_t* p7_info, uint8_t* msg, const uint32_t len)
{ {
LOG_I(NFAPI_VNF,"[t2] socket sent\n");
int sendto_result = sendto(vnf_p7->socket, msg, len, 0, (struct sockaddr*)&(p7_info->remote_addr), sizeof(p7_info->remote_addr)); int sendto_result = sendto(vnf_p7->socket, msg, len, 0, (struct sockaddr*)&(p7_info->remote_addr), sizeof(p7_info->remote_addr));
//printf("P7 msg sent \n"); //printf("P7 msg sent \n");
if(sendto_result != len) if(sendto_result != len)
......
...@@ -1450,7 +1450,6 @@ static void nr_generate_Msg2(module_id_t module_idP, ...@@ -1450,7 +1450,6 @@ static void nr_generate_Msg2(module_id_t module_idP,
TX_req->SFN = frameP; TX_req->SFN = frameP;
TX_req->Number_of_PDUs++; TX_req->Number_of_PDUs++;
TX_req->Slot = slotP; TX_req->Slot = slotP;
LOG_I(NFAPI_VNF,"[t1] scheduler_RA fill TX_D , %d/%d \n",frameP,slotP);
// Mark the corresponding symbols RBs as used // Mark the corresponding symbols RBs as used
fill_pdcch_vrb_map(nr_mac, fill_pdcch_vrb_map(nr_mac,
CC_id, CC_id,
......
...@@ -621,7 +621,6 @@ void schedule_nr_sib1(module_id_t module_idP, ...@@ -621,7 +621,6 @@ void schedule_nr_sib1(module_id_t module_idP,
type0_PDCCH_CSS_config->active = false; type0_PDCCH_CSS_config->active = false;
LOG_I(NFAPI_VNF,"[t1] scheduler_bch fill TX_D , %d/%d \n",frameP,slotP);
T(T_GNB_MAC_DL_PDU_WITH_DATA, T(T_GNB_MAC_DL_PDU_WITH_DATA,
T_INT(module_idP), T_INT(module_idP),
T_INT(CC_id), T_INT(CC_id),
......
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