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
zzha zzha
OpenXG-RAN
Commits
c5b8fa54
Commit
c5b8fa54
authored
Jun 09, 2022
by
Ilario FAVERO
Committed by
Robert Schmidt
Jun 24, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New command line arg for disabling stats: --disable-stats
parent
12a23fb1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
5 deletions
+14
-5
executables/nr-gnb.c
executables/nr-gnb.c
+1
-1
executables/nr-ue.c
executables/nr-ue.c
+4
-2
executables/softmodem-common.c
executables/softmodem-common.c
+3
-0
executables/softmodem-common.h
executables/softmodem-common.h
+4
-0
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_gNB/main.c
+2
-2
No files found.
executables/nr-gnb.c
View file @
c5b8fa54
...
@@ -466,7 +466,7 @@ void init_gNB_Tpool(int inst) {
...
@@ -466,7 +466,7 @@ void init_gNB_Tpool(int inst) {
pushNotifiedFIFO
(
gNB
->
L1_tx_free
,
msgL1Tx
);
// to unblock the process in the beginning
pushNotifiedFIFO
(
gNB
->
L1_tx_free
,
msgL1Tx
);
// to unblock the process in the beginning
}
}
if
(
!
get_softmodem_params
()
->
emulate_l1
)
if
(
(
!
get_softmodem_params
()
->
emulate_l1
)
&&
(
!
IS_SOFTMODEM_NOSTATS_BIT
))
threadCreate
(
&
proc
->
L1_stats_thread
,
nrL1_stats_thread
,(
void
*
)
gNB
,
"L1_stats"
,
-
1
,
OAI_PRIORITY_RT_LOW
);
threadCreate
(
&
proc
->
L1_stats_thread
,
nrL1_stats_thread
,(
void
*
)
gNB
,
"L1_stats"
,
-
1
,
OAI_PRIORITY_RT_LOW
);
threadCreate
(
&
proc
->
pthread_tx_reorder
,
tx_reorder_thread
,
(
void
*
)
gNB
,
"thread_tx_reorder"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
threadCreate
(
&
proc
->
pthread_tx_reorder
,
tx_reorder_thread
,
(
void
*
)
gNB
,
"thread_tx_reorder"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
...
...
executables/nr-ue.c
View file @
c5b8fa54
...
@@ -1109,9 +1109,11 @@ void init_NR_UE_threads(int nb_inst) {
...
@@ -1109,9 +1109,11 @@ void init_NR_UE_threads(int nb_inst) {
LOG_I
(
PHY
,
"Intializing UE Threads for instance %d (%p,%p)...
\n
"
,
inst
,
PHY_vars_UE_g
[
inst
],
PHY_vars_UE_g
[
inst
][
0
]);
LOG_I
(
PHY
,
"Intializing UE Threads for instance %d (%p,%p)...
\n
"
,
inst
,
PHY_vars_UE_g
[
inst
],
PHY_vars_UE_g
[
inst
][
0
]);
threadCreate
(
&
threads
[
inst
],
UE_thread
,
(
void
*
)
UE
,
"UEthread"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
threadCreate
(
&
threads
[
inst
],
UE_thread
,
(
void
*
)
UE
,
"UEthread"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
if
(
!
IS_SOFTMODEM_NOSTATS_BIT
)
{
pthread_t
stat_pthread
;
pthread_t
stat_pthread
;
threadCreate
(
&
stat_pthread
,
nrL1_UE_stats_thread
,
UE
,
"L1_UE_stats"
,
-
1
,
OAI_PRIORITY_RT_LOW
);
threadCreate
(
&
stat_pthread
,
nrL1_UE_stats_thread
,
UE
,
"L1_UE_stats"
,
-
1
,
OAI_PRIORITY_RT_LOW
);
}
}
}
}
}
/* HACK: this function is needed to compile the UE
/* HACK: this function is needed to compile the UE
...
...
executables/softmodem-common.c
View file @
c5b8fa54
...
@@ -85,6 +85,7 @@ char *get_softmodem_function(uint64_t *sofmodemfunc_mask_ptr) {
...
@@ -85,6 +85,7 @@ char *get_softmodem_function(uint64_t *sofmodemfunc_mask_ptr) {
}
}
void
get_common_options
(
uint32_t
execmask
)
{
void
get_common_options
(
uint32_t
execmask
)
{
int32_t
stats_disabled
=
0
;
uint32_t
online_log_messages
=
0
;
uint32_t
online_log_messages
=
0
;
uint32_t
glog_level
=
0
;
uint32_t
glog_level
=
0
;
uint32_t
start_telnetsrv
=
0
,
start_telnetclt
=
0
;
uint32_t
start_telnetsrv
=
0
,
start_telnetclt
=
0
;
...
@@ -149,6 +150,8 @@ void get_common_options(uint32_t execmask) {
...
@@ -149,6 +150,8 @@ void get_common_options(uint32_t execmask) {
if
(
worker_config
!=
NULL
)
set_worker_conf
(
worker_config
);
if
(
worker_config
!=
NULL
)
set_worker_conf
(
worker_config
);
nfapi_setmode
(
nfapi_mode
);
nfapi_setmode
(
nfapi_mode
);
if
(
stats_disabled
)
set_softmodem_optmask
(
SOFTMODEM_NOSTATS_BIT
);
}
}
void
softmodem_printresources
(
int
sig
,
telnet_printfunc_t
pf
)
{
void
softmodem_printresources
(
int
sig
,
telnet_printfunc_t
pf
)
{
struct
rusage
usage
;
struct
rusage
usage
;
...
...
executables/softmodem-common.h
View file @
c5b8fa54
...
@@ -101,6 +101,7 @@ extern "C"
...
@@ -101,6 +101,7 @@ extern "C"
#define CONFIG_HLP_NFAPI "Change the nFAPI mode for NR\n"
#define CONFIG_HLP_NFAPI "Change the nFAPI mode for NR\n"
#define CONFIG_L1_EMULATOR "Run in L1 emulated mode (disable PHY layer)\n"
#define CONFIG_L1_EMULATOR "Run in L1 emulated mode (disable PHY layer)\n"
#define CONFIG_HLP_CONTINUOUS_TX "perform continuous transmission, even in TDD mode (to work around USRP issues)\n"
#define CONFIG_HLP_CONTINUOUS_TX "perform continuous transmission, even in TDD mode (to work around USRP issues)\n"
#define CONFIG_HLP_STATS_DISABLE "disable globally the stats generation and persistence"
/*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
/*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
/* command line parameters common to eNodeB and UE */
/* command line parameters common to eNodeB and UE */
...
@@ -171,6 +172,7 @@ extern int usrp_tx_thread;
...
@@ -171,6 +172,7 @@ extern int usrp_tx_thread;
{"non-stop", CONFIG_HLP_NONSTOP, PARAMFLAG_BOOL, iptr:&NON_STOP, defintval:0, TYPE_INT, 0}, \
{"non-stop", CONFIG_HLP_NONSTOP, PARAMFLAG_BOOL, iptr:&NON_STOP, defintval:0, TYPE_INT, 0}, \
{"emulate-l1", CONFIG_L1_EMULATOR, PARAMFLAG_BOOL, iptr:&EMULATE_L1, defintval:0, TYPE_INT, 0}, \
{"emulate-l1", CONFIG_L1_EMULATOR, PARAMFLAG_BOOL, iptr:&EMULATE_L1, defintval:0, TYPE_INT, 0}, \
{"continuous-tx", CONFIG_HLP_CONTINUOUS_TX,PARAMFLAG_BOOL, iptr:&CONTINUOUS_TX, defintval:0, TYPE_INT, 0}, \
{"continuous-tx", CONFIG_HLP_CONTINUOUS_TX,PARAMFLAG_BOOL, iptr:&CONTINUOUS_TX, defintval:0, TYPE_INT, 0}, \
{"disable-stats", CONFIG_HLP_STATS_DISABLE, PARAMFLAG_BOOL, iptr:&stats_disabled, defintval:0, TYPE_INT, 0}, \
}
}
#define CONFIG_HLP_NSA "Enable NSA mode \n"
#define CONFIG_HLP_NSA "Enable NSA mode \n"
...
@@ -217,6 +219,7 @@ extern int usrp_tx_thread;
...
@@ -217,6 +219,7 @@ extern int usrp_tx_thread;
#define SOFTMODEM_GNB_BIT (1<<21)
#define SOFTMODEM_GNB_BIT (1<<21)
#define SOFTMODEM_4GUE_BIT (1<<22)
#define SOFTMODEM_4GUE_BIT (1<<22)
#define SOFTMODEM_5GUE_BIT (1<<23)
#define SOFTMODEM_5GUE_BIT (1<<23)
#define SOFTMODEM_NOSTATS_BIT (1<<24)
#define SOFTMODEM_FUNC_BITS (SOFTMODEM_ENB_BIT | SOFTMODEM_GNB_BIT | SOFTMODEM_5GUE_BIT | SOFTMODEM_4GUE_BIT)
#define SOFTMODEM_FUNC_BITS (SOFTMODEM_ENB_BIT | SOFTMODEM_GNB_BIT | SOFTMODEM_5GUE_BIT | SOFTMODEM_4GUE_BIT)
#define MAPPING_SOFTMODEM_FUNCTIONS {{"enb",SOFTMODEM_ENB_BIT},{"gnb",SOFTMODEM_GNB_BIT},{"4Gue",SOFTMODEM_4GUE_BIT},{"5Gue",SOFTMODEM_5GUE_BIT}}
#define MAPPING_SOFTMODEM_FUNCTIONS {{"enb",SOFTMODEM_ENB_BIT},{"gnb",SOFTMODEM_GNB_BIT},{"4Gue",SOFTMODEM_4GUE_BIT},{"5Gue",SOFTMODEM_5GUE_BIT}}
...
@@ -234,6 +237,7 @@ extern int usrp_tx_thread;
...
@@ -234,6 +237,7 @@ extern int usrp_tx_thread;
#define IS_SOFTMODEM_GNB_BIT ( get_softmodem_optmask() & SOFTMODEM_GNB_BIT)
#define IS_SOFTMODEM_GNB_BIT ( get_softmodem_optmask() & SOFTMODEM_GNB_BIT)
#define IS_SOFTMODEM_4GUE_BIT ( get_softmodem_optmask() & SOFTMODEM_4GUE_BIT)
#define IS_SOFTMODEM_4GUE_BIT ( get_softmodem_optmask() & SOFTMODEM_4GUE_BIT)
#define IS_SOFTMODEM_5GUE_BIT ( get_softmodem_optmask() & SOFTMODEM_5GUE_BIT)
#define IS_SOFTMODEM_5GUE_BIT ( get_softmodem_optmask() & SOFTMODEM_5GUE_BIT)
#define IS_SOFTMODEM_NOSTATS_BIT ( get_softmodem_optmask() & SOFTMODEM_NOSTATS_BIT)
typedef
struct
{
typedef
struct
{
uint64_t
optmask
;
uint64_t
optmask
;
...
...
openair2/LAYER2/NR_MAC_gNB/main.c
View file @
c5b8fa54
...
@@ -211,8 +211,8 @@ void mac_top_init_gNB(void)
...
@@ -211,8 +211,8 @@ void mac_top_init_gNB(void)
RC
.
nrmac
[
i
]
->
pre_processor_dl
=
nr_init_fr1_dlsch_preprocessor
(
i
,
0
);
RC
.
nrmac
[
i
]
->
pre_processor_dl
=
nr_init_fr1_dlsch_preprocessor
(
i
,
0
);
RC
.
nrmac
[
i
]
->
pre_processor_ul
=
nr_init_fr1_ulsch_preprocessor
(
i
,
0
);
RC
.
nrmac
[
i
]
->
pre_processor_ul
=
nr_init_fr1_ulsch_preprocessor
(
i
,
0
);
}
}
pthread_create
(
&
RC
.
nrmac
[
i
]
->
stats_thread
,
NULL
,
nrmac_stats_thread
,(
void
*
)
RC
.
nrmac
[
i
]);
if
(
!
IS_SOFTMODEM_NOSTATS_BIT
)
pthread_create
(
&
RC
.
nrmac
[
i
]
->
stats_thread
,
NULL
,
nrmac_stats_thread
,
(
void
*
)
RC
.
nrmac
[
i
]);
}
//END for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
}
//END for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
AssertFatal
(
rlc_module_init
(
1
)
==
0
,
"Could not initialize RLC layer
\n
"
);
AssertFatal
(
rlc_module_init
(
1
)
==
0
,
"Could not initialize RLC layer
\n
"
);
...
...
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