FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: apply a modest performance perf to permissions · nodejs/node@d4ced88 · GitHub

/ node Public

Commit d4ced88

Browse files
jasnell
authored and
aduh95
committed
src: apply a modest performance perf to permissions
Improve the way the RadixTree works and apply a fast api call. Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent efb649e commit d4ced88

3 files changed

Lines changed: 93 additions & 35 deletions

File tree

‎src/permission/fs_permission.cc‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ void FreeRecursivelyNode(
3939
return;
4040
}
4141

42-
if (node->children.size()) {
43-
for (auto& c : node->children) {
44-
FreeRecursivelyNode(c.second);
45-
}
42+
for (auto& [label, child] : node->children) {
43+
FreeRecursivelyNode(child);
4644
}
4745

4846
delete node->wildcard_child;
@@ -106,7 +104,7 @@ void PrintTree(const node::permission::FSPermission::RadixTree::Node* node,
106104
node::DebugCategory::PERMISSION_MODEL, "%s%s\n", indent, node->prefix);
107105
}
108106

109-
if (node->children.size() > 0) {
107+
if (!node->children.empty()) {
110108
size_t count = 0;
111109
size_t total = node->children.size();
112110

@@ -120,10 +118,10 @@ void PrintTree(const node::permission::FSPermission::RadixTree::Node* node,
120118
}
121119
}
122120

123-
for (const auto& pair : node->children) {
121+
for (const auto& [label, child] : node->children) {
124122
count++;
125123
bool child_is_last = (count == total);
126-
PrintTree(pair.second, depth + 1, next_branch_prefix, child_is_last);
124+
PrintTree(child, depth + 1, next_branch_prefix, child_is_last);
127125
}
128126
}
129127
}
@@ -278,8 +276,8 @@ FSPermission::RadixTree::~RadixTree() {
278276
}
279277

280278
void FSPermission::RadixTree::Clear() {
281-
for (auto& c : root_node_->children) {
282-
FreeRecursivelyNode(c.second);
279+
for (auto& [label, child] : root_node_->children) {
280+
FreeRecursivelyNode(child);
283281
}
284282
root_node_->children.clear();
285283
delete root_node_->wildcard_child;
@@ -294,15 +292,14 @@ bool FSPermission::RadixTree::Lookup(std::string_view s,
294292
return when_empty_return;
295293
}
296294
size_t parent_node_prefix_len = current_node->prefix.length();
297-
const std::string path(s);
298-
auto path_len = path.length();
295+
auto path_len = s.length();
299296

300297
while (true) {
301298
if (parent_node_prefix_len == path_len && current_node->IsEndNode()) {
302299
return true;
303300
}
304301

305-
auto node = current_node->NextNode(path, parent_node_prefix_len);
302+
auto node = current_node->NextNode(s, parent_node_prefix_len);
306303
if (node == nullptr) {
307304
return false;
308305
}

‎src/permission/fs_permission.h‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "v8.h"
77

8-
#include <unordered_map>
8+
#include <vector>
99
#include "permission/permission_base.h"
1010
#include "util.h"
1111

@@ -28,16 +28,30 @@ class FSPermission final : public PermissionBase {
2828
struct RadixTree {
2929
struct Node {
3030
std::string prefix;
31-
std::unordered_map<char, Node*> children;
32-
Node* wildcard_child;
33-
bool is_leaf;
31+
std::vector<std::pair<char, Node*>> children;
32+
Node* wildcard_child = nullptr;
33+
bool is_leaf = false;
3434

35-
explicit Node(const std::string& pre)
36-
: prefix(pre), wildcard_child(nullptr), is_leaf(false) {}
35+
explicit Node(std::string_view pre)
36+
: prefix(pre) {}
3737

38-
Node() : wildcard_child(nullptr), is_leaf(false) {}
38+
Node() = default;
3939

40-
Node* CreateChild(const std::string& path_prefix) {
40+
Node* FindChild(char label) const {
41+
for (const auto& [c, node] : children) {
42+
if (c == label) return node;
43+
}
44+
return nullptr;
45+
}
46+
47+
void SetChild(char label, Node* node) {
48+
for (auto& [c, n] : children) {
49+
if (c == label) { n = node; return; }
50+
}
51+
children.emplace_back(label, node);
52+
}
53+
54+
Node* CreateChild(std::string_view path_prefix) {
4155
if (path_prefix.empty() && !is_leaf) {
4256
is_leaf = true;
4357
return this;
@@ -46,10 +60,11 @@ class FSPermission final : public PermissionBase {
4660
CHECK(!path_prefix.empty());
4761
char label = path_prefix[0];
4862

49-
Node* child = children[label];
63+
Node* child = FindChild(label);
5064
if (child == nullptr) {
51-
children[label] = new Node(path_prefix);
52-
return children[label];
65+
child = new Node(path_prefix);
66+
children.emplace_back(label, child);
67+
return child;
5368
}
5469
bool child_was_end_node = child->IsEndNode();
5570

@@ -58,13 +73,13 @@ class FSPermission final : public PermissionBase {
5873
size_t prefix_len = path_prefix.length();
5974
for (; i < child->prefix.length(); ++i) {
6075
if (i >= prefix_len || path_prefix[i] != child->prefix[i]) {
61-
std::string parent_prefix = child->prefix.substr(0, i);
62-
std::string child_prefix = child->prefix.substr(i);
76+
std::string parent_prefix(child->prefix.substr(0, i));
77+
std::string child_prefix(child->prefix.substr(i));
6378

6479
child->prefix = child_prefix;
6580
Node* split_child = new Node(parent_prefix);
66-
split_child->children[child_prefix[0]] = child;
67-
children[parent_prefix[0]] = split_child;
81+
split_child->children.emplace_back(child_prefix[0], child);
82+
SetChild(parent_prefix[0], split_child);
6883

6984
return split_child->CreateChild(path_prefix.substr(i));
7085
}
@@ -83,24 +98,23 @@ class FSPermission final : public PermissionBase {
8398
return wildcard_child;
8499
}
85100

86-
Node* NextNode(const std::string& path, size_t idx) const {
101+
Node* NextNode(std::string_view path, size_t idx) const {
87102
if (idx >= path.length()) {
88103
return nullptr;
89104
}
90105

91106
// wildcard node takes precedence
92107
if (children.size() > 1) {
93-
auto it = children.find('*');
94-
if (it != children.end()) {
95-
return it->second;
108+
Node* wc = FindChild('*');
109+
if (wc != nullptr) {
110+
return wc;
96111
}
97112
}
98113

99-
auto it = children.find(path[idx]);
100-
if (it == children.end()) {
114+
Node* child = FindChild(path[idx]);
115+
if (child == nullptr) {
101116
return nullptr;
102117
}
103-
auto child = it->second;
104118
// match prefix
105119
size_t prefix_len = child->prefix.length();
106120
for (size_t i = 0; i < path.length(); ++i) {

‎src/permission/permission.cc‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
#include "env-inl.h"
44
#include "memory_tracker-inl.h"
55
#include "node.h"
6+
#include "node_debug.h"
67
#include "node_diagnostics_channel.h"
78
#include "node_errors.h"
89
#include "node_external_reference.h"
910
#include "node_file.h"
1011

1112
#include "permission/permission_base.h"
13+
#include "v8-fast-api-calls.h"
1214
#include "v8-template.h"
1315
#include "v8.h"
1416

@@ -18,13 +20,16 @@
1820

1921
namespace node {
2022

23+
using v8::CFunction;
2124
using v8::Context;
2225
using v8::DictionaryTemplate;
26+
using v8::FastApiCallbackOptions;
2327
using v8::FunctionCallbackInfo;
2428
using v8::IntegrityLevel;
2529
using v8::Local;
2630
using v8::MaybeLocal;
2731
using v8::Object;
32+
using v8::String;
2833
using v8::Undefined;
2934
using v8::Value;
3035

@@ -121,6 +126,47 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
121126
return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
122127
}
123128

129+
static bool FastHas(Local<Value> receiver,
130+
Local<Value> scope_arg,
131+
Local<Value> resource_arg,
132+
// NOLINTNEXTLINE(runtime/references) This is V8 api.
133+
FastApiCallbackOptions& options) {
134+
TRACK_V8_FAST_API_CALL("permission.has");
135+
auto isolate = options.isolate;
136+
v8::HandleScope handle_scope(isolate);
137+
auto context = isolate->GetCurrentContext();
138+
139+
Environment* env = Environment::GetCurrent(context);
140+
141+
Local<String> str;
142+
if (!scope_arg->ToString(context).ToLocal(&str)) {
143+
return false;
144+
}
145+
Utf8Value utf8_scope(isolate, str);
146+
PermissionScope scope =
147+
Permission::StringToPermission(utf8_scope.ToStringView());
148+
if (scope == PermissionScope::kPermissionsRoot) {
149+
return false;
150+
}
151+
152+
if (resource_arg->IsUndefined()) {
153+
return env->permission()->is_granted(env, scope);
154+
}
155+
156+
Local<String> res_str;
157+
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
158+
return false;
159+
}
160+
Utf8Value utf8_res(isolate, res_str);
161+
if (utf8_res.length() == 0) {
162+
return false;
163+
}
164+
165+
return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
166+
}
167+
168+
static CFunction fast_has_(CFunction::Make(FastHas));
169+
124170
} // namespace
125171

126172
#define V(Name, label, _, __) \
@@ -349,14 +395,15 @@ void Initialize(Local<Object> target,
349395
Local<Value> unused,
350396
Local<Context> context,
351397
void* priv) {
352-
SetMethodNoSideEffect(context, target, "has", Has);
398+
SetFastMethodNoSideEffect(context, target, "has", Has, &fast_has_);
353399
SetMethod(context, target, "drop", Drop);
354400

355401
target->SetIntegrityLevel(context, IntegrityLevel::kFrozen).FromJust();
356402
}
357403

358404
void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
359405
registry->Register(Has);
406+
registry->Register(fast_has_);
360407
registry->Register(Drop);
361408
}
362409

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL