Commit 77f1b0ff authored by Cedric Roux's avatar Cedric Roux

fapi: change from LOG_I to LOG_D for less noisy logs

parent de1552a2
...@@ -1195,7 +1195,7 @@ printf("SCHEDULER called for f/sf %d/%d\n", frameP, subframeP); ...@@ -1195,7 +1195,7 @@ printf("SCHEDULER called for f/sf %d/%d\n", frameP, subframeP);
rlc.rnti = eNB->common_channels[CC_id].RA_template[i].rnti; rlc.rnti = eNB->common_channels[CC_id].RA_template[i].rnti;
rlc.logicalChannelIdentity = CCCH; rlc.logicalChannelIdentity = CCCH;
rlc.rlcTransmissionQueueSize = mac_rrc_get_ccch_size(module_idP, CC_id) + 1; rlc.rlcTransmissionQueueSize = mac_rrc_get_ccch_size(module_idP, CC_id) + 1;
LOG_I(MAC, "calling SchedDlRlcBufferReq on CCCH rnti %x queue_size %d\n", rlc.rnti, rlc.rlcTransmissionQueueSize); LOG_D(MAC, "calling SchedDlRlcBufferReq on CCCH rnti %x queue_size %d\n", rlc.rnti, rlc.rlcTransmissionQueueSize);
#if MEGALOG #if MEGALOG
printf("MAC to FAPI downlink BUF CCCH %d\n", rlc.rlcTransmissionQueueSize); printf("MAC to FAPI downlink BUF CCCH %d\n", rlc.rlcTransmissionQueueSize);
#endif #endif
...@@ -1223,7 +1223,7 @@ printf("MAC to FAPI downlink BUF CCCH %d\n", rlc.rlcTransmissionQueueSize); ...@@ -1223,7 +1223,7 @@ printf("MAC to FAPI downlink BUF CCCH %d\n", rlc.rlcTransmissionQueueSize);
rlc.logicalChannelIdentity = DCCH; rlc.logicalChannelIdentity = DCCH;
rlc.rlcTransmissionQueueSize = rlc_status.bytes_in_buffer; rlc.rlcTransmissionQueueSize = rlc_status.bytes_in_buffer;
if (rlc.rlcTransmissionQueueSize == 2) rlc.rlcTransmissionQueueSize = 10; if (rlc.rlcTransmissionQueueSize == 2) rlc.rlcTransmissionQueueSize = 10;
LOG_I(MAC, "calling SchedDlRlcBufferReq on DCCH rnti %x queue_size %d\n", rlc.rnti, rlc_status.bytes_in_buffer); LOG_D(MAC, "calling SchedDlRlcBufferReq on DCCH rnti %x queue_size %d\n", rlc.rnti, rlc_status.bytes_in_buffer);
SchedDlRlcBufferReq(fapi->sched, &rlc); SchedDlRlcBufferReq(fapi->sched, &rlc);
#if MEGALOG #if MEGALOG
printf("MAC to FAPI downlink BUF DCCH %d\n", rlc_status.bytes_in_buffer); printf("MAC to FAPI downlink BUF DCCH %d\n", rlc_status.bytes_in_buffer);
...@@ -1233,7 +1233,7 @@ printf("MAC to FAPI downlink BUF DCCH %d\n", rlc_status.bytes_in_buffer); ...@@ -1233,7 +1233,7 @@ printf("MAC to FAPI downlink BUF DCCH %d\n", rlc_status.bytes_in_buffer);
rlc_status = mac_rlc_status_ind(module_idP, rlc.rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH+1, 0); rlc_status = mac_rlc_status_ind(module_idP, rlc.rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH+1, 0);
rlc.logicalChannelIdentity = DCCH+1; rlc.logicalChannelIdentity = DCCH+1;
rlc.rlcTransmissionQueueSize = rlc_status.bytes_in_buffer; rlc.rlcTransmissionQueueSize = rlc_status.bytes_in_buffer;
LOG_I(MAC, "calling SchedDlRlcBufferReq on DCCH+1 rnti %x queue_size %d\n", rlc.rnti, rlc_status.bytes_in_buffer); LOG_D(MAC, "calling SchedDlRlcBufferReq on DCCH+1 rnti %x queue_size %d\n", rlc.rnti, rlc_status.bytes_in_buffer);
SchedDlRlcBufferReq(fapi->sched, &rlc); SchedDlRlcBufferReq(fapi->sched, &rlc);
#if MEGALOG #if MEGALOG
printf("MAC to FAPI downlink BUF DCCH+1 %d\n", rlc_status.bytes_in_buffer); printf("MAC to FAPI downlink BUF DCCH+1 %d\n", rlc_status.bytes_in_buffer);
...@@ -1243,7 +1243,7 @@ printf("MAC to FAPI downlink BUF DCCH+1 %d\n", rlc_status.bytes_in_buffer); ...@@ -1243,7 +1243,7 @@ printf("MAC to FAPI downlink BUF DCCH+1 %d\n", rlc_status.bytes_in_buffer);
rlc_status = mac_rlc_status_ind(module_idP, rlc.rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DTCH, 0); rlc_status = mac_rlc_status_ind(module_idP, rlc.rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DTCH, 0);
rlc.logicalChannelIdentity = DTCH; rlc.logicalChannelIdentity = DTCH;
rlc.rlcTransmissionQueueSize = rlc_status.bytes_in_buffer; rlc.rlcTransmissionQueueSize = rlc_status.bytes_in_buffer;
LOG_I(MAC, "calling SchedDlRlcBufferReq on DTCH rnti %x queue_size %d\n", rlc.rnti, rlc_status.bytes_in_buffer); LOG_D(MAC, "calling SchedDlRlcBufferReq on DTCH rnti %x queue_size %d\n", rlc.rnti, rlc_status.bytes_in_buffer);
SchedDlRlcBufferReq(fapi->sched, &rlc); SchedDlRlcBufferReq(fapi->sched, &rlc);
#if MEGALOG #if MEGALOG
printf("MAC to FAPI downlink BUF DTCH %d\n", rlc_status.bytes_in_buffer); printf("MAC to FAPI downlink BUF DTCH %d\n", rlc_status.bytes_in_buffer);
...@@ -1274,15 +1274,15 @@ printf("MAC to FAPI downlink ack/nack from PHY f/sf %d/%d rnti %x harq %d ack %d ...@@ -1274,15 +1274,15 @@ printf("MAC to FAPI downlink ack/nack from PHY f/sf %d/%d rnti %x harq %d ack %d
} }
fapi_dl_ack_nack_data.count = 0; fapi_dl_ack_nack_data.count = 0;
LOG_I(MAC, "calling SchedDlTriggerReq\n"); LOG_D(MAC, "calling SchedDlTriggerReq\n");
SchedDlTriggerReq(fapi->sched, &dlreq); SchedDlTriggerReq(fapi->sched, &dlreq);
LOG_I(MAC, "calling SchedDlConfigInd\n"); LOG_D(MAC, "calling SchedDlConfigInd\n");
SchedDlConfigInd(fapi, &dlind); SchedDlConfigInd(fapi, &dlind);
LOG_I(MAC, "SchedDlConfigInd returns dlind.nr_buildDataList %d f/sf %d/%d\n", dlind.nr_buildDataList, frameP, subframeP); LOG_D(MAC, "SchedDlConfigInd returns dlind.nr_buildDataList %d f/sf %d/%d\n", dlind.nr_buildDataList, frameP, subframeP);
LOG_I(MAC, "SchedDlConfigInd returns dlind.nr_buildRARList %d f/sf %d/%d\n", dlind.nr_buildRARList, frameP, subframeP); LOG_D(MAC, "SchedDlConfigInd returns dlind.nr_buildRARList %d f/sf %d/%d\n", dlind.nr_buildRARList, frameP, subframeP);
LOG_I(MAC, "SchedDlConfigInd returns dlind.nr_buildBroadcastList %d f/sf %d/%d\n", dlind.nr_buildBroadcastList, frameP, subframeP); LOG_D(MAC, "SchedDlConfigInd returns dlind.nr_buildBroadcastList %d f/sf %d/%d\n", dlind.nr_buildBroadcastList, frameP, subframeP);
/* TODO: rewrite. All should go into fapi_schedule_ue where special cases should be handled */ /* TODO: rewrite. All should go into fapi_schedule_ue where special cases should be handled */
for (i = 0; i < dlind.nr_buildDataList; i++) { for (i = 0; i < dlind.nr_buildDataList; i++) {
...@@ -1394,10 +1394,10 @@ printf("MAC to FAPI uplink ue %x f/sf %d/%d lcid %d size acked %d\n", fapi_ul_ac ...@@ -1394,10 +1394,10 @@ printf("MAC to FAPI uplink ue %x f/sf %d/%d lcid %d size acked %d\n", fapi_ul_ac
fapi_ul_ack_nack_data[ulsf].count = 0; fapi_ul_ack_nack_data[ulsf].count = 0;
} }
LOG_I(MAC, "calling SchedUlTriggerReq\n"); LOG_D(MAC, "calling SchedUlTriggerReq\n");
SchedUlTriggerReq(fapi->sched, &ulreq); SchedUlTriggerReq(fapi->sched, &ulreq);
LOG_I(MAC, "calling SchedUlConfigInd\n"); LOG_D(MAC, "calling SchedUlConfigInd\n");
SchedUlConfigInd(fapi, &ulind); SchedUlConfigInd(fapi, &ulind);
/* a hack to report nice CQI all the time it's asked */ /* a hack to report nice CQI all the time it's asked */
......
...@@ -1290,7 +1290,7 @@ void SR_indication(module_id_t mod_idP, int cc_idP, frame_t frameP, rnti_t rntiP ...@@ -1290,7 +1290,7 @@ void SR_indication(module_id_t mod_idP, int cc_idP, frame_t frameP, rnti_t rntiP
sr.rnti = rntiP; sr.rnti = rntiP;
LOG_I(MAC, "eNB %d/%d f/sf %d/%d calling SchedUlSrInfoReq for rnti %x\n", mod_idP, cc_idP, frameP, subframeP, rntiP); LOG_D(MAC, "eNB %d/%d f/sf %d/%d calling SchedUlSrInfoReq for rnti %x\n", mod_idP, cc_idP, frameP, subframeP, rntiP);
#if MEGALOG #if MEGALOG
printf("MAC to FAPI SR indication rnti %x f/sf %d/%d\n", rntiP, frameP, subframeP); printf("MAC to FAPI SR indication rnti %x f/sf %d/%d\n", rntiP, frameP, subframeP);
#endif #endif
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include "log.h" #include "log.h"
#include "assertions.h" #include "assertions.h"
#undef LOG_D //#undef LOG_D
#define LOG_D LOG_I //#define LOG_D LOG_I
#include <stdlib.h> #include <stdlib.h>
#include <pthread.h> #include <pthread.h>
......
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