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
littleBu
OpenXG-RAN
Commits
9db78ab4
Commit
9db78ab4
authored
2 years ago
by
Bruno Mongazon-Cazavet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix warnings introduced by changes in _Assert_Exit_ macro
parent
fcc41355
Branches unavailable
2025.w08
2025.w07
2025.w06
2025.w05
2025.w04
2025.w03
2025.w02
2024.w51
2024.w50
2024.w49
2024.w48
2024.w47
2024.w46
2024.w45
2024.w44
2024.w43
2024.w42
2024.w41
2024.w40
2024.w39
2024.w38
2024.w36
2024.w35
2024.w34
2024.w33
2024.w32
2024.w31
2024.w30
2024.w29
2024.w28
2024.w27
2024.w26
2024.w25
2024.w24
2024.w23
2024.w22
2024.w21
2024.w18
2024.w17
2024.w16
2024.w15
2024.w14
2024.w13
2024.w12
2024.w11
2024.w10
2024.w09
2024.w08
2024.w06
2024.w05
2024.w04
2024.w03
2024.w02
2024.w01
2023.w51
2023.w50
2023.w49
2023.w48
2023.w47
2023.w45
2023.w43
2023.w42
2023.w41
2023.w40
2023.w39
2023.w38
2023.w37
2023.w36
2023.w34
2023.w33
2023.w32
2023.w31
2023.w30
2023.w29
2023.w28
2023.w27
2023.w26
2023.w25
2023.w24
2023.w23
2023.w22
2023.w21
2023.w20
2023.w19
2023.w18
2023.w18b
2023.w16
2023.w15
2023.w14
2023.w13
2023.w12
2023.w11
2023.w11b
2023.w10
2023.w10b
v2.2.0
v2.1.0
v2.0.0
ARC_1.3
No related merge requests found
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
20 deletions
+27
-20
cmake_targets/build_oai
cmake_targets/build_oai
+1
-1
common/utils/assertions.h
common/utils/assertions.h
+14
-13
executables/main_ru.c
executables/main_ru.c
+1
-1
executables/nr-cuup.c
executables/nr-cuup.c
+6
-0
executables/nr-softmodem.c
executables/nr-softmodem.c
+1
-1
executables/softmodem-common.c
executables/softmodem-common.c
+1
-1
openair2/COMMON/platform_types.h
openair2/COMMON/platform_types.h
+1
-1
radio/USRP/USERSPACE/LIB/usrp_lib.cpp
radio/USRP/USERSPACE/LIB/usrp_lib.cpp
+1
-1
radio/iqplayer/iqplayer_lib.c
radio/iqplayer/iqplayer_lib.c
+1
-1
No files found.
cmake_targets/build_oai
View file @
9db78ab4
...
@@ -595,7 +595,7 @@ function main() {
...
@@ -595,7 +595,7 @@ function main() {
echo_info
"Compiling UE specific part"
echo_info
"Compiling UE specific part"
if
[
$UE_ip
-eq
1
]
if
[
"
$UE_ip
"
=
1
]
then
then
echo_info
"Building ue_ip module"
echo_info
"Building ue_ip module"
compilations
$BUILD_DIR
ue_ip
compilations
$BUILD_DIR
ue_ip
...
...
This diff is collapsed.
Click to expand it.
common/utils/assertions.h
View file @
9db78ab4
...
@@ -30,19 +30,20 @@
...
@@ -30,19 +30,20 @@
#include <platform_types.h>
#include <platform_types.h>
#include "backtrace.h"
#include "backtrace.h"
#define EXIT_NORMAL 0
#define OAI_EXIT_NORMAL 0
#define EXIT_ASSERT 1
#define OAI_EXIT_ASSERT 1
#define _Assert_Exit_ \
#define _Assert_Exit_ \
if (getenv("gdbStacks")) { \
if (getenv("gdbStacks")) { \
char tmp[1000]; \
char tmp [1000]; \
sprintf(tmp, "gdb -ex='set confirm off' -ex 'thread apply all bt' -ex q -p %d < /dev/null", getpid()); \
sprintf(tmp,"gdb -ex='set confirm off' -ex 'thread apply all bt' -ex q -p %d < /dev/null", getpid()); \
__attribute__((unused)) int dummy = system(tmp); \
__attribute__((unused)) int dummy=system(tmp); \
} \
} \
fprintf(stderr, "\nExiting execution\n"); \
fprintf(stderr, "\nExiting execution\n"); \
fflush(stdout); \
fflush(stdout); \
fflush(stderr); \
fflush(stderr); \
exit_function(__FILE__, __FUNCTION__, __LINE__, "_Assert_Exit_", EXIT_ASSERT);
exit_function(__FILE__, __FUNCTION__, __LINE__, "_Assert_Exit_", OAI_EXIT_ASSERT); \
abort(); // to avoid gcc warnings - never executed unless app-specific exit_function() does not exit() nor abort()
#define _Assert_(cOND, aCTION, fORMAT, aRGS...) \
#define _Assert_(cOND, aCTION, fORMAT, aRGS...) \
do { \
do { \
...
...
This diff is collapsed.
Click to expand it.
executables/main_ru.c
View file @
9db78ab4
...
@@ -86,7 +86,7 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
...
@@ -86,7 +86,7 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
void
nfapi_setmode
(
nfapi_mode_t
nfapi_mode
)
{
return
;
}
void
nfapi_setmode
(
nfapi_mode_t
nfapi_mode
)
{
return
;
}
void
exit_function
(
const
char
*
file
,
const
char
*
function
,
const
int
line
,
const
char
*
s
)
{
void
exit_function
(
const
char
*
file
,
const
char
*
function
,
const
int
line
,
const
char
*
s
,
const
int
assert
)
{
if
(
s
!=
NULL
)
{
if
(
s
!=
NULL
)
{
printf
(
"%s:%d %s() Exiting OAI softmodem: %s
\n
"
,
file
,
line
,
function
,
s
);
printf
(
"%s:%d %s() Exiting OAI softmodem: %s
\n
"
,
file
,
line
,
function
,
s
);
...
...
This diff is collapsed.
Click to expand it.
executables/nr-cuup.c
View file @
9db78ab4
...
@@ -40,6 +40,12 @@ RRC_release_list_t rrc_release_info;
...
@@ -40,6 +40,12 @@ RRC_release_list_t rrc_release_info;
void
exit_function
(
const
char
*
file
,
const
char
*
function
,
const
int
line
,
const
char
*
s
,
const
int
assert
)
void
exit_function
(
const
char
*
file
,
const
char
*
function
,
const
int
line
,
const
char
*
s
,
const
int
assert
)
{
{
if
(
assert
)
{
abort
();
}
else
{
sleep
(
1
);
// allow other threads to exit first
exit
(
EXIT_SUCCESS
);
}
}
}
nfapi_mode_t
nfapi_mod
=
-
1
;
nfapi_mode_t
nfapi_mod
=
-
1
;
...
...
This diff is collapsed.
Click to expand it.
executables/nr-softmodem.c
View file @
9db78ab4
...
@@ -288,7 +288,7 @@ void exit_function(const char *file, const char *function, const int line, const
...
@@ -288,7 +288,7 @@ void exit_function(const char *file, const char *function, const int line, const
if
(
assert
)
{
if
(
assert
)
{
abort
();
abort
();
}
else
{
}
else
{
sleep
(
1
);
// allow
lte
-softmodem threads to exit first
sleep
(
1
);
// allow
nr
-softmodem threads to exit first
exit
(
EXIT_SUCCESS
);
exit
(
EXIT_SUCCESS
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
executables/softmodem-common.c
View file @
9db78ab4
...
@@ -215,7 +215,7 @@ void signal_handler(int sig) {
...
@@ -215,7 +215,7 @@ void signal_handler(int sig) {
softmodem_printresources
(
sig
,(
telnet_printfunc_t
)
printf
);
softmodem_printresources
(
sig
,(
telnet_printfunc_t
)
printf
);
if
(
sig
!=
SOFTMODEM_RTSIGNAL
)
{
if
(
sig
!=
SOFTMODEM_RTSIGNAL
)
{
printf
(
"Linux signal %s...
\n
"
,
strsignal
(
sig
));
printf
(
"Linux signal %s...
\n
"
,
strsignal
(
sig
));
exit_function
(
__FILE__
,
__FUNCTION__
,
__LINE__
,
"softmodem starting exit procedure
\n
"
,
EXIT_NORMAL
);
exit_function
(
__FILE__
,
__FUNCTION__
,
__LINE__
,
"softmodem starting exit procedure
\n
"
,
OAI_
EXIT_NORMAL
);
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
openair2/COMMON/platform_types.h
View file @
9db78ab4
...
@@ -281,7 +281,7 @@ typedef struct protocol_ctxt_s {
...
@@ -281,7 +281,7 @@ typedef struct protocol_ctxt_s {
#define CHECK_CTXT_ARGS(CTXT_Pp)
#define CHECK_CTXT_ARGS(CTXT_Pp)
#define exit_fun(msg) exit_function(__FILE__, __FUNCTION__, __LINE__, "exit_fun", EXIT_NORMAL)
#define exit_fun(msg) exit_function(__FILE__, __FUNCTION__, __LINE__, "exit_fun",
OAI_
EXIT_NORMAL)
#ifdef __cplusplus
#ifdef __cplusplus
extern
"C"
extern
"C"
{
{
...
...
This diff is collapsed.
Click to expand it.
radio/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
9db78ab4
...
@@ -789,7 +789,7 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
...
@@ -789,7 +789,7 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
recPlay
->
nbSamplesBlocks
++
;
recPlay
->
nbSamplesBlocks
++
;
LOG_D
(
HW
,
"recorded %d samples, for TS %lu, shift in buffer %ld nbBytes %d nbSamplesBlocks %d
\n
"
,
nsamps
,
hdr
->
ts
,
recPlay
->
currentPtr
-
(
uint8_t
*
)
recPlay
->
ms_sample
,
(
int
)
hdr
->
nbBytes
,
(
int
)
recPlay
->
nbSamplesBlocks
);
LOG_D
(
HW
,
"recorded %d samples, for TS %lu, shift in buffer %ld nbBytes %d nbSamplesBlocks %d
\n
"
,
nsamps
,
hdr
->
ts
,
recPlay
->
currentPtr
-
(
uint8_t
*
)
recPlay
->
ms_sample
,
(
int
)
hdr
->
nbBytes
,
(
int
)
recPlay
->
nbSamplesBlocks
);
}
else
}
else
exit_function
(
__FILE__
,
__FUNCTION__
,
__LINE__
,
"Recording reaches max iq limit
\n
"
,
EXIT_NORMAL
);
exit_function
(
__FILE__
,
__FUNCTION__
,
__LINE__
,
"Recording reaches max iq limit
\n
"
,
OAI_
EXIT_NORMAL
);
}
}
read_count
++
;
read_count
++
;
LOG_D
(
HW
,
"usrp_lib: returning %d samples at ts %lu read_count %d
\n
"
,
samples_received
,
*
ptimestamp
,
read_count
);
LOG_D
(
HW
,
"usrp_lib: returning %d samples at ts %lu read_count %d
\n
"
,
samples_received
,
*
ptimestamp
,
read_count
);
...
...
This diff is collapsed.
Click to expand it.
radio/iqplayer/iqplayer_lib.c
View file @
9db78ab4
...
@@ -268,7 +268,7 @@ static int trx_iqplayer_read(openair0_device *device, openair0_timestamp *ptimes
...
@@ -268,7 +268,7 @@ static int trx_iqplayer_read(openair0_device *device, openair0_timestamp *ptimes
if
(
s
->
wrap_count
==
device
->
openair0_cfg
->
recplay_conf
->
u_sf_loops
)
{
if
(
s
->
wrap_count
==
device
->
openair0_cfg
->
recplay_conf
->
u_sf_loops
)
{
LOG_W
(
HW
,
"iqplayer device terminating subframes replay after %u iteration
\n
"
,
LOG_W
(
HW
,
"iqplayer device terminating subframes replay after %u iteration
\n
"
,
device
->
openair0_cfg
->
recplay_conf
->
u_sf_loops
);
device
->
openair0_cfg
->
recplay_conf
->
u_sf_loops
);
exit_function
(
__FILE__
,
__FUNCTION__
,
__LINE__
,
"replay ended, triggering process termination
\n
"
,
EXIT_NORMAL
);
exit_function
(
__FILE__
,
__FUNCTION__
,
__LINE__
,
"replay ended, triggering process termination
\n
"
,
OAI_
EXIT_NORMAL
);
}
}
if
(
s
->
wrap_count
>
0
)
{
if
(
s
->
wrap_count
>
0
)
{
...
...
This diff is collapsed.
Click to expand it.
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