GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — src: make permission storage a bit more efficient · nodejs/node@efb649e

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • src/permission
    • permission.cc
    • permission.h
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/permission/permission.cc‎

Copy file name to clipboardExpand all lines: src/permission/permission.cc
+32-40Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -141,53 +141,49 @@ PermissionScope Permission::StringToPermission(std::string_view perm) {
141141
#undef V
142142

143143
Permission::Permission() : enabled_(false), warning_only_(false) {
144-
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
145-
std::shared_ptr<PermissionBase> child_p =
146-
std::make_shared<ChildProcessPermission>();
147-
std::shared_ptr<PermissionBase> worker_t =
148-
std::make_shared<WorkerPermission>();
149-
std::shared_ptr<PermissionBase> inspector =
150-
std::make_shared<InspectorPermission>();
151-
std::shared_ptr<PermissionBase> wasi = std::make_shared<WASIPermission>();
152-
std::shared_ptr<PermissionBase> net = std::make_shared<NetPermission>();
153-
std::shared_ptr<PermissionBase> addon = std::make_shared<AddonPermission>();
154-
std::shared_ptr<FFIPermission> ffi = std::make_shared<FFIPermission>();
155-
std::shared_ptr<PermissionBase> openssl_store =
156-
std::make_shared<OpenSSLStorePermission>();
144+
auto fs = std::make_shared<FSPermission>();
145+
auto child_p = std::make_shared<ChildProcessPermission>();
146+
auto worker_t = std::make_shared<WorkerPermission>();
147+
auto inspector = std::make_shared<InspectorPermission>();
148+
auto wasi = std::make_shared<WASIPermission>();
149+
auto net = std::make_shared<NetPermission>();
150+
auto addon = std::make_shared<AddonPermission>();
151+
auto ffi = std::make_shared<FFIPermission>();
152+
auto openssl_store = std::make_shared<OpenSSLStorePermission>();
157153
#define V(Name, _, __, ___) \
158-
nodes_.insert(std::make_pair(PermissionScope::k##Name, fs));
154+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = fs;
159155
FILESYSTEM_PERMISSIONS(V)
160156
#undef V
161157
#define V(Name, _, __, ___) \
162-
nodes_.insert(std::make_pair(PermissionScope::k##Name, child_p));
158+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = child_p;
163159
CHILD_PROCESS_PERMISSIONS(V)
164160
#undef V
165161
#define V(Name, _, __, ___) \
166-
nodes_.insert(std::make_pair(PermissionScope::k##Name, worker_t));
162+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = worker_t;
167163
WORKER_THREADS_PERMISSIONS(V)
168164
#undef V
169165
#define V(Name, _, __, ___) \
170-
nodes_.insert(std::make_pair(PermissionScope::k##Name, inspector));
166+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = inspector;
171167
INSPECTOR_PERMISSIONS(V)
172168
#undef V
173169
#define V(Name, _, __, ___) \
174-
nodes_.insert(std::make_pair(PermissionScope::k##Name, wasi));
170+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = wasi;
175171
WASI_PERMISSIONS(V)
176172
#undef V
177173
#define V(Name, _, __, ___) \
178-
nodes_.insert(std::make_pair(PermissionScope::k##Name, net));
174+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = net;
179175
NET_PERMISSIONS(V)
180176
#undef V
181177
#define V(Name, _, __, ___) \
182-
nodes_.insert(std::make_pair(PermissionScope::k##Name, addon));
178+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = addon;
183179
ADDON_PERMISSIONS(V)
184180
#undef V
185181
#define V(Name, _, __, ___) \
186-
nodes_.insert(std::make_pair(PermissionScope::k##Name, ffi));
182+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = ffi;
187183
FFI_PERMISSIONS(V)
188184
#undef V
189185
#define V(Name, _, __, ___) \
190-
nodes_.insert(std::make_pair(PermissionScope::k##Name, openssl_store));
186+
nodes_[static_cast<size_t>(PermissionScope::k##Name)] = openssl_store;
191187
OPENSSL_STORE_PERMISSIONS(V)
192188
#undef V
193189
}
@@ -264,10 +260,10 @@ bool Permission::is_scope_granted(Environment* env,
264260
std::string_view res) const {
265261
CHECK(permission != PermissionScope::kPermissionsRoot &&
266262
permission != PermissionScope::kPermissionsCount);
267-
auto perm_node = nodes_.find(permission);
263+
auto& perm_node = nodes_[static_cast<size_t>(permission)];
268264
bool result = false;
269-
if (perm_node != nodes_.end()) {
270-
result = perm_node->second->is_granted(env, permission, res);
265+
if (perm_node) {
266+
result = perm_node->is_granted(env, permission, res);
271267
}
272268

273269
if (!result && !publishing_) {
@@ -296,17 +292,13 @@ BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
296292
Environment* env, PermissionScope scope) const {
297293
CHECK(scope != PermissionScope::kPermissionsRoot &&
298294
scope != PermissionScope::kPermissionsCount);
299-
auto it = channels_.find(scope);
300-
if (it != channels_.end()) {
301-
// Promote weak ref to strong for the duration of this call.
302-
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
303-
if (ptr) return ptr;
304-
channels_.erase(it);
305-
}
295+
auto& weak_ch = channels_[static_cast<size_t>(scope)];
296+
// Promote weak ref to strong for the duration of this call.
297+
BaseObjectPtr<diagnostics_channel::Channel> ptr(weak_ch.get());
298+
if (ptr) return ptr;
306299
auto channel_name = GetDiagnosticsChannelName(scope);
307300
if (auto ch = diagnostics_channel::Channel::Get(env, channel_name)) {
308-
channels_.emplace(scope,
309-
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
301+
weak_ch = BaseObjectWeakPtr<diagnostics_channel::Channel>(ch.get());
310302
return ch;
311303
}
312304
return {};
@@ -315,9 +307,9 @@ BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
315307
void Permission::Apply(Environment* env,
316308
std::span<const std::string> allow,
317309
PermissionScope scope) {
318-
auto permission = nodes_.find(scope);
319-
if (permission != nodes_.end()) {
320-
permission->second->Apply(env, allow, scope);
310+
auto& perm_node = nodes_[static_cast<size_t>(scope)];
311+
if (perm_node) {
312+
perm_node->Apply(env, allow, scope);
321313
}
322314
}
323315

@@ -326,9 +318,9 @@ void Permission::Drop(Environment* env,
326318
std::string_view param) {
327319
CHECK(scope != PermissionScope::kPermissionsRoot &&
328320
scope != PermissionScope::kPermissionsCount);
329-
auto permission = nodes_.find(scope);
330-
if (permission != nodes_.end()) {
331-
permission->second->Drop(env, scope, param);
321+
auto& perm_node = nodes_[static_cast<size_t>(scope)];
322+
if (perm_node) {
323+
perm_node->Drop(env, scope, param);
332324
}
333325

334326
// Publish to diagnostics channel so observers can track drops
Collapse file

‎src/permission/permission.h‎

Copy file name to clipboardExpand all lines: src/permission/permission.h
+7-4Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "permission/worker_permission.h"
1919
#include "v8.h"
2020

21+
#include <array>
2122
#include <string_view>
22-
#include <unordered_map>
2323

2424
namespace node {
2525

@@ -140,14 +140,17 @@ class Permission {
140140
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
141141
Environment* env, PermissionScope scope) const;
142142

143-
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
143+
static constexpr size_t kPermissionCount =
144+
static_cast<size_t>(PermissionScope::kPermissionsCount);
145+
146+
std::array<std::shared_ptr<PermissionBase>, kPermissionCount> nodes_;
144147
bool enabled_;
145148
bool warning_only_;
146149
mutable bool publishing_ = false;
147150
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
148151
// Using weak refs here avoids keeping Channels alive past Realm teardown.
149-
mutable std::unordered_map<PermissionScope,
150-
BaseObjectWeakPtr<diagnostics_channel::Channel>>
152+
mutable std::array<BaseObjectWeakPtr<diagnostics_channel::Channel>,
153+
kPermissionCount>
151154
channels_;
152155
};
153156

0 commit comments

Comments
0 (0)
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.