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
lizhongxiao
OpenXG-RAN
Commits
99a42273
Commit
99a42273
authored
Sep 10, 2023
by
Jerome Peraldi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug #129248 [L3 SIMU] being able to launch CI without root rights: RAN 4G can...
parent
1426fd81
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
common/utils/system.c
common/utils/system.c
+5
-0
common/utils/utils.c
common/utils/utils.c
+5
-2
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+2
-1
No files found.
common/utils/system.c
View file @
99a42273
...
@@ -228,7 +228,12 @@ int rt_sleep_ns (uint64_t x)
...
@@ -228,7 +228,12 @@ int rt_sleep_ns (uint64_t x)
void
threadCreate
(
pthread_t
*
t
,
void
*
(
*
func
)(
void
*
),
void
*
param
,
char
*
name
,
int
affinity
,
int
priority
){
void
threadCreate
(
pthread_t
*
t
,
void
*
(
*
func
)(
void
*
),
void
*
param
,
char
*
name
,
int
affinity
,
int
priority
){
pthread_attr_t
attr
;
pthread_attr_t
attr
;
int
ret
;
int
ret
;
//To not impact HW TTCN setup with USRP, best is to keep OAI thread configuration with RT
#ifndef OAI_USRP
int
settingPriority
=
0
;
#else
int
settingPriority
=
1
;
int
settingPriority
=
1
;
#endif
ret
=
pthread_attr_init
(
&
attr
);
ret
=
pthread_attr_init
(
&
attr
);
AssertFatal
(
ret
==
0
,
"ret: %d, errno: %d
\n
"
,
ret
,
errno
);
AssertFatal
(
ret
==
0
,
"ret: %d, errno: %d
\n
"
,
ret
,
errno
);
...
...
common/utils/utils.c
View file @
99a42273
...
@@ -7,8 +7,6 @@
...
@@ -7,8 +7,6 @@
#include <errno.h>
#include <errno.h>
#include "utils.h"
#include "utils.h"
const
char
*
hexdump
(
const
void
*
data
,
size_t
data_len
,
char
*
out
,
size_t
out_len
)
const
char
*
hexdump
(
const
void
*
data
,
size_t
data_len
,
char
*
out
,
size_t
out_len
)
{
{
char
*
p
=
out
;
char
*
p
=
out
;
...
@@ -127,6 +125,10 @@ void *memcpy1(void *dst,const void *src,size_t n) {
...
@@ -127,6 +125,10 @@ void *memcpy1(void *dst,const void *src,size_t n) {
void
set_priority
(
int
priority
)
void
set_priority
(
int
priority
)
{
{
//bug 129248, to deploy our CI on any server with strong security constraints (no possibility to be root)
// for USRP setup we can be root and let's not modify priority behaviour
// sched_setscheduler could be used potentially in the same way than TTCN simu as we don't have any constraints on performances
#ifdef OAI_USRP
struct
sched_param
param
=
struct
sched_param
param
=
{
{
.
sched_priority
=
priority
,
.
sched_priority
=
priority
,
...
@@ -137,4 +139,5 @@ void set_priority(int priority)
...
@@ -137,4 +139,5 @@ void set_priority(int priority)
fprintf
(
stderr
,
"sched_setscheduler: %s
\n
"
,
strerror
(
errno
));
fprintf
(
stderr
,
"sched_setscheduler: %s
\n
"
,
strerror
(
errno
));
abort
();
abort
();
}
}
#endif
}
}
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
99a42273
...
@@ -2654,6 +2654,7 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask, int id) {
...
@@ -2654,6 +2654,7 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask, int id) {
((
LINK_ENB_PDCP_TO_GTPV1U
)
?
"usegtp"
:
""
),
((
LINK_ENB_PDCP_TO_GTPV1U
)
?
"usegtp"
:
""
),
((
PDCP_USE_NETLINK
)
?
"usenetlink"
:
""
));
((
PDCP_USE_NETLINK
)
?
"usenetlink"
:
""
));
if
(
RC
.
ss
.
mode
<
SS_SOFTMODEM
)
{
if
(
PDCP_USE_NETLINK
)
{
if
(
PDCP_USE_NETLINK
)
{
nas_getparams
();
nas_getparams
();
...
@@ -2686,7 +2687,7 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask, int id) {
...
@@ -2686,7 +2687,7 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask, int id) {
}
else
}
else
LOG_E
(
PDCP
,
"ENB pdcp will not use tun interface
\n
"
);
LOG_E
(
PDCP
,
"ENB pdcp will not use tun interface
\n
"
);
}
}
}
pthread_create
(
&
pdcp_stats_thread_desc
,
NULL
,
pdcp_stats_thread
,
NULL
);
pthread_create
(
&
pdcp_stats_thread_desc
,
NULL
,
pdcp_stats_thread
,
NULL
);
return
pdcp_params
.
optmask
;
return
pdcp_params
.
optmask
;
...
...
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