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
d745cd1f
Commit
d745cd1f
authored
Nov 24, 2022
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/fixes-ci' into integration_2022_wk47
parents
da90e997
1dc45423
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
16 deletions
+16
-16
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
...onf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
+2
-2
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
...pts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+4
-5
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
...nf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
+4
-4
ci-scripts/datalog_rt_stats.2x2.yaml
ci-scripts/datalog_rt_stats.2x2.yaml
+1
-1
ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
+2
-1
ci-scripts/xml_files/fr1_sa_quectel.xml
ci-scripts/xml_files/fr1_sa_quectel.xml
+2
-2
common/utils/threadPool/thread-pool.h
common/utils/threadPool/thread-pool.h
+1
-1
No files found.
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
View file @
d745cd1f
...
...
@@ -211,8 +211,8 @@ MACRLCs = (
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
pusch_TargetSNRx10
=
2
5
0
;
pucch_TargetSNRx10
=
2
5
0
;
pusch_TargetSNRx10
=
2
2
0
;
pucch_TargetSNRx10
=
2
2
0
;
ulsch_max_frame_inactivity
=
10
;
}
);
...
...
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
View file @
d745cd1f
...
...
@@ -25,7 +25,6 @@ gNBs =
pdsch_AntennaPorts_XP
=
2
;
pusch_AntennaPorts
=
2
;
ul_prbblacklist
=
"51,52,53,54"
do_SRS
=
1
;
pdcch_ConfigSIB1
= (
...
...
@@ -210,8 +209,8 @@ MACRLCs = (
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
# pusch_TargetSNRx10 = 20
0;
# pucch_TargetSNRx10 = 15
0;
pusch_TargetSNRx10
=
22
0
;
pucch_TargetSNRx10
=
20
0
;
ulsch_max_frame_inactivity
=
0
;
}
);
...
...
@@ -220,7 +219,7 @@ L1s = (
{
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
prach_dtx_threshold
=
1
2
0
;
prach_dtx_threshold
=
1
5
0
;
# pucch0_dtx_threshold = 150;
}
);
...
...
@@ -234,7 +233,7 @@ RUs = (
att_rx
=
0
;
bands
= [
78
];
max_pdschReferenceSignalPower
= -
27
;
max_rxgain
=
75
;
max_rxgain
=
68
;
eNB_instances
= [
0
];
##beamforming 1x2 matrix: 1 layer x 2 antennas
bf_weights
= [
0
x00007fff
,
0
x0000
];
...
...
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
View file @
d745cd1f
...
...
@@ -209,8 +209,8 @@ MACRLCs = (
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
# pusch_TargetSNRx10 = 20
0;
# pucch_TargetSNRx10 = 15
0;
pusch_TargetSNRx10
=
22
0
;
pucch_TargetSNRx10
=
20
0
;
ulsch_max_frame_inactivity
=
0
;
}
);
...
...
@@ -219,7 +219,7 @@ L1s = (
{
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
prach_dtx_threshold
=
1
2
0
;
prach_dtx_threshold
=
1
5
0
;
# pucch0_dtx_threshold = 150;
}
);
...
...
@@ -233,7 +233,7 @@ RUs = (
att_rx
=
0
;
bands
= [
78
];
max_pdschReferenceSignalPower
= -
27
;
max_rxgain
=
75
;
max_rxgain
=
68
;
eNB_instances
= [
0
];
##beamforming 1x2 matrix: 1 layer x 2 antennas
bf_weights
= [
0
x00007fff
,
0
x0000
];
...
...
ci-scripts/datalog_rt_stats.2x2.yaml
View file @
d745cd1f
...
...
@@ -8,7 +8,7 @@ ColNames :
-
Average vs Reference Deviation (Reference Value; Acceptability Threshold)
Ref
:
feprx
:
120.0
feptx_prec
:
16
.0
feptx_prec
:
30
.0
feptx_ofdm
:
50.0
feptx_total
:
120.0
L1 Tx processing
:
300.0
...
...
ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
View file @
d745cd1f
...
...
@@ -45,7 +45,7 @@
<testCase
id=
"040000"
>
<class>
Initialize_eNB
</class>
<desc>
Initialize gNB
</desc>
<Initialize_eNB_args>
-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --log_config.global_log_options level,nocolor,time
</Initialize_eNB_args>
<Initialize_eNB_args>
-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --
thread-pool 1,3,5,7,9,11,13,15 --
log_config.global_log_options level,nocolor,time
</Initialize_eNB_args>
<eNB_instance>
0
</eNB_instance>
<eNB_serverId>
0
</eNB_serverId>
<air_interface>
nr
</air_interface>
...
...
@@ -53,6 +53,7 @@
<eNB_Stats>
yes
</eNB_Stats>
<rt_stats_cfg>
datalog_rt_stats.2x2.yaml
</rt_stats_cfg>
<USRP_IPAddress>
172.21.19.14
</USRP_IPAddress>
<cmd_prefix>
numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0
</cmd_prefix>
</testCase>
<testCase
id=
"050000"
>
...
...
ci-scripts/xml_files/fr1_sa_quectel.xml
View file @
d745cd1f
...
...
@@ -119,8 +119,8 @@
<testCase
id=
"070001"
>
<class>
Iperf
</class>
<desc>
iperf (UL/
3
Mbps/UDP)(60 sec)(single-ue profile)
</desc>
<iperf_args>
-u -b
3
M -t 60
</iperf_args>
<desc>
iperf (UL/
7
Mbps/UDP)(60 sec)(single-ue profile)
</desc>
<iperf_args>
-u -b
7
M -t 60
</iperf_args>
<direction>
UL
</direction>
<id>
nrmodule2_quectel
</id>
<iperf_packetloss_threshold>
5
</iperf_packetloss_threshold>
...
...
common/utils/threadPool/thread-pool.h
View file @
d745cd1f
...
...
@@ -237,7 +237,7 @@ static inline void abortNotifiedFIFO(notifiedFIFO_t *nf) {
if
(
nf
->
outF
==
NULL
)
nf
->
inF
=
NULL
;
mutexunlock
(
nf
->
lockF
);
cond
signal
(
nf
->
notifF
);
cond
broadcast
(
nf
->
notifF
);
}
struct
one_thread
{
...
...
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