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
8387306a
Commit
8387306a
authored
Sep 07, 2018
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
integration fix: fix bad merge conflict resolution + fix compilation error
parent
7e98a9e7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
51 deletions
+2
-51
common/utils/ocp_itti/all_msg.h
common/utils/ocp_itti/all_msg.h
+1
-0
openair2/ENB_APP/enb_app.c
openair2/ENB_APP/enb_app.c
+1
-1
openair2/ENB_APP/flexran_agent_common_internal.c
openair2/ENB_APP/flexran_agent_common_internal.c
+0
-50
No files found.
common/utils/ocp_itti/all_msg.h
View file @
8387306a
...
...
@@ -12,3 +12,4 @@
#include "openair2/COMMON/sctp_messages_def.h"
#include "openair2/COMMON/udp_messages_def.h"
#include "openair2/COMMON/gtpv1_u_messages_def.h"
#include "openair2/COMMON/flexran_messages_def.h"
openair2/ENB_APP/enb_app.c
View file @
8387306a
...
...
@@ -414,7 +414,7 @@ void handle_reconfiguration(module_id_t mod_id)
if
(
restart_L1L2
(
mod_id
)
<
0
)
{
LOG_E
(
ENB_APP
,
"can not restart, killing lte-softmodem
\n
"
);
itti_terminate_tasks
(
TASK_PHY_ENB
);
exit_fun
(
"can not restart L1L2, killing lte-softmodem"
);
return
;
}
...
...
openair2/ENB_APP/flexran_agent_common_internal.c
View file @
8387306a
...
...
@@ -31,58 +31,8 @@
#include "flexran_agent_common_internal.h"
#include "flexran_agent_mac_internal.h"
/* needed to soft-restart the lte-softmodem */
#include "targets/RT/USER/lte-softmodem.h"
#include "enb_app.h"
void
handle_reconfiguration
(
mid_t
mod_id
)
{
struct
timespec
start
,
end
;
clock_gettime
(
CLOCK_MONOTONIC
,
&
start
);
flexran_agent_info_t
*
flexran
=
RC
.
flexran
[
mod_id
];
if
(
ENB_WAIT
==
flexran
->
node_ctrl_state
)
{
/* this is already waiting, just release */
pthread_mutex_lock
(
&
flexran
->
mutex_node_ctrl
);
flexran
->
node_ctrl_state
=
ENB_NORMAL_OPERATION
;
pthread_mutex_unlock
(
&
flexran
->
mutex_node_ctrl
);
pthread_cond_signal
(
&
flexran
->
cond_node_ctrl
);
return
;
}
if
(
stop_L1L2
(
mod_id
)
<
0
)
{
LOG_E
(
ENB_APP
,
"can not stop lte-softmodem, aborting restart
\n
"
);
return
;
}
/* node_ctrl_state should have value ENB_MAKE_WAIT only if this method is not
* executed by the FlexRAN thread */
if
(
ENB_MAKE_WAIT
==
flexran
->
node_ctrl_state
)
{
LOG_I
(
ENB_APP
,
" * eNB %d: Waiting for FlexRAN RTController command *
\n
"
,
mod_id
);
pthread_mutex_lock
(
&
flexran
->
mutex_node_ctrl
);
flexran
->
node_ctrl_state
=
ENB_WAIT
;
while
(
ENB_NORMAL_OPERATION
!=
flexran
->
node_ctrl_state
)
pthread_cond_wait
(
&
flexran
->
cond_node_ctrl
,
&
flexran
->
mutex_node_ctrl
);
pthread_mutex_unlock
(
&
flexran
->
mutex_node_ctrl
);
}
if
(
restart_L1L2
(
mod_id
)
<
0
)
{
LOG_F
(
ENB_APP
,
"can not restart, killing lte-softmodem
\n
"
);
exit_fun
(
"can not restart L1L2, killing lte-softmodem"
);
return
;
}
clock_gettime
(
CLOCK_MONOTONIC
,
&
end
);
end
.
tv_sec
-=
start
.
tv_sec
;
if
(
end
.
tv_nsec
>=
start
.
tv_nsec
)
{
end
.
tv_nsec
-=
start
.
tv_nsec
;
}
else
{
end
.
tv_sec
-=
1
;
end
.
tv_nsec
=
end
.
tv_nsec
-
start
.
tv_nsec
+
1000000000
;
}
LOG_I
(
ENB_APP
,
"lte-softmodem restart succeeded in %ld.%ld s
\n
"
,
end
.
tv_sec
,
end
.
tv_nsec
/
1000000
);
}
int
apply_reconfiguration_policy
(
mid_t
mod_id
,
const
char
*
policy
,
size_t
policy_length
)
{
yaml_parser_t
parser
;
...
...
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