maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve log messages for debugging

Browse Source
This commit is contained in:
Robert Schmidt
2023-08-18 12:34:25 +02:00
parent 35b5782968
commit 31af346ebc
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1 -4
View File
@@ -1768,8 +1768,6 @@ static void nr_generate_Msg4(module_id_t module_idP,
return; return;
} }
LOG_I(NR_MAC,"Generate msg4, rnti: %04x\n", ra->rnti);
// HARQ management // HARQ management
if (current_harq_pid < 0) { if (current_harq_pid < 0) {
AssertFatal(sched_ctrl->available_dl_harq.head >= 0, AssertFatal(sched_ctrl->available_dl_harq.head >= 0,
@@ -1824,7 +1822,6 @@ static void nr_generate_Msg4(module_id_t module_idP,
((NR_MAC_SUBHEADER_LONG *)&buf[mac_pdu_length])->L = htons(mac_sdu_length); ((NR_MAC_SUBHEADER_LONG *)&buf[mac_pdu_length])->L = htons(mac_sdu_length);
ra->mac_pdu_length = mac_pdu_length + mac_sdu_length + sizeof(NR_MAC_SUBHEADER_LONG); ra->mac_pdu_length = mac_pdu_length + mac_sdu_length + sizeof(NR_MAC_SUBHEADER_LONG);
} }
LOG_I(NR_MAC,"Encoded RRCSetup Piggyback (%d + %d bytes), mac_pdu_length %d\n", mac_sdu_length, mac_subheader_len, ra->mac_pdu_length);
memcpy(&buf[mac_pdu_length + mac_subheader_len], buffer, mac_sdu_length); memcpy(&buf[mac_pdu_length + mac_subheader_len], buffer, mac_sdu_length);
} }
@@ -1867,7 +1864,7 @@ static void nr_generate_Msg4(module_id_t module_idP,
} }
ra->state = WAIT_Msg4_ACK; ra->state = WAIT_Msg4_ACK;
LOG_D(NR_MAC,"[gNB %d][RAPROC] Frame %d, Subframe %d: RA state %d\n", module_idP, frameP, slotP, ra->state); LOG_I(NR_MAC,"UE %04x Generate msg4: feedback at %4d.%2d, payload %d bytes, next state WAIT_Msg4_ACK\n", ra->rnti, pucch->frame, pucch->ul_slot, harq->tb_size);
} }
} }
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+5 -3
View File
@@ -894,7 +894,8 @@ static NR_UE_harq_t *find_harq(frame_t frame, sub_frame_t slot, NR_UE_info_t * U
while (harq->feedback_frame != frame while (harq->feedback_frame != frame
|| (harq->feedback_frame == frame && harq->feedback_slot < slot)) { || (harq->feedback_frame == frame && harq->feedback_slot < slot)) {
LOG_W(NR_MAC, LOG_W(NR_MAC,
"expected HARQ pid %d feedback at %4d.%2d, but is at %4d.%2d instead (HARQ feedback is in the past)\n", "UE %04x expected HARQ pid %d feedback at %4d.%2d, but is at %4d.%2d instead (HARQ feedback is in the past)\n",
UE->rnti,
pid, pid,
harq->feedback_frame, harq->feedback_frame,
harq->feedback_slot, harq->feedback_slot,
@@ -910,7 +911,8 @@ static NR_UE_harq_t *find_harq(frame_t frame, sub_frame_t slot, NR_UE_info_t * U
/* feedbacks that we wait for in the future: don't do anything */ /* feedbacks that we wait for in the future: don't do anything */
if (harq->feedback_slot > slot) { if (harq->feedback_slot > slot) {
LOG_W(NR_MAC, LOG_W(NR_MAC,
"expected HARQ pid %d feedback at %4d.%2d, but is at %4d.%2d instead (HARQ feedback is in the future)\n", "UE %04x expected HARQ pid %d feedback at %4d.%2d, but is at %4d.%2d instead (HARQ feedback is in the future)\n",
UE->rnti,
pid, pid,
harq->feedback_frame, harq->feedback_frame,
harq->feedback_slot, harq->feedback_slot,
@@ -943,7 +945,7 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
const uint8_t harq_confidence = uci_01->harq->harq_confidence_level; const uint8_t harq_confidence = uci_01->harq->harq_confidence_level;
NR_UE_harq_t *harq = find_harq(frame, slot, UE, nrmac->dl_bler.harq_round_max); NR_UE_harq_t *harq = find_harq(frame, slot, UE, nrmac->dl_bler.harq_round_max);
if (!harq) { if (!harq) {
LOG_E(NR_MAC, "Oh no! Could not find a harq in %s!\n", __FUNCTION__); LOG_E(NR_MAC, "UE %04x: Could not find a HARQ process at %4d.%2d!\n", UE->rnti, frame, slot);
break; break;
} }
DevAssert(harq->is_waiting); DevAssert(harq->is_waiting);