Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
canghaiwuhen
OpenXG-RAN
Commits
77f1b0ff
Commit
77f1b0ff
authored
Oct 03, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fapi: change from LOG_I to LOG_D for less noisy logs
parent
de1552a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+11
-11
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1
-1
openair2/LAYER2/MAC/ff-mac.c
openair2/LAYER2/MAC/ff-mac.c
+2
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
77f1b0ff
...
...
@@ -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
.
logicalChannelIdentity
=
CCCH
;
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
printf
(
"MAC to FAPI downlink BUF CCCH %d
\n
"
,
rlc
.
rlcTransmissionQueueSize
);
#endif
...
...
@@ -1223,7 +1223,7 @@ printf("MAC to FAPI downlink BUF CCCH %d\n", rlc.rlcTransmissionQueueSize);
rlc
.
logicalChannelIdentity
=
DCCH
;
rlc
.
rlcTransmissionQueueSize
=
rlc_status
.
bytes_in_buffer
;
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
);
#if MEGALOG
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
.
logicalChannelIdentity
=
DCCH
+
1
;
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
);
#if MEGALOG
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
.
logicalChannelIdentity
=
DTCH
;
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
);
#if MEGALOG
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
}
fapi_dl_ack_nack_data
.
count
=
0
;
LOG_
I
(
MAC
,
"calling SchedDlTriggerReq
\n
"
);
LOG_
D
(
MAC
,
"calling SchedDlTriggerReq
\n
"
);
SchedDlTriggerReq
(
fapi
->
sched
,
&
dlreq
);
LOG_
I
(
MAC
,
"calling SchedDlConfigInd
\n
"
);
LOG_
D
(
MAC
,
"calling SchedDlConfigInd
\n
"
);
SchedDlConfigInd
(
fapi
,
&
dlind
);
LOG_
I
(
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_
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_buildDataList %d f/sf %d/%d
\n
"
,
dlind
.
nr_buildDataList
,
frameP
,
subframeP
);
LOG_
D
(
MAC
,
"SchedDlConfigInd returns dlind.nr_buildRARList %d f/sf %d/%d
\n
"
,
dlind
.
nr_buildRARList
,
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 */
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
fapi_ul_ack_nack_data
[
ulsf
].
count
=
0
;
}
LOG_
I
(
MAC
,
"calling SchedUlTriggerReq
\n
"
);
LOG_
D
(
MAC
,
"calling SchedUlTriggerReq
\n
"
);
SchedUlTriggerReq
(
fapi
->
sched
,
&
ulreq
);
LOG_
I
(
MAC
,
"calling SchedUlConfigInd
\n
"
);
LOG_
D
(
MAC
,
"calling SchedUlConfigInd
\n
"
);
SchedUlConfigInd
(
fapi
,
&
ulind
);
/* a hack to report nice CQI all the time it's asked */
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
77f1b0ff
...
...
@@ -1290,7 +1290,7 @@ void SR_indication(module_id_t mod_idP, int cc_idP, frame_t frameP, rnti_t 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
printf
(
"MAC to FAPI SR indication rnti %x f/sf %d/%d
\n
"
,
rntiP
,
frameP
,
subframeP
);
#endif
...
...
openair2/LAYER2/MAC/ff-mac.c
View file @
77f1b0ff
...
...
@@ -5,8 +5,8 @@
#include "log.h"
#include "assertions.h"
#undef LOG_D
#define LOG_D LOG_I
//
#undef LOG_D
//
#define LOG_D LOG_I
#include <stdlib.h>
#include <pthread.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment