Skip to content

Fix race condition in TreeSupportBaseCircle which may sometimes cause a crash #2210

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

Merged
rburema merged 3 commits into from
Apr 16, 2025
Merged

Fix race condition in TreeSupportBaseCircle which may sometimes cause a crash #2210

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0281390
Fix race condition sometimes causing a crash
ThomasRahm Mar 10, 2025
5a74ed4
Use call_once instead of locking in TreeSupportBaseCircle
ThomasRahm Mar 12, 2025
58589a8
Merge branch 'main' into tree-support-base-circle-race-condition-fix
rburema Apr 16, 2025
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
38 changes: 14 additions & 24 deletions include/TreeSupportBaseCircle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,27 @@ class TreeSupportBaseCircle
{
protected:
inline static Polygon base_circle;
inline static bool circle_generated = false;
inline static std::once_flag flag;

public:
inline static constexpr int64_t base_radius = 50;

static Polygon getBaseCircle()
{
if (circle_generated)
{
return base_circle;
}
else
{
std::mutex critical_sections;
std::lock_guard<std::mutex> critical_section_progress(critical_sections);
if (circle_generated)
std::call_once(
flag,
[&]()
{
return base_circle;
}

constexpr auto support_tree_circle_resolution = 12; // The number of vertices in each circle.
Polygon circle;
for (const uint64_t i : ranges::views::iota(0, support_tree_circle_resolution))
{
const AngleRadians angle = static_cast<double>(i) / support_tree_circle_resolution * TAU;
circle.emplace_back(static_cast<coord_t>(std::cos(angle) * base_radius), static_cast<coord_t>(std::sin(angle) * base_radius));
}
base_circle = Polygon(circle);
circle_generated = true;
return base_circle;
}
constexpr auto support_tree_circle_resolution = 12; // The number of vertices in each circle.
Polygon circle;
for (const uint64_t i : ranges::views::iota(0, support_tree_circle_resolution))
{
const AngleRadians angle = static_cast<double>(i) / support_tree_circle_resolution * TAU;
circle.emplace_back(static_cast<coord_t>(std::cos(angle) * base_radius), static_cast<coord_t>(std::sin(angle) * base_radius));
}
base_circle = Polygon(circle);
});
return base_circle;
}
};

Expand Down
Loading