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
db716f1f
Commit
db716f1f
authored
Sep 14, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove verbose logs
define MEGALOG at compile time to get them
parent
55a5063d
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
92 additions
and
0 deletions
+92
-0
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/phich.c
+6
-0
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+6
-0
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+2
-0
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+64
-0
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+2
-0
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+2
-0
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-0
openair2/LAYER2/MAC/ff-mac.c
openair2/LAYER2/MAC/ff-mac.c
+2
-0
openair2/RRC/LITE/L2_interface.c
openair2/RRC/LITE/L2_interface.c
+6
-0
No files found.
openair1/PHY/LTE_TRANSPORT/phich.c
View file @
db716f1f
...
@@ -1345,7 +1345,9 @@ void rx_phich(PHY_VARS_UE *phy_vars_ue,
...
@@ -1345,7 +1345,9 @@ void rx_phich(PHY_VARS_UE *phy_vars_ue,
LOG_D
(
PHY
,
"HI16 %d
\n
"
,
HI16
);
LOG_D
(
PHY
,
"HI16 %d
\n
"
,
HI16
);
#endif
#endif
#if MEGALOG
printf
(
"GOT UPLINK UE PHICH fsf %d/%d pid %d HI16 %d (>0 means NACK)
\n
"
,
phy_vars_ue
->
frame_rx
,
subframe
,
harq_pid
,
HI16
);
printf
(
"GOT UPLINK UE PHICH fsf %d/%d pid %d HI16 %d (>0 means NACK)
\n
"
,
phy_vars_ue
->
frame_rx
,
subframe
,
harq_pid
,
HI16
);
#endif
if
(
HI16
>
0
)
{
//NACK
if
(
HI16
>
0
)
{
//NACK
if
(
phy_vars_ue
->
ulsch_ue_Msg3_active
[
eNB_id
]
==
1
)
{
if
(
phy_vars_ue
->
ulsch_ue_Msg3_active
[
eNB_id
]
==
1
)
{
...
@@ -1364,7 +1366,9 @@ printf("GOT UPLINK UE PHICH fsf %d/%d pid %d HI16 %d (>0 means NACK)\n", phy_var
...
@@ -1364,7 +1366,9 @@ printf("GOT UPLINK UE PHICH fsf %d/%d pid %d HI16 %d (>0 means NACK)\n", phy_var
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
// ulsch->harq_processes[harq_pid]->Ndi = 0;
// ulsch->harq_processes[harq_pid]->Ndi = 0;
ulsch
->
harq_processes
[
harq_pid
]
->
round
++
;
ulsch
->
harq_processes
[
harq_pid
]
->
round
++
;
#if MEGALOG
printf
(
"GOT UPLINK UE PHICH msg3 pid %d round %d
\n
"
,
harq_pid
,
ulsch
->
harq_processes
[
harq_pid
]
->
round
);
printf
(
"GOT UPLINK UE PHICH msg3 pid %d round %d
\n
"
,
harq_pid
,
ulsch
->
harq_processes
[
harq_pid
]
->
round
);
#endif
ulsch
->
harq_processes
[
harq_pid
]
->
rvidx
=
rv_table
[
ulsch
->
harq_processes
[
harq_pid
]
->
round
&
3
];
ulsch
->
harq_processes
[
harq_pid
]
->
rvidx
=
rv_table
[
ulsch
->
harq_processes
[
harq_pid
]
->
round
&
3
];
if
(
ulsch
->
harq_processes
[
harq_pid
]
->
round
>=
phy_vars_ue
->
lte_frame_parms
.
maxHARQ_Msg3Tx
)
{
if
(
ulsch
->
harq_processes
[
harq_pid
]
->
round
>=
phy_vars_ue
->
lte_frame_parms
.
maxHARQ_Msg3Tx
)
{
...
@@ -1386,7 +1390,9 @@ printf("GOT UPLINK UE PHICH msg3 pid %d round %d\n", harq_pid, ulsch->harq_proce
...
@@ -1386,7 +1390,9 @@ printf("GOT UPLINK UE PHICH msg3 pid %d round %d\n", harq_pid, ulsch->harq_proce
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
// ulsch->harq_processes[harq_pid]->Ndi = 0;
// ulsch->harq_processes[harq_pid]->Ndi = 0;
ulsch
->
harq_processes
[
harq_pid
]
->
round
++
;
ulsch
->
harq_processes
[
harq_pid
]
->
round
++
;
#if MEGALOG
printf
(
"GOT UPLINK UE PHICH [%p] pid %d round %d
\n
"
,
ulsch
,
harq_pid
,
ulsch
->
harq_processes
[
harq_pid
]
->
round
);
printf
(
"GOT UPLINK UE PHICH [%p] pid %d round %d
\n
"
,
ulsch
,
harq_pid
,
ulsch
->
harq_processes
[
harq_pid
]
->
round
);
#endif
ulsch
->
harq_processes
[
harq_pid
]
->
rvidx
=
rv_table
[
ulsch
->
harq_processes
[
harq_pid
]
->
round
&
3
];
ulsch
->
harq_processes
[
harq_pid
]
->
rvidx
=
rv_table
[
ulsch
->
harq_processes
[
harq_pid
]
->
round
&
3
];
ulsch
->
O_RI
=
0
;
ulsch
->
O_RI
=
0
;
ulsch
->
O
=
0
;
ulsch
->
O
=
0
;
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
db716f1f
...
@@ -544,7 +544,9 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
...
@@ -544,7 +544,9 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
int
frame
=
phy_vars_eNB
->
proc
[
sched_subframe
].
frame_tx
;
int
frame
=
phy_vars_eNB
->
proc
[
sched_subframe
].
frame_tx
;
int
subframe
=
phy_vars_eNB
->
proc
[
sched_subframe
].
subframe_tx
;
int
subframe
=
phy_vars_eNB
->
proc
[
sched_subframe
].
subframe_tx
;
#if MEGALOG
printf
(
"PHY TX f/sf %d/%d sched_sf %d
\n
"
,
frame
,
subframe
,
sched_subframe
);
printf
(
"PHY TX f/sf %d/%d sched_sf %d
\n
"
,
frame
,
subframe
,
sched_subframe
);
#endif
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX
,
1
);
start_meas
(
&
phy_vars_eNB
->
phy_proc_tx
);
start_meas
(
&
phy_vars_eNB
->
phy_proc_tx
);
...
@@ -1828,7 +1830,9 @@ void process_HARQ_feedback(uint8_t UE_id,
...
@@ -1828,7 +1830,9 @@ void process_HARQ_feedback(uint8_t UE_id,
(
dlsch_harq_proc
->
status
==
ACTIVE
))
{
(
dlsch_harq_proc
->
status
==
ACTIVE
))
{
#if FAPI
#if FAPI
/* TODO: handle transport block != 0 */
/* TODO: handle transport block != 0 */
#if MEGALOG
printf
(
"SEND ack %d harq pid %d rnti %d f/sf %d/%d
\n
"
,
dlsch_ACK
[
mp
],
dl_harq_pid
[
m
],
dlsch
->
rnti
,
frame
,
subframe
);
printf
(
"SEND ack %d harq pid %d rnti %d f/sf %d/%d
\n
"
,
dlsch_ACK
[
mp
],
dl_harq_pid
[
m
],
dlsch
->
rnti
,
frame
,
subframe
);
#endif
mac_xface
->
fapi_dl_ack_nack
(
dlsch
->
rnti
,
dl_harq_pid
[
m
],
0
/* transport block */
,
dlsch_ACK
[
mp
]);
mac_xface
->
fapi_dl_ack_nack
(
dlsch
->
rnti
,
dl_harq_pid
[
m
],
0
/* transport block */
,
dlsch_ACK
[
mp
]);
#endif
#endif
// dl_harq_pid of DLSCH is still active
// dl_harq_pid of DLSCH is still active
...
@@ -2718,7 +2722,9 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
...
@@ -2718,7 +2722,9 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
const
int
subframe
=
phy_vars_eNB
->
proc
[
sched_subframe
].
subframe_rx
;
const
int
subframe
=
phy_vars_eNB
->
proc
[
sched_subframe
].
subframe_rx
;
const
int
frame
=
phy_vars_eNB
->
proc
[
sched_subframe
].
frame_rx
;
const
int
frame
=
phy_vars_eNB
->
proc
[
sched_subframe
].
frame_rx
;
#if MEGALOG
printf
(
"PHY RX f/sf %d/%d sched_sf %d
\n
"
,
frame
,
subframe
,
sched_subframe
);
printf
(
"PHY RX f/sf %d/%d sched_sf %d
\n
"
,
frame
,
subframe
,
sched_subframe
);
#endif
AssertFatal
(
sched_subframe
<
NUM_ENB_THREADS
,
"Bad sched_subframe %d"
,
sched_subframe
);
AssertFatal
(
sched_subframe
<
NUM_ENB_THREADS
,
"Bad sched_subframe %d"
,
sched_subframe
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX
,
1
);
...
...
openair2/LAYER2/MAC/config.c
View file @
db716f1f
...
@@ -185,7 +185,9 @@ rrc_mac_config_req(
...
@@ -185,7 +185,9 @@ rrc_mac_config_req(
#if FAPI
#if FAPI
if
(
eNB_flagP
==
1
)
{
if
(
eNB_flagP
==
1
)
{
#if MEGALOG
printf
(
"MAC CONFIG lcid %d group %d
\n
"
,
(
int
)
logicalChannelIdentity
,
(
int
)
*
logicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelGroup
);
printf
(
"MAC CONFIG lcid %d group %d
\n
"
,
(
int
)
logicalChannelIdentity
,
(
int
)
*
logicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelGroup
);
#endif
/* only configure DRBs, SRBs are already configured */
/* only configure DRBs, SRBs are already configured */
if
(
logicalChannelIdentity
>
2
)
{
if
(
logicalChannelIdentity
>
2
)
{
struct
CschedLcConfigReqParameters
lc
;
struct
CschedLcConfigReqParameters
lc
;
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
db716f1f
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
db716f1f
...
@@ -786,7 +786,9 @@ void initiate_ra_proc(module_id_t module_idP, int CC_id,frame_t frameP, uint16_t
...
@@ -786,7 +786,9 @@ void initiate_ra_proc(module_id_t module_idP, int CC_id,frame_t frameP, uint16_t
return
;
return
;
}
}
#if MEGALOG
printf
(
"MAC to FAPI initiate RA procedure new rnti %x f/sf %d/%d
\n
"
,
r
.
rnti
,
frameP
,
subframeP
);
printf
(
"MAC to FAPI initiate RA procedure new rnti %x f/sf %d/%d
\n
"
,
r
.
rnti
,
frameP
,
subframeP
);
#endif
LOG_I
(
MAC
,
"calling SchedDlRachInfoReq
\n
"
);
LOG_I
(
MAC
,
"calling SchedDlRachInfoReq
\n
"
);
SchedDlRachInfoReq
(
fapi
->
sched
,
&
p
);
SchedDlRachInfoReq
(
fapi
->
sched
,
&
p
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
db716f1f
...
@@ -1195,7 +1195,9 @@ void SR_indication(module_id_t mod_idP, int cc_idP, frame_t frameP, rnti_t rntiP
...
@@ -1195,7 +1195,9 @@ 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_I
(
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
);
printf
(
"MAC to FAPI SR indication rnti %x f/sf %d/%d
\n
"
,
rntiP
,
frameP
,
subframeP
);
#endif
SchedUlSrInfoReq
(
fapi
->
sched
,
&
p
);
SchedUlSrInfoReq
(
fapi
->
sched
,
&
p
);
}
}
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
db716f1f
...
@@ -99,9 +99,11 @@ void rx_sdu(const module_id_t enb_mod_idP,
...
@@ -99,9 +99,11 @@ void rx_sdu(const module_id_t enb_mod_idP,
start_meas
(
&
eNB
->
rx_ulsch_sdu
);
start_meas
(
&
eNB
->
rx_ulsch_sdu
);
#if MEGALOG
printf
(
"GOT UPLINK rnti %x packet; size = %d ["
,
rntiP
,
sdu_lenP
);
printf
(
"GOT UPLINK rnti %x packet; size = %d ["
,
rntiP
,
sdu_lenP
);
for
(
ii
=
0
;
ii
<
sdu_lenP
;
ii
++
)
printf
(
" %2.2x"
,
sduP
[
ii
]);
for
(
ii
=
0
;
ii
<
sdu_lenP
;
ii
++
)
printf
(
" %2.2x"
,
sduP
[
ii
]);
printf
(
" ]
\n
"
);
printf
(
" ]
\n
"
);
#endif
if
((
UE_id
>
NUMBER_OF_UE_MAX
)
||
(
UE_id
==
-
1
)
)
if
((
UE_id
>
NUMBER_OF_UE_MAX
)
||
(
UE_id
==
-
1
)
)
for
(
ii
=
0
;
ii
<
NB_RB_MAX
;
ii
++
)
{
for
(
ii
=
0
;
ii
<
NB_RB_MAX
;
ii
++
)
{
rx_lengths
[
ii
]
=
0
;
rx_lengths
[
ii
]
=
0
;
...
...
openair2/LAYER2/MAC/ff-mac.c
View file @
db716f1f
...
@@ -299,7 +299,9 @@ void SchedUlConfigInd_callback(void *callback_data, const struct SchedUlConfigIn
...
@@ -299,7 +299,9 @@ void SchedUlConfigInd_callback(void *callback_data, const struct SchedUlConfigIn
LOCK
(
fi
,
fn
);
LOCK
(
fi
,
fn
);
CHECK
(
fi
,
fn
);
CHECK
(
fi
,
fn
);
#if MEGALOG
printf
(
"SchedUlConfigInd_callback nr_dciList %d
\n
"
,
params
->
nr_dciList
);
printf
(
"SchedUlConfigInd_callback nr_dciList %d
\n
"
,
params
->
nr_dciList
);
#endif
/* copy from params to local structure */
/* copy from params to local structure */
fi
->
SchedUlConfigIndParameters
.
nr_dciList
=
params
->
nr_dciList
;
fi
->
SchedUlConfigIndParameters
.
nr_dciList
=
params
->
nr_dciList
;
...
...
openair2/RRC/LITE/L2_interface.c
View file @
db716f1f
...
@@ -145,7 +145,9 @@ mac_rrc_data_req(
...
@@ -145,7 +145,9 @@ mac_rrc_data_req(
return
0
;
return
0
;
}
}
#if MEGALOG
printf
(
"XX frame %d %%2 %d %%8 %d
\n
"
,
frameP
,
frameP
%
2
,
frameP
%
8
);
printf
(
"XX frame %d %%2 %d %%8 %d
\n
"
,
frameP
,
frameP
%
2
,
frameP
%
8
);
#endif
// All even frames transmit SIB in SF 5
// All even frames transmit SIB in SF 5
if
(
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_SIB1
==
255
)
{
if
(
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_SIB1
==
255
)
{
LOG_E
(
RRC
,
"[eNB %d] MAC Request for SIB1 and SIB1 not initialized
\n
"
,
Mod_idP
);
LOG_E
(
RRC
,
"[eNB %d] MAC Request for SIB1 and SIB1 not initialized
\n
"
,
Mod_idP
);
...
@@ -153,7 +155,9 @@ printf("XX frame %d %%2 %d %%8 %d\n", frameP, frameP % 2, frameP % 8);
...
@@ -153,7 +155,9 @@ printf("XX frame %d %%2 %d %%8 %d\n", frameP, frameP % 2, frameP % 8);
}
}
if
((
frameP
%
2
)
==
0
)
{
if
((
frameP
%
2
)
==
0
)
{
#if MEGALOG
printf
(
"XX throw SIB1
\n
"
);
printf
(
"XX throw SIB1
\n
"
);
#endif
memcpy
(
&
buffer_pP
[
0
],
memcpy
(
&
buffer_pP
[
0
],
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
SIB1
,
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
SIB1
,
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_SIB1
);
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_SIB1
);
...
@@ -195,7 +199,9 @@ printf("XX throw SIB1\n");
...
@@ -195,7 +199,9 @@ printf("XX throw SIB1\n");
return
(
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_SIB1
);
return
(
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_SIB1
);
}
// All RFN mod 8 transmit SIB2-3 in SF 5
}
// All RFN mod 8 transmit SIB2-3 in SF 5
else
if
((
frameP
%
8
)
==
1
)
{
else
if
((
frameP
%
8
)
==
1
)
{
#if MEGALOG
printf
(
"XX throw SIB2/3
\n
"
);
printf
(
"XX throw SIB2/3
\n
"
);
#endif
memcpy
(
&
buffer_pP
[
0
],
memcpy
(
&
buffer_pP
[
0
],
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
SIB23
,
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
SIB23
,
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_SIB23
);
eNB_rrc_inst
[
Mod_idP
].
carrier
[
CC_id
].
sizeof_SIB23
);
...
...
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