Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
210910794
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2021
210910794
Commits
fc9db9c6
Commit
fc9db9c6
authored
5 years ago
by
Matthew Hansen
Committed by
Matt Hansen
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix rviz panel thread race condition
parent
a095038d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
nav2_rviz_plugins/include/nav2_rviz_plugins/nav2_panel.hpp
+4
-0
4 additions, 0 deletions
nav2_rviz_plugins/include/nav2_rviz_plugins/nav2_panel.hpp
nav2_rviz_plugins/src/nav2_panel.cpp
+14
-6
14 additions, 6 deletions
nav2_rviz_plugins/src/nav2_panel.cpp
with
18 additions
and
6 deletions
nav2_rviz_plugins/include/nav2_rviz_plugins/nav2_panel.hpp
+
4
−
0
View file @
fc9db9c6
...
@@ -35,6 +35,8 @@ class QPushButton;
...
@@ -35,6 +35,8 @@ class QPushButton;
namespace
nav2_rviz_plugins
namespace
nav2_rviz_plugins
{
{
class
InitialThread
;
/// Panel to interface to the nav2 stack
/// Panel to interface to the nav2 stack
class
Nav2Panel
:
public
rviz_common
::
Panel
class
Nav2Panel
:
public
rviz_common
::
Panel
{
{
...
@@ -51,6 +53,7 @@ public:
...
@@ -51,6 +53,7 @@ public:
void
save
(
rviz_common
::
Config
config
)
const
override
;
void
save
(
rviz_common
::
Config
config
)
const
override
;
private
Q_SLOTS
:
private
Q_SLOTS
:
void
startThread
();
void
onStartup
();
void
onStartup
();
void
onShutdown
();
void
onShutdown
();
void
onCancel
();
void
onCancel
();
...
@@ -87,6 +90,7 @@ private:
...
@@ -87,6 +90,7 @@ private:
QPushButton
*
pause_resume_button_
{
nullptr
};
QPushButton
*
pause_resume_button_
{
nullptr
};
QStateMachine
state_machine_
;
QStateMachine
state_machine_
;
InitialThread
*
initial_thread_
;
QState
*
pre_initial_
{
nullptr
};
QState
*
pre_initial_
{
nullptr
};
QState
*
initial_
{
nullptr
};
QState
*
initial_
{
nullptr
};
...
...
This diff is collapsed.
Click to expand it.
nav2_rviz_plugins/src/nav2_panel.cpp
+
14
−
6
View file @
fc9db9c6
...
@@ -136,15 +136,15 @@ Nav2Panel::Nav2Panel(QWidget * parent)
...
@@ -136,15 +136,15 @@ Nav2Panel::Nav2Panel(QWidget * parent)
runningTransition
->
setTargetState
(
idle_
);
runningTransition
->
setTargetState
(
idle_
);
running_
->
addTransition
(
runningTransition
);
running_
->
addTransition
(
runningTransition
);
InitialThread
*
initial
T
hread
=
new
InitialThread
(
client_
);
initial
_t
hread
_
=
new
InitialThread
(
client_
);
connect
(
initial
T
hread
,
&
InitialThread
::
finished
,
initial
T
hread
,
&
QObject
::
deleteLater
);
connect
(
initial
_t
hread
_
,
&
InitialThread
::
finished
,
initial
_t
hread
_
,
&
QObject
::
deleteLater
);
QSignalTransition
*
activeSignal
=
new
QSignalTransition
(
initial
T
hread
,
QSignalTransition
*
activeSignal
=
new
QSignalTransition
(
initial
_t
hread
_
,
&
InitialThread
::
activeSystem
);
&
InitialThread
::
activeSystem
);
activeSignal
->
setTargetState
(
idle_
);
activeSignal
->
setTargetState
(
idle_
);
pre_initial_
->
addTransition
(
activeSignal
);
pre_initial_
->
addTransition
(
activeSignal
);
QSignalTransition
*
inactiveSignal
=
new
QSignalTransition
(
initial
T
hread
,
QSignalTransition
*
inactiveSignal
=
new
QSignalTransition
(
initial
_t
hread
_
,
&
InitialThread
::
inactiveSystem
);
&
InitialThread
::
inactiveSystem
);
inactiveSignal
->
setTargetState
(
initial_
);
inactiveSignal
->
setTargetState
(
initial_
);
pre_initial_
->
addTransition
(
inactiveSignal
);
pre_initial_
->
addTransition
(
inactiveSignal
);
...
@@ -161,6 +161,9 @@ Nav2Panel::Nav2Panel(QWidget * parent)
...
@@ -161,6 +161,9 @@ Nav2Panel::Nav2Panel(QWidget * parent)
state_machine_
.
setInitialState
(
pre_initial_
);
state_machine_
.
setInitialState
(
pre_initial_
);
state_machine_
.
start
();
state_machine_
.
start
();
// delay starting initial thread until state machine has started or a race occurs
QObject
::
connect
(
&
state_machine_
,
SIGNAL
(
started
()),
this
,
SLOT
(
startThread
()));
// Lay out the items in the panel
// Lay out the items in the panel
QVBoxLayout
*
main_layout
=
new
QVBoxLayout
;
QVBoxLayout
*
main_layout
=
new
QVBoxLayout
;
main_layout
->
addWidget
(
pause_resume_button_
);
main_layout
->
addWidget
(
pause_resume_button_
);
...
@@ -178,8 +181,6 @@ Nav2Panel::Nav2Panel(QWidget * parent)
...
@@ -178,8 +181,6 @@ Nav2Panel::Nav2Panel(QWidget * parent)
QObject
::
connect
(
&
GoalUpdater
,
SIGNAL
(
updateGoal
(
double
,
double
,
double
,
QString
)),
// NOLINT
QObject
::
connect
(
&
GoalUpdater
,
SIGNAL
(
updateGoal
(
double
,
double
,
double
,
QString
)),
// NOLINT
this
,
SLOT
(
onNewGoal
(
double
,
double
,
double
,
QString
)));
// NOLINT
this
,
SLOT
(
onNewGoal
(
double
,
double
,
double
,
QString
)));
// NOLINT
initialThread
->
start
();
}
}
Nav2Panel
::~
Nav2Panel
()
Nav2Panel
::~
Nav2Panel
()
...
@@ -192,6 +193,13 @@ Nav2Panel::onInitialize()
...
@@ -192,6 +193,13 @@ Nav2Panel::onInitialize()
auto
node
=
getDisplayContext
()
->
getRosNodeAbstraction
().
lock
()
->
get_raw_node
();
auto
node
=
getDisplayContext
()
->
getRosNodeAbstraction
().
lock
()
->
get_raw_node
();
}
}
void
Nav2Panel
::
startThread
()
{
// start initial thread now that state machine is started
initial_thread_
->
start
();
}
void
void
Nav2Panel
::
onPause
()
Nav2Panel
::
onPause
()
{
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment