Skip to content

Remove overhead of TLS on river point detection #609

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove overhead of TLS on river point detection #609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 14 additions & 20 deletions src/openvic-simulation/map/MapDefinition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,23 +675,14 @@ void MapDefinition::_trace_river(BMP& rivers_bmp, ivec2_t start, river_t& river)
TraceSegment segment = stack.top();
stack.pop();

thread_local memory::vector<ivec2_t> points;
points.emplace_back(segment.point);

// Force heap initialiser ellision
memory::vector<ivec2_t> points{ segment.point };
uint8_t size = river_data[segment.point.x + segment.point.y * rivers_bmp.get_width()] - 1; // determine river size by colour
bool river_complete = false;
size_t recursion_limit = 0;

while(true) {
++recursion_limit;
if (recursion_limit == RIVER_RECURSION_LIMIT) {
spdlog::error_s(
"River segment starting @ ({}, {}) exceeded length limit of 4096 pixels. Check for misplaced pixel or circular river.",
points.front().x, points.front().y
);
break;
}

size_t limit;
for(limit = 0; limit < RIVER_RECURSION_LIMIT; ++limit) {
size_t idx = segment.point.x + segment.point.y * rivers_bmp.get_width();

ivec2_t merge_point;
Expand All @@ -706,7 +697,7 @@ void MapDefinition::_trace_river(BMP& rivers_bmp, ivec2_t start, river_t& river)
direction_t old_direction;
direction_t new_direction;
};
static constexpr std::array<Neighbour, 4> neighbours = {{
alignas(64) static constexpr std::array<Neighbour, 4> neighbours = {{
{ {0, -1}, UP, DOWN }, // Down
{ {1, 0}, LEFT, RIGHT }, // Right
{ {0, 1}, DOWN, UP }, // Up
Expand Down Expand Up @@ -741,18 +732,21 @@ void MapDefinition::_trace_river(BMP& rivers_bmp, ivec2_t start, river_t& river)
points.emplace_back(merge_point);
river_complete = true;
break;
}

if (new_segment_found) {
} else if (new_segment_found) {
stack.push({ new_segment_point, new_segment_direction });
break;
}

if (!new_segment_found) {
} else if (!new_segment_found) {
break; // no neighbours left to check, end segment
}
}

if (limit == RIVER_RECURSION_LIMIT) {
spdlog::error_s(
"River segment starting @ ({}, {}) exceeded limit of {} pixels. Check for a misplaced pixel or circular river.",
points.front().x, points.front().y, RIVER_RECURSION_LIMIT
);
}

// simplify points to only include first, last, and corners
const auto is_corner_point = [](ivec2_t previous, ivec2_t current, ivec2_t next) -> bool {
return ((current.x - previous.x) * (next.y - current.y)) != ((current.y - previous.y) * (next.x - current.x)); //slope is fun!
Expand Down
Loading