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
wangjie
OpenXG-RAN
Commits
b9a2523f
Commit
b9a2523f
authored
Mar 12, 2020
by
masayuki.harada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Discard log data when process is denied file access
parent
c0162d06
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
10 deletions
+13
-10
common/utils/LOG/log.c
common/utils/LOG/log.c
+7
-4
nfapi/open-nFAPI/vnf/src/vnf_p7.c
nfapi/open-nFAPI/vnf/src/vnf_p7.c
+3
-3
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+1
-1
No files found.
common/utils/LOG/log.c
View file @
b9a2523f
...
@@ -692,12 +692,15 @@ void flush_mem_to_file(void)
...
@@ -692,12 +692,15 @@ void flush_mem_to_file(void)
}
}
snprintf
(
f_name
,
1024
,
"%s_%d.log"
,
log_mem_filename
,
log_mem_file_cnt
);
snprintf
(
f_name
,
1024
,
"%s_%d.log"
,
log_mem_filename
,
log_mem_file_cnt
);
fp
=
open
(
f_name
,
O_WRONLY
|
O_CREAT
,
0666
);
fp
=
open
(
f_name
,
O_WRONLY
|
O_CREAT
,
0666
);
int
ret
=
write
(
fp
,
log_mem_d
[
log_mem_write_side
].
buf_p
,
log_mem_d
[
log_mem_write_side
].
buf_index
);
if
(
fp
==-
1
){
if
(
ret
<
0
)
{
fprintf
(
stderr
,
"{LOG} %s %d Couldn't file open in %s
\n
"
,
__FILE__
,
__LINE__
,
f_name
);
}
else
{
int
ret
=
write
(
fp
,
log_mem_d
[
log_mem_write_side
].
buf_p
,
log_mem_d
[
log_mem_write_side
].
buf_index
);
if
(
ret
<
0
)
{
fprintf
(
stderr
,
"{LOG} %s %d Couldn't write in %s
\n
"
,
__FILE__
,
__LINE__
,
f_name
);
fprintf
(
stderr
,
"{LOG} %s %d Couldn't write in %s
\n
"
,
__FILE__
,
__LINE__
,
f_name
);
exit
(
EXIT_FAILURE
);
}
close
(
fp
);
}
}
close
(
fp
);
log_mem_file_cnt
++
;
log_mem_file_cnt
++
;
log_mem_d
[
log_mem_write_side
].
buf_index
=
0
;
log_mem_d
[
log_mem_write_side
].
buf_index
=
0
;
log_mem_d
[
log_mem_write_side
].
enable_flag
=
1
;
log_mem_d
[
log_mem_write_side
].
enable_flag
=
1
;
...
...
nfapi/open-nFAPI/vnf/src/vnf_p7.c
View file @
b9a2523f
...
@@ -1181,7 +1181,7 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
...
@@ -1181,7 +1181,7 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
if
(
phy
->
insync_minor_adjustment
!=
0
)
if
(
phy
->
insync_minor_adjustment
!=
0
)
{
{
NFAPI_TRACE
(
NFAPI_TRACE_
NOTE
,
"(%4d/%d) VNF phy_id:%d Apply minor insync adjustment %dus for %d subframes (sf_offset_filtered:%d) %d %d %d NEW:%d CURR:%d adjustment:%d
\n
"
,
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"(%4d/%d) VNF phy_id:%d Apply minor insync adjustment %dus for %d subframes (sf_offset_filtered:%d) %d %d %d NEW:%d CURR:%d adjustment:%d
\n
"
,
NFAPI_SFNSF2SFN
(
phy
->
sfn_sf
),
NFAPI_SFNSF2SF
(
phy
->
sfn_sf
),
ind
.
header
.
phy_id
,
NFAPI_SFNSF2SFN
(
phy
->
sfn_sf
),
NFAPI_SFNSF2SF
(
phy
->
sfn_sf
),
ind
.
header
.
phy_id
,
phy
->
insync_minor_adjustment
,
phy
->
insync_minor_adjustment_duration
,
phy
->
insync_minor_adjustment
,
phy
->
insync_minor_adjustment_duration
,
phy
->
sf_offset_filtered
,
phy
->
sf_offset_filtered
,
...
@@ -1224,7 +1224,7 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
...
@@ -1224,7 +1224,7 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
// out of sync?
// out of sync?
}
}
NFAPI_TRACE
(
NFAPI_TRACE_
NOTE
,
"(%4d/%d) VNF phy_id:%d Apply minor insync adjustment %dus for %d subframes (adjustment:%d sf_offset_filtered:%d) %d %d %d NEW:%d CURR:%d adj:%d
\n
"
,
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"(%4d/%d) VNF phy_id:%d Apply minor insync adjustment %dus for %d subframes (adjustment:%d sf_offset_filtered:%d) %d %d %d NEW:%d CURR:%d adj:%d
\n
"
,
NFAPI_SFNSF2SFN
(
phy
->
sfn_sf
),
NFAPI_SFNSF2SF
(
phy
->
sfn_sf
),
ind
.
header
.
phy_id
,
NFAPI_SFNSF2SFN
(
phy
->
sfn_sf
),
NFAPI_SFNSF2SF
(
phy
->
sfn_sf
),
ind
.
header
.
phy_id
,
phy
->
insync_minor_adjustment
,
phy
->
insync_minor_adjustment_duration
,
phy
->
adjustment
,
phy
->
sf_offset_filtered
,
phy
->
insync_minor_adjustment
,
phy
->
insync_minor_adjustment_duration
,
phy
->
adjustment
,
phy
->
sf_offset_filtered
,
insync_minor_adjustment_1
,
insync_minor_adjustment_2
,
phy
->
sf_offset_trend
,
insync_minor_adjustment_1
,
insync_minor_adjustment_2
,
phy
->
sf_offset_trend
,
...
@@ -1257,7 +1257,7 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
...
@@ -1257,7 +1257,7 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
// out of sync?
// out of sync?
}
}
NFAPI_TRACE
(
NFAPI_TRACE_
NOTE
,
"(%d/%d) VNF phy_id:%d Apply minor insync adjustment %dus for %d subframes (adjustment:%d sf_offset_filtered:%d) %d %d %d
\n
"
,
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"(%d/%d) VNF phy_id:%d Apply minor insync adjustment %dus for %d subframes (adjustment:%d sf_offset_filtered:%d) %d %d %d
\n
"
,
NFAPI_SFNSF2SFN
(
phy
->
sfn_sf
),
NFAPI_SFNSF2SF
(
phy
->
sfn_sf
),
ind
.
header
.
phy_id
,
NFAPI_SFNSF2SFN
(
phy
->
sfn_sf
),
NFAPI_SFNSF2SF
(
phy
->
sfn_sf
),
ind
.
header
.
phy_id
,
phy
->
insync_minor_adjustment
,
phy
->
insync_minor_adjustment_duration
,
phy
->
adjustment
,
phy
->
sf_offset_filtered
,
phy
->
insync_minor_adjustment
,
phy
->
insync_minor_adjustment_duration
,
phy
->
adjustment
,
phy
->
sf_offset_filtered
,
insync_minor_adjustment_1
,
insync_minor_adjustment_2
,
phy
->
sf_offset_trend
);
insync_minor_adjustment_1
,
insync_minor_adjustment_2
,
phy
->
sf_offset_trend
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
b9a2523f
...
@@ -1816,7 +1816,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -1816,7 +1816,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
cce_idx
);
cce_idx
);
// No TX request for retransmission (check if null request for FAPI)
// No TX request for retransmission (check if null request for FAPI)
}
else
{
}
else
{
LOG_
W
(
MAC
,
LOG_
I
(
MAC
,
"Frame %d, Subframe %d: Dropping DLSCH allocation for UE %d\%x, infeasible CCE allocation
\n
"
,
"Frame %d, Subframe %d: Dropping DLSCH allocation for UE %d\%x, infeasible CCE allocation
\n
"
,
frameP
,
subframeP
,
UE_id
,
rnti
);
frameP
,
subframeP
,
UE_id
,
rnti
);
}
}
...
@@ -1840,7 +1840,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -1840,7 +1840,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
dlsch_mcs
[
TB2
]
=
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
dlsch_mcs
[
TB2
]
=
eNB_UE_stats
->
dlsch_mcs
[
TB2
];
eNB_UE_stats
->
dlsch_mcs
[
TB2
];
}
else
{
}
else
{
LOG_
E
(
MAC
,
LOG_
I
(
MAC
,
"[eNB %d] Frame %d CC_id %d : don't schedule UE %d, its retransmission takes more resources than we have
\n
"
,
"[eNB %d] Frame %d CC_id %d : don't schedule UE %d, its retransmission takes more resources than we have
\n
"
,
module_idP
,
frameP
,
CC_id
,
UE_id
);
module_idP
,
frameP
,
CC_id
,
UE_id
);
}
}
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
b9a2523f
...
@@ -207,7 +207,7 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -207,7 +207,7 @@ rx_sdu(const module_id_t enb_mod_idP,
}
}
}
else
{
// sduP == NULL => error
}
else
{
// sduP == NULL => error
UE_scheduling_control
->
pusch_rx_error_num
[
CC_idP
]
++
;
UE_scheduling_control
->
pusch_rx_error_num
[
CC_idP
]
++
;
LOG_
W
(
MAC
,
"[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x
\n
"
,
LOG_
I
(
MAC
,
"[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x
\n
"
,
enb_mod_idP
,
enb_mod_idP
,
harq_pid
,
harq_pid
,
CC_idP
,
CC_idP
,
...
...
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