Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CostmapLayer::matchSize may be executed concurrently #3250

Merged
merged 14 commits into from
Oct 24, 2022
Merged

CostmapLayer::matchSize may be executed concurrently #3250

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
950d76c
odom alpha restriction
Cryst4L9527 Oct 11, 2022
b673938
odom alpha code style
Cryst4L9527 Oct 11, 2022
ec5adb5
odom alpha code style
Cryst4L9527 Oct 11, 2022
d639b1a
odom alpha code style
Cryst4L9527 Oct 11, 2022
a457fd5
Merge branch 'ros-planning:main' into main
Cryst4L9527 Oct 12, 2022
1c0827d
map-size restriction
Cryst4L9527 Oct 12, 2022
b5ee0b5
Merge branch 'main' of https://github.com/Cryst4L9527/navigation2 int…
Cryst4L9527 Oct 12, 2022
2005e28
map-size code style
Cryst4L9527 Oct 12, 2022
79ecfb0
map-size rejection
Cryst4L9527 Oct 13, 2022
e8d73d5
map-size codestyle
Cryst4L9527 Oct 13, 2022
44c7dbf
map-size return false
Cryst4L9527 Oct 14, 2022
40bc9f8
Merge branch 'ros-planning:main' into main
Cryst4L9527 Oct 20, 2022
1816a62
CostmapLayer::matchSize() add a mutex
Cryst4L9527 Oct 20, 2022
e112a49
Merge branch 'main' of https://github.com/Cryst4L9527/navigation2 int…
Cryst4L9527 Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nav2_costmap_2d/src/costmap_layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ void CostmapLayer::touch(

void CostmapLayer::matchSize()
{
std::lock_guard<Costmap2D::mutex_t> guard(*getMutex());
Costmap2D * master = layered_costmap_->getCostmap();
resizeMap(
master->getSizeInCellsX(), master->getSizeInCellsY(), master->getResolution(),
Expand Down