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
ZhouShuya
OpenXG-RAN
Commits
eb030b6a
Commit
eb030b6a
authored
Jul 13, 2018
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: compile error using "--mu" build option.
parent
b0333172
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
31 deletions
+35
-31
openair2/UTIL/LOG/log.c
openair2/UTIL/LOG/log.c
+31
-30
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+4
-1
No files found.
openair2/UTIL/LOG/log.c
View file @
eb030b6a
...
@@ -669,42 +669,43 @@ void nfapi_log(const char *file, const char *func, int line, int comp, int level
...
@@ -669,42 +669,43 @@ void nfapi_log(const char *file, const char *func, int line, int comp, int level
va_end
(
args
);
va_end
(
args
);
// OAI printf compatibility
// OAI printf compatibility
if
((
g_log
->
onlinelog
==
1
)
&&
(
level
!=
LOG_FILE
))
if
((
g_log
->
onlinelog
==
1
)
&&
(
level
!=
LOG_FILE
))
{
if
(
log_mem_flag
==
1
){
if
(
log_mem_flag
==
1
){
if
(
log_mem_d
[
log_mem_side
].
enable_flag
==
1
){
if
(
log_mem_d
[
log_mem_side
].
enable_flag
==
1
){
int
temp_index
;
int
temp_index
;
temp_index
=
log_mem_d
[
log_mem_side
].
buf_index
;
temp_index
=
log_mem_d
[
log_mem_side
].
buf_index
;
if
(
temp_index
+
len
+
1
<
LOG_MEM_SIZE
){
if
(
temp_index
+
len
+
1
<
LOG_MEM_SIZE
){
log_mem_d
[
log_mem_side
].
buf_index
+=
len
;
log_mem_d
[
log_mem_side
].
buf_index
+=
len
;
memcpy
(
&
log_mem_d
[
log_mem_side
].
buf_p
[
temp_index
],
log_buffer
,
len
);
memcpy
(
&
log_mem_d
[
log_mem_side
].
buf_p
[
temp_index
],
log_buffer
,
len
);
}
else
{
}
else
{
log_mem_d
[
log_mem_side
].
enable_flag
=
0
;
log_mem_d
[
log_mem_side
].
enable_flag
=
0
;
if
(
log_mem_d
[
1
-
log_mem_side
].
enable_flag
==
1
){
if
(
log_mem_d
[
1
-
log_mem_side
].
enable_flag
==
1
){
temp_index
=
log_mem_d
[
1
-
log_mem_side
].
buf_index
;
temp_index
=
log_mem_d
[
1
-
log_mem_side
].
buf_index
;
if
(
temp_index
+
len
+
1
<
LOG_MEM_SIZE
){
if
(
temp_index
+
len
+
1
<
LOG_MEM_SIZE
){
log_mem_d
[
1
-
log_mem_side
].
buf_index
+=
len
;
log_mem_d
[
1
-
log_mem_side
].
buf_index
+=
len
;
log_mem_side
=
1
-
log_mem_side
;
log_mem_side
=
1
-
log_mem_side
;
memcpy
(
&
log_mem_d
[
log_mem_side
].
buf_p
[
temp_index
],
log_buffer
,
len
);
memcpy
(
&
log_mem_d
[
log_mem_side
].
buf_p
[
temp_index
],
log_buffer
,
len
);
/* write down !*/
/* write down !*/
if
(
pthread_mutex_lock
(
&
log_mem_lock
)
!=
0
)
{
if
(
pthread_mutex_lock
(
&
log_mem_lock
)
!=
0
)
{
return
;
return
;
}
if
(
log_mem_write_flag
==
0
){
log_mem_write_side
=
1
-
log_mem_side
;
if
(
pthread_cond_signal
(
&
log_mem_notify
)
!=
0
)
{
}
}
if
(
log_mem_write_flag
==
0
){
log_mem_write_side
=
1
-
log_mem_side
;
if
(
pthread_cond_signal
(
&
log_mem_notify
)
!=
0
)
{
}
}
if
(
pthread_mutex_unlock
(
&
log_mem_lock
)
!=
0
)
{
return
;
}
}
else
{
log_mem_d
[
1
-
log_mem_side
].
enable_flag
=
0
;
}
}
if
(
pthread_mutex_unlock
(
&
log_mem_lock
)
!=
0
)
{
return
;
}
}
else
{
log_mem_d
[
1
-
log_mem_side
].
enable_flag
=
0
;
}
}
}
}
}
}
}
else
{
fwrite
(
log_buffer
,
len
,
1
,
stdout
);
}
}
}
else
{
fwrite
(
log_buffer
,
len
,
1
,
stdout
);
}
}
if
(
g_log
->
syslog
)
{
if
(
g_log
->
syslog
)
{
...
...
targets/RT/USER/lte-ru.c
View file @
eb030b6a
...
@@ -2770,7 +2770,10 @@ void init_RU(char *rf_config_file) {
...
@@ -2770,7 +2770,10 @@ void init_RU(char *rf_config_file) {
void
stop_ru
(
RU_t
*
ru
)
{
void
stop_ru
(
RU_t
*
ru
)
{
#if defined(PRE_SCD_THREAD) || defined(PHY_TX_THREAD)
int
*
status
;
#endif
printf
(
"Stopping RU %p processing threads
\n
"
,(
void
*
)
ru
);
printf
(
"Stopping RU %p processing threads
\n
"
,(
void
*
)
ru
);
#if defined(PRE_SCD_THREAD)
#if defined(PRE_SCD_THREAD)
if
(
ru
){
if
(
ru
){
...
...
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