Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
849816a5
Commit
849816a5
authored
Feb 22, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/second_pass_on_cppcheck' into develop_integration_2019_w08
parents
81821652
dbde581b
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
68 additions
and
14 deletions
+68
-14
ci-scripts/buildOnVM.sh
ci-scripts/buildOnVM.sh
+12
-5
ci-scripts/cppcheck_suppressions.list
ci-scripts/cppcheck_suppressions.list
+9
-0
ci-scripts/createVM.sh
ci-scripts/createVM.sh
+31
-0
ci-scripts/runTestOnVM.sh
ci-scripts/runTestOnVM.sh
+8
-1
common/utils/T/tracer/gui/notify.c
common/utils/T/tracer/gui/notify.c
+1
-1
common/utils/T/tracer/textlog.c
common/utils/T/tracer/textlog.c
+3
-0
common/utils/T/tracer/utils.c
common/utils/T/tracer/utils.c
+1
-1
openair1/PHY/TOOLS/lte_phy_scope_tm4.c
openair1/PHY/TOOLS/lte_phy_scope_tm4.c
+0
-3
openair3/S1AP/s1ap_eNB_trace.c
openair3/S1AP/s1ap_eNB_trace.c
+1
-1
openair3/TEST/EPC_TEST/generate_scenario.c
openair3/TEST/EPC_TEST/generate_scenario.c
+1
-1
openair3/TEST/EPC_TEST/play_scenario.c
openair3/TEST/EPC_TEST/play_scenario.c
+1
-1
No files found.
ci-scripts/buildOnVM.sh
View file @
849816a5
...
@@ -94,14 +94,21 @@ function build_on_vm {
...
@@ -94,14 +94,21 @@ function build_on_vm {
echo
"############################################################"
echo
"############################################################"
echo
"Creating VM (
$VM_NAME
) on Ubuntu Cloud Image base"
echo
"Creating VM (
$VM_NAME
) on Ubuntu Cloud Image base"
echo
"############################################################"
echo
"############################################################"
acquire_vm_create_lock
uvt-kvm create
$VM_NAME
release
=
xenial
--memory
$VM_MEMORY
--cpu
$VM_CPU
--unsafe-caching
--template
ci-scripts/template-host.xml
uvt-kvm create
$VM_NAME
release
=
xenial
--memory
$VM_MEMORY
--cpu
$VM_CPU
--unsafe-caching
--template
ci-scripts/template-host.xml
fi
echo
"Waiting for VM to be started"
uvt-kvm
wait
$VM_NAME
--insecure
VM_IP_ADDR
=
`
uvt-kvm ip
$VM_NAME
`
echo
"
$VM_NAME
has for IP addr =
$VM_IP_ADDR
"
release_vm_create_lock
else
echo
"Waiting for VM to be started"
echo
"Waiting for VM to be started"
uvt-kvm
wait
$VM_NAME
--insecure
uvt-kvm
wait
$VM_NAME
--insecure
VM_IP_ADDR
=
`
uvt-kvm ip
$VM_NAME
`
VM_IP_ADDR
=
`
uvt-kvm ip
$VM_NAME
`
echo
"
$VM_NAME
has for IP addr =
$VM_IP_ADDR
"
echo
"
$VM_NAME
has for IP addr =
$VM_IP_ADDR
"
fi
echo
"############################################################"
echo
"############################################################"
echo
"Copying GIT repo into VM (
$VM_NAME
)"
echo
"Copying GIT repo into VM (
$VM_NAME
)"
...
...
ci-scripts/cppcheck_suppressions.list
View file @
849816a5
...
@@ -67,6 +67,15 @@ syntaxError:openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
...
@@ -67,6 +67,15 @@ syntaxError:openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
// omg, otg commented out in cmakelist to be cleaned up definitely?
// omg, otg commented out in cmakelist to be cleaned up definitely?
arrayIndexOutOfBounds:openair2/UTIL/OMG/omg.c
arrayIndexOutOfBounds:openair2/UTIL/OMG/omg.c
uninitvar:openair2/UTIL/OTG/otg_rx_socket.c
uninitvar:openair2/UTIL/OTG/otg_rx_socket.c
//-----------------------------------------------------------------------------
// cppcheck is not able to understand that buf is initialized at the first
// iteration of the loop.
nullPointer:common/utils/T/local_tracer.c:243
//-----------------------------------------------------------------------------
// once again cppcheck is not to understand that fds is initialized in the
// first iteration of the loop
nullPointer:common/utils/T/tracer/multi.c:264
nullPointer:common/utils/T/tracer/multi.c:265
//
//
//*****************************************************************************
//*****************************************************************************
//
//
...
...
ci-scripts/createVM.sh
View file @
849816a5
...
@@ -49,6 +49,35 @@ function create_usage {
...
@@ -49,6 +49,35 @@ function create_usage {
echo
""
echo
""
}
}
function
acquire_vm_create_lock
{
local
FlockFile
=
"/tmp/vmclone.lck"
local
unlocked
=
"0"
touch
${
FlockFile
}
2>/dev/null
if
[[
$?
-ne
0
]]
then
echo
"Cannot access lock file
${
FlockFile
}
"
exit
2
fi
while
[
$unlocked
-eq
0
]
do
exec
5>
${
FlockFile
}
flock
-nx
5
if
[[
$?
-ne
0
]]
then
echo
"Another instance of VM creation is running"
sleep
10
else
unlocked
=
"1"
fi
done
chmod
666
${
FlockFile
}
2>/dev/null
}
function
release_vm_create_lock
{
local
FlockFile
=
"/tmp/vmclone.lck"
rm
-Rf
${
FlockFile
}
}
function
create_vm
{
function
create_vm
{
echo
"############################################################"
echo
"############################################################"
echo
"OAI CI VM script"
echo
"OAI CI VM script"
...
@@ -60,10 +89,12 @@ function create_vm {
...
@@ -60,10 +89,12 @@ function create_vm {
echo
"############################################################"
echo
"############################################################"
echo
"Creating VM (
$VM_NAME
) on Ubuntu Cloud Image base"
echo
"Creating VM (
$VM_NAME
) on Ubuntu Cloud Image base"
echo
"############################################################"
echo
"############################################################"
acquire_vm_create_lock
uvt-kvm create
$VM_NAME
release
=
xenial
--memory
$VM_MEMORY
--cpu
$VM_CPU
--unsafe-caching
--template
ci-scripts/template-host.xml
uvt-kvm create
$VM_NAME
release
=
xenial
--memory
$VM_MEMORY
--cpu
$VM_CPU
--unsafe-caching
--template
ci-scripts/template-host.xml
echo
"Waiting for VM to be started"
echo
"Waiting for VM to be started"
uvt-kvm
wait
$VM_NAME
--insecure
uvt-kvm
wait
$VM_NAME
--insecure
VM_IP_ADDR
=
`
uvt-kvm ip
$VM_NAME
`
VM_IP_ADDR
=
`
uvt-kvm ip
$VM_NAME
`
echo
"
$VM_NAME
has for IP addr =
$VM_IP_ADDR
"
echo
"
$VM_NAME
has for IP addr =
$VM_IP_ADDR
"
release_vm_create_lock
}
}
ci-scripts/runTestOnVM.sh
View file @
849816a5
...
@@ -317,11 +317,18 @@ function install_epc_on_vm {
...
@@ -317,11 +317,18 @@ function install_epc_on_vm {
echo
"############################################################"
echo
"############################################################"
echo
"Creating test EPC VM (
$LOC_EPC_VM_NAME
) on Ubuntu Cloud Image base"
echo
"Creating test EPC VM (
$LOC_EPC_VM_NAME
) on Ubuntu Cloud Image base"
echo
"############################################################"
echo
"############################################################"
acquire_vm_create_lock
uvt-kvm create
$LOC_EPC_VM_NAME
release
=
xenial
--unsafe-caching
uvt-kvm create
$LOC_EPC_VM_NAME
release
=
xenial
--unsafe-caching
echo
"Waiting for VM to be started"
uvt-kvm
wait
$LOC_EPC_VM_NAME
--insecure
release_vm_create_lock
else
echo
"Waiting for VM to be started"
uvt-kvm
wait
$LOC_EPC_VM_NAME
--insecure
fi
fi
uvt-kvm
wait
$LOC_EPC_VM_NAME
--insecure
local
LOC_EPC_VM_IP_ADDR
=
`
uvt-kvm ip
$LOC_EPC_VM_NAME
`
local
LOC_EPC_VM_IP_ADDR
=
`
uvt-kvm ip
$LOC_EPC_VM_NAME
`
echo
"
$LOC_EPC_VM_NAME
has for IP addr =
$LOC_EPC_VM_IP_ADDR
"
echo
"
$LOC_EPC_VM_NAME
has for IP addr =
$LOC_EPC_VM_IP_ADDR
"
scp
-o
StrictHostKeyChecking
=
no /etc/apt/apt.conf.d/01proxy ubuntu@
$LOC_EPC_VM_IP_ADDR
:/home/ubuntu
scp
-o
StrictHostKeyChecking
=
no /etc/apt/apt.conf.d/01proxy ubuntu@
$LOC_EPC_VM_IP_ADDR
:/home/ubuntu
...
...
common/utils/T/tracer/gui/notify.c
View file @
849816a5
...
@@ -46,7 +46,7 @@ void unregister_notifier(gui *_g, unsigned long notifier_id) {
...
@@ -46,7 +46,7 @@ void unregister_notifier(gui *_g, unsigned long notifier_id) {
if
(
g
->
notifiers
[
i
].
id
==
notifier_id
)
break
;
if
(
g
->
notifiers
[
i
].
id
==
notifier_id
)
break
;
if
(
i
==
g
->
notifiers_count
)
if
(
i
==
g
->
notifiers_count
)
ERR
(
"%s:%d: notifier_id %l
d
not found
\n
"
,
__FILE__
,
__LINE__
,
notifier_id
);
ERR
(
"%s:%d: notifier_id %l
u
not found
\n
"
,
__FILE__
,
__LINE__
,
notifier_id
);
free
(
g
->
notifiers
[
i
].
notification
);
free
(
g
->
notifiers
[
i
].
notification
);
memmove
(
g
->
notifiers
+
i
,
g
->
notifiers
+
i
+
1
,
memmove
(
g
->
notifiers
+
i
,
g
->
notifiers
+
i
+
1
,
...
...
common/utils/T/tracer/textlog.c
View file @
849816a5
...
@@ -195,5 +195,8 @@ int main(int n, char **v)
...
@@ -195,5 +195,8 @@ int main(int n, char **v)
handle_event
(
h
,
e
);
handle_event
(
h
,
e
);
}
}
free
(
on_off_name
);
free
(
on_off_action
);
return
0
;
return
0
;
}
}
common/utils/T/tracer/utils.c
View file @
849816a5
...
@@ -273,6 +273,6 @@ void PUTX2(OBUF *o, int i) {
...
@@ -273,6 +273,6 @@ void PUTX2(OBUF *o, int i) {
void
PUTUL
(
OBUF
*
o
,
unsigned
long
l
)
{
void
PUTUL
(
OBUF
*
o
,
unsigned
long
l
)
{
char
s
[
128
];
char
s
[
128
];
sprintf
(
s
,
"%l
d
"
,
l
);
sprintf
(
s
,
"%l
u
"
,
l
);
PUTS
(
o
,
s
);
PUTS
(
o
,
s
);
}
}
openair1/PHY/TOOLS/lte_phy_scope_tm4.c
View file @
849816a5
...
@@ -812,9 +812,6 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
...
@@ -812,9 +812,6 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
free
(
bit1
);
free
(
bit1
);
free
(
bit_pdcch
);
free
(
bit_pdcch
);
free
(
llr_pdcch
);
free
(
llr_pdcch
);
for
(
arx
=
0
;
arx
<
nb_antennas_rx
;
arx
++
)
{
free
(
chest_t_abs
[
arx
]);
}
//This is done to avoid plotting old data when TB0 is disabled, and TB1 is mapped onto CW0
//This is done to avoid plotting old data when TB0 is disabled, and TB1 is mapped onto CW0
/*if (phy_vars_ue->transmission_mode[eNB_id]==3 && phy_vars_ue->transmission_mode[eNB_id]==4){
/*if (phy_vars_ue->transmission_mode[eNB_id]==3 && phy_vars_ue->transmission_mode[eNB_id]==4){
...
...
openair3/S1AP/s1ap_eNB_trace.c
View file @
849816a5
...
@@ -107,7 +107,7 @@ int s1ap_eNB_handle_trace_start(uint32_t assoc_id,
...
@@ -107,7 +107,7 @@ int s1ap_eNB_handle_trace_start(uint32_t assoc_id,
{
{
S1AP_TraceStart_t
*
container
;
S1AP_TraceStart_t
*
container
;
S1AP_TraceStartIEs_t
*
ie
;
S1AP_TraceStartIEs_t
*
ie
;
struct
s1ap_eNB_ue_context_s
*
ue_desc_p
;
struct
s1ap_eNB_ue_context_s
*
ue_desc_p
=
NULL
;
struct
s1ap_eNB_mme_data_s
*
mme_ref_p
;
struct
s1ap_eNB_mme_data_s
*
mme_ref_p
;
DevAssert
(
pdu
!=
NULL
);
DevAssert
(
pdu
!=
NULL
);
...
...
openair3/TEST/EPC_TEST/generate_scenario.c
View file @
849816a5
...
@@ -270,7 +270,7 @@ static void enb_config_display(void)
...
@@ -270,7 +270,7 @@ static void enb_config_display(void)
printf
(
" ENB CONFIG FILE CONTENT LOADED:
\n
"
);
printf
(
" ENB CONFIG FILE CONTENT LOADED:
\n
"
);
printf
(
"----------------------------------------------------------------------
\n
"
);
printf
(
"----------------------------------------------------------------------
\n
"
);
for
(
i
=
0
;
i
<
g_enb_properties
.
number
;
i
++
)
{
for
(
i
=
0
;
i
<
g_enb_properties
.
number
;
i
++
)
{
printf
(
"ENB CONFIG for instance %
u
:
\n\n
"
,
i
);
printf
(
"ENB CONFIG for instance %
d
:
\n\n
"
,
i
);
printf
(
"
\t
eNB name:
\t
%s
\n
"
,
g_enb_properties
.
properties
[
i
]
->
eNB_name
);
printf
(
"
\t
eNB name:
\t
%s
\n
"
,
g_enb_properties
.
properties
[
i
]
->
eNB_name
);
printf
(
"
\t
eNB ID:
\t
%"
PRIu32
"
\n
"
,
g_enb_properties
.
properties
[
i
]
->
eNB_id
);
printf
(
"
\t
eNB ID:
\t
%"
PRIu32
"
\n
"
,
g_enb_properties
.
properties
[
i
]
->
eNB_id
);
printf
(
"
\t
Cell type:
\t
%s
\n
"
,
g_enb_properties
.
properties
[
i
]
->
cell_type
==
CELL_MACRO_ENB
?
"CELL_MACRO_ENB"
:
"CELL_HOME_ENB"
);
printf
(
"
\t
Cell type:
\t
%s
\n
"
,
g_enb_properties
.
properties
[
i
]
->
cell_type
==
CELL_MACRO_ENB
?
"CELL_MACRO_ENB"
:
"CELL_HOME_ENB"
);
...
...
openair3/TEST/EPC_TEST/play_scenario.c
View file @
849816a5
...
@@ -1103,7 +1103,7 @@ et_config_parse_opt_line (
...
@@ -1103,7 +1103,7 @@ et_config_parse_opt_line (
fprintf
(
stderr
,
"Please provide a valid -D/--delay-on-exit argument, %s is not a valid value
\n
"
,
delay_on_exit
);
fprintf
(
stderr
,
"Please provide a valid -D/--delay-on-exit argument, %s is not a valid value
\n
"
,
delay_on_exit
);
exit
(
1
);
exit
(
1
);
}
}
printf
(
"Delay on exit is %
u
\n
"
,
delay_on_exit
);
printf
(
"Delay on exit is %
d
\n
"
,
(
int
)
delay_on_exit
);
}
}
break
;
break
;
...
...
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