Commit 337faca6 authored by Robert Schmidt's avatar Robert Schmidt

log changes

Remove useless message bytes printing

Print message if callback missing

less newlines in log

logs
parent 10e07bc6
...@@ -544,7 +544,6 @@ int param_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi ...@@ -544,7 +544,6 @@ int param_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi
nfapi_resp.num_tlv++; nfapi_resp.num_tlv++;
nfapi_pnf_param_resp(config, &nfapi_resp); nfapi_pnf_param_resp(config, &nfapi_resp);
printf("[PNF] Sent NFAPI_PARAM_RESPONSE phy_id:%d number_of_tlvs:%u\n", req->header.phy_id, nfapi_resp.num_tlv); printf("[PNF] Sent NFAPI_PARAM_RESPONSE phy_id:%d number_of_tlvs:%u\n", req->header.phy_id, nfapi_resp.num_tlv);
printf("[PNF] param request .. exit\n");
return 0; return 0;
} }
...@@ -763,7 +762,6 @@ int nr_param_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nf ...@@ -763,7 +762,6 @@ int nr_param_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nf
nfapi_nr_pnf_param_resp(config, &nfapi_resp); nfapi_nr_pnf_param_resp(config, &nfapi_resp);
printf("[PNF] Sent NFAPI_PNF_PARAM_RESPONSE phy_id:%d number_of_tlvs:%u\n", req->header.phy_id, nfapi_resp.num_tlv); printf("[PNF] Sent NFAPI_PNF_PARAM_RESPONSE phy_id:%d number_of_tlvs:%u\n", req->header.phy_id, nfapi_resp.num_tlv);
printf("[PNF] param request .. exit\n");
return 0; return 0;
} }
......
...@@ -1608,7 +1608,7 @@ void pnf_handle_dl_tti_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7) ...@@ -1608,7 +1608,7 @@ void pnf_handle_dl_tti_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7)
struct timespec t; struct timespec t;
clock_gettime(CLOCK_MONOTONIC, &t); clock_gettime(CLOCK_MONOTONIC, &t);
NFAPI_TRACE(NFAPI_TRACE_INFO,"%s() %ld.%09ld POPULATE DL_TTI_REQ current tx sfn/slot:%d.%d p7 msg sfn/slot: %d.%d buffer_index:%d\n", __FUNCTION__, t.tv_sec, t.tv_nsec, pnf_p7->sfn,pnf_p7->slot, req->SFN, req->Slot, buffer_index); NFAPI_TRACE(NFAPI_TRACE_DEBUG,"%s() %ld.%09ld POPULATE DL_TTI_REQ current tx sfn/slot:%d.%d p7 msg sfn/slot: %d.%d buffer_index:%d\n", __FUNCTION__, t.tv_sec, t.tv_nsec, pnf_p7->sfn,pnf_p7->slot, req->SFN, req->Slot, buffer_index);
// if there is already an dl_tti_req make sure we free it. // if there is already an dl_tti_req make sure we free it.
if(pnf_p7->slot_buffer[buffer_index].dl_tti_req != 0) if(pnf_p7->slot_buffer[buffer_index].dl_tti_req != 0)
...@@ -1774,7 +1774,7 @@ void pnf_handle_ul_tti_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7) ...@@ -1774,7 +1774,7 @@ void pnf_handle_ul_tti_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7)
struct timespec t; struct timespec t;
clock_gettime(CLOCK_MONOTONIC, &t); clock_gettime(CLOCK_MONOTONIC, &t);
NFAPI_TRACE(NFAPI_TRACE_INFO,"%s() %ld.%09ld POPULATE UL_TTI_REQ current tx sfn/slot:%d.%d p7 msg sfn/slot: %d.%d buffer_index:%d\n", __FUNCTION__, t.tv_sec, t.tv_nsec, pnf_p7->sfn,pnf_p7->slot, req->SFN, req->Slot, buffer_index); NFAPI_TRACE(NFAPI_TRACE_DEBUG,"%s() %ld.%09ld POPULATE UL_TTI_REQ current tx sfn/slot:%d.%d p7 msg sfn/slot: %d.%d buffer_index:%d\n", __FUNCTION__, t.tv_sec, t.tv_nsec, pnf_p7->sfn,pnf_p7->slot, req->SFN, req->Slot, buffer_index);
if(pnf_p7->slot_buffer[buffer_index].ul_tti_req != 0) if(pnf_p7->slot_buffer[buffer_index].ul_tti_req != 0)
{ {
......
...@@ -129,7 +129,9 @@ void vnf_nr_handle_pnf_param_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_ ...@@ -129,7 +129,9 @@ void vnf_nr_handle_pnf_param_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_
if(config->pnf_nr_param_resp) if(config->pnf_nr_param_resp)
{ {
(config->pnf_nr_param_resp)(config, p5_idx, &msg); (config->pnf_nr_param_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no pnf_nr_param_resp cb installed\n", __func__);
}
} }
else else
{ {
...@@ -162,7 +164,9 @@ void vnf_handle_pnf_param_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_con ...@@ -162,7 +164,9 @@ void vnf_handle_pnf_param_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_con
if(config->pnf_param_resp) if(config->pnf_param_resp)
{ {
(config->pnf_param_resp)(config, p5_idx, &msg); (config->pnf_param_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no pnf_params_resp cb installed\n", __func__);
}
} }
else else
{ {
...@@ -196,7 +200,9 @@ void vnf_nr_handle_pnf_config_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf ...@@ -196,7 +200,9 @@ void vnf_nr_handle_pnf_config_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf
if(config->pnf_nr_config_resp) if(config->pnf_nr_config_resp)
{ {
(config->pnf_nr_config_resp)(config, p5_idx, &msg); (config->pnf_nr_config_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no pnf_nr_config_resp cb installed\n", __func__);
}
} }
else else
{ {
...@@ -229,7 +235,9 @@ void vnf_handle_pnf_config_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_co ...@@ -229,7 +235,9 @@ void vnf_handle_pnf_config_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_co
if(config->pnf_config_resp) if(config->pnf_config_resp)
{ {
(config->pnf_config_resp)(config, p5_idx, &msg); (config->pnf_config_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no pnf_config_resp cb installed\n", __func__);
}
} }
else else
{ {
...@@ -261,7 +269,9 @@ void vnf_nr_handle_pnf_start_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_ ...@@ -261,7 +269,9 @@ void vnf_nr_handle_pnf_start_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_
if(config->pnf_nr_start_resp) if(config->pnf_nr_start_resp)
{ {
(config->pnf_nr_start_resp)(config, p5_idx, &msg); (config->pnf_nr_start_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no pnf_nr_start_resp cb installed\n", __func__);
}
} }
else else
{ {
...@@ -293,7 +303,9 @@ void vnf_handle_pnf_start_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_con ...@@ -293,7 +303,9 @@ void vnf_handle_pnf_start_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_con
if(config->pnf_start_resp) if(config->pnf_start_resp)
{ {
(config->pnf_start_resp)(config, p5_idx, &msg); (config->pnf_start_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no pnf_start_resp cb installed\n", __func__);
}
} }
else else
{ {
...@@ -325,7 +337,9 @@ void vnf_handle_pnf_stop_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_conf ...@@ -325,7 +337,9 @@ void vnf_handle_pnf_stop_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_conf
if(config->pnf_stop_resp) if(config->pnf_stop_resp)
{ {
(config->pnf_stop_resp)(config, p5_idx, &msg); (config->pnf_stop_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no pnf_stop_resp cb installed\n", __func__);
}
} }
else else
{ {
...@@ -565,7 +579,9 @@ void vnf_handle_start_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_config_ ...@@ -565,7 +579,9 @@ void vnf_handle_start_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_config_
if(config->start_resp) if(config->start_resp)
{ {
(config->start_resp)(config, p5_idx, &msg); (config->start_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no start_resp cb installed\n", __func__);
}
} }
else else
{ {
...@@ -598,7 +614,9 @@ void vnf_nr_handle_start_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_conf ...@@ -598,7 +614,9 @@ void vnf_nr_handle_start_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_conf
if(config->nr_start_resp) if(config->nr_start_resp)
{ {
(config->nr_start_resp)(config, p5_idx, &msg); (config->nr_start_resp)(config, p5_idx, &msg);
} } else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): no nr_start_resp cb installed\n", __func__);
}
} }
} }
else else
......
...@@ -2096,7 +2096,7 @@ void vnf_nr_handle_timing_info(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7) ...@@ -2096,7 +2096,7 @@ void vnf_nr_handle_timing_info(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
//printf("VNF-PNF delta - %d", vnf_pnf_sfnslot_delta); //printf("VNF-PNF delta - %d", vnf_pnf_sfnslot_delta);
if (vnf_pnf_sfnslot_delta != 0) if (vnf_pnf_sfnslot_delta != 0)
{ {
NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() LARGE SFN/SLOT DELTA between PNF and VNF. Delta %d. PNF:%d.%d VNF:%d.%d\n\n\n\n\n\n\n\n\n", NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() LARGE SFN/SLOT DELTA between PNF and VNF. Delta %d. PNF:%d.%d VNF:%d.%d\n",
__FUNCTION__, vnf_pnf_sfnslot_delta, __FUNCTION__, vnf_pnf_sfnslot_delta,
ind.last_sfn, ind.last_slot, ind.last_sfn, ind.last_slot,
vnf_p7->p7_connections[0].sfn, vnf_p7->p7_connections[0].slot); vnf_p7->p7_connections[0].sfn, vnf_p7->p7_connections[0].slot);
......
...@@ -731,7 +731,8 @@ void schedule_nr_sib1(module_id_t module_idP, ...@@ -731,7 +731,8 @@ void schedule_nr_sib1(module_id_t module_idP,
nfapi_nr_dl_tti_request_body_t *dl_req = &DL_req->dl_tti_request_body; nfapi_nr_dl_tti_request_body_t *dl_req = &DL_req->dl_tti_request_body;
int pdu_index = gNB_mac->pdu_index[0]++; int pdu_index = gNB_mac->pdu_index[0]++;
nr_fill_nfapi_dl_SIB_pdu(module_idP, LOG_D(NR_MAC, "%s() %4d.%2d\n", __func__, frameP, slotP);
nr_fill_nfapi_dl_SIB_pdu(module_idP,
NULL, NULL,
gNB_mac->sched_ctrlCommon, gNB_mac->sched_ctrlCommon,
dl_req, dl_req,
......
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