nghttp2/nghttp2
1
0
Fork 0
mirror of https://github.com/nghttp2/nghttp2.git synced 2025-12-06 18:18:52 +08:00
Code Issues Projects Releases Wiki Activity

shrpx_router: Adopt std::ranges

Browse Source
This commit is contained in:
Tatsuhiro Tsujikawa
2025-05-13 19:23:13 +09:00
parent e68fa65166
commit 66e5d45994
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/shrpx_router.cc
View File

@@ -40,12 +40,14 @@ Router::Router() : balloc_(1024, 1024), root_{} {}
Router::~Router() {} Router::~Router() {}
namespace {
char first_byte(const std::unique_ptr<RNode> &node) { return node->s[0]; }
} // namespace
namespace { namespace {
RNode *find_next_node(const RNode *node, char c) { RNode *find_next_node(const RNode *node, char c) {
auto itr = std::lower_bound(std::begin(node->next), std::end(node->next), c, auto itr = std::ranges::lower_bound(node->next, c, {}, first_byte);
[](const std::unique_ptr<RNode> &lhs, if (itr == std::ranges::end(node->next) || (*itr)->s[0] != c) {
const char c) { return lhs->s[0] < c; });
if (itr == std::end(node->next) || (*itr)->s[0] != c) {
return nullptr; return nullptr;
} }
@@ -55,10 +57,8 @@ RNode *find_next_node(const RNode *node, char c) {
namespace { namespace {
void add_next_node(RNode *node, std::unique_ptr<RNode> new_node) { void add_next_node(RNode *node, std::unique_ptr<RNode> new_node) {
auto itr = std::lower_bound(std::begin(node->next), std::end(node->next), auto itr =
new_node->s[0], std::ranges::lower_bound(node->next, new_node->s[0], {}, first_byte);
[](const std::unique_ptr<RNode> &lhs,
const char c) { return lhs->s[0] < c; });
node->next.insert(itr, std::move(new_node)); node->next.insert(itr, std::move(new_node));
} }
} // namespace } // namespace
@@ -315,14 +315,15 @@ ssize_t Router::match(const StringRef &host, const StringRef &path) const {
const RNode *node; const RNode *node;
size_t offset; size_t offset;
node = match_complete(&offset, &root_, std::begin(host), std::end(host)); node = match_complete(&offset, &root_, std::ranges::begin(host),
std::ranges::end(host));
if (node == nullptr) { if (node == nullptr) {
return -1; return -1;
} }
bool pattern_is_wildcard; bool pattern_is_wildcard;
node = match_partial(&pattern_is_wildcard, node, offset, std::begin(path), node = match_partial(&pattern_is_wildcard, node, offset,
std::end(path)); std::ranges::begin(path), std::ranges::end(path));
if (node == nullptr || node == &root_) { if (node == nullptr || node == &root_) {
return -1; return -1;
} }
@@ -334,7 +335,8 @@ ssize_t Router::match(const StringRef &s) const {
const RNode *node; const RNode *node;
size_t offset; size_t offset;
node = match_complete(&offset, &root_, std::begin(s), std::end(s)); node =
match_complete(&offset, &root_, std::ranges::begin(s), std::ranges::end(s));
if (node == nullptr) { if (node == nullptr) {
return -1; return -1;
} }
@@ -394,8 +396,8 @@ ssize_t Router::match_prefix(size_t *nread, const RNode **last_node,
*last_node = &root_; *last_node = &root_;
} }
auto node = auto node = ::shrpx::match_prefix(nread, *last_node, std::ranges::begin(s),
::shrpx::match_prefix(nread, *last_node, std::begin(s), std::end(s)); std::ranges::end(s));
if (node == nullptr) { if (node == nullptr) {
return -1; return -1;
} }