src: cache permission strings · nodejs/node@f77aa2f · GitHub
Skip to content

Commit f77aa2f

Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: cache permission strings
Use env_property strings for permissions since those are fixed. Avoid creating new string instances each time. Also use ToV8Value for a couple since we're in here. 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 be4e7de commit f77aa2f

5 files changed

Lines changed: 81 additions & 23 deletions

File tree

‎src/env-inl.h‎

Lines changed: 16 additions & 0 deletions

‎src/env.cc‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
360360
#undef VS
361361
#undef VP
362362

363+
#define V(Name, label, _, __) \
364+
info.primitive_values.push_back( \
365+
creator->AddData(Name##_permission_string##_.Get(isolate)));
366+
PERMISSIONS(V)
367+
#undef V
368+
363369
info.primitive_values.reserve(info.primitive_values.size() +
364370
AsyncWrap::PROVIDERS_LENGTH);
365371
for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
@@ -419,6 +425,21 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
419425
#undef VS
420426
#undef VP
421427

428+
#define V(Name, label, _, __) \
429+
do { \
430+
MaybeLocal<String> maybe_field = \
431+
isolate_->GetDataFromSnapshotOnce<String>( \
432+
info->primitive_values[i++]); \
433+
Local<String> field; \
434+
if (!maybe_field.ToLocal(&field)) { \
435+
fprintf(stderr, \
436+
"Failed to deserialize " #Name "_permission_string\n"); \
437+
} \
438+
Name##_permission_string##_.Set(isolate_, field); \
439+
} while (0);
440+
PERMISSIONS(V)
441+
#undef V
442+
422443
for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
423444
MaybeLocal<String> maybe_field =
424445
isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
@@ -520,6 +541,17 @@ void IsolateData::CreateProperties() {
520541
PER_ISOLATE_STRING_PROPERTIES(V)
521542
#undef V
522543

544+
#define V(Name, label, _, __) \
545+
Name##_permission_string##_.Set( \
546+
isolate_, \
547+
String::NewFromOneByte(isolate_, \
548+
reinterpret_cast<const uint8_t*>(#Name), \
549+
NewStringType::kInternalized, \
550+
sizeof(#Name) - 1) \
551+
.ToLocalChecked());
552+
PERMISSIONS(V)
553+
#undef V
554+
523555
// Create all the provider strings that will be passed to JS. Place them in
524556
// an array so the array index matches the PROVIDER id offset. This way the
525557
// strings can be retrieved quickly.
@@ -630,6 +662,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
630662
PER_ISOLATE_STRING_PROPERTIES(V)
631663
#undef V
632664

665+
#define V(Name, label, _, __) \
666+
tracker->TrackField(#Name "_permission_string", Name##_permission_string());
667+
PERMISSIONS(V)
668+
#undef V
669+
633670
tracker->TrackField("async_wrap_providers", async_wrap_providers_);
634671

635672
if (node_allocator_ != nullptr) {

‎src/env.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
189189
#undef VS
190190
#undef VP
191191

192+
#define V(Name, label, _, __) \
193+
inline v8::Local<v8::String> Name##_permission_string() const;
194+
PERMISSIONS(V)
195+
#undef V
196+
192197
#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
193198
#define V(PropertyName, TypeName) \
194199
inline v8::Local<TypeName> PropertyName() const; \
@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
234239
#undef VS
235240
#undef VY
236241
#undef VP
242+
243+
#define V(Name, label, _, __) \
244+
v8::Eternal<v8::String> Name##_permission_string##_;
245+
PERMISSIONS(V)
246+
#undef V
247+
237248
// Keep a list of all Persistent strings used for AsyncWrap Provider types.
238249
std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
239250
async_wrap_providers_;
@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
875886
#undef VY
876887
#undef VP
877888

889+
#define V(Name, label, _, __) \
890+
inline v8::Local<v8::String> Name##_permission_string() const;
891+
PERMISSIONS(V)
892+
#undef V
893+
878894
#define V(PropertyName, TypeName) \
879895
inline v8::Local<TypeName> PropertyName() const; \
880896
inline void set_ ## PropertyName(v8::Local<TypeName> value);

‎src/permission/permission.cc‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,11 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
106106
} // namespace
107107

108108
#define V(Name, label, _, __) \
109-
if (perm == PermissionScope::k##Name) return #Name;
110-
const char* Permission::PermissionToString(const PermissionScope perm) {
109+
if (perm == PermissionScope::k##Name) return env->Name##_permission_string();
110+
v8::Local<v8::String> Permission::PermissionToString(
111+
Environment* env, const PermissionScope perm) {
111112
PERMISSIONS(V)
112-
return nullptr;
113+
UNREACHABLE();
113114
}
114115
#undef V
115116

@@ -192,12 +193,9 @@ MaybeLocal<Value> CreateAccessDeniedError(Environment* env,
192193
Local<Object> err = ERR_ACCESS_DENIED(
193194
env->isolate(), "Access to this API has been restricted. %s", suggestion);
194195

195-
Local<Value> perm_string;
196196
Local<Value> resource_string;
197-
std::string_view perm_str = Permission::PermissionToString(perm);
198-
if (!ToV8Value(env->context(), perm_str, env->isolate())
199-
.ToLocal(&perm_string) ||
200-
!ToV8Value(env->context(), res, env->isolate())
197+
Local<Value> perm_string = Permission::PermissionToString(env, perm);
198+
if (!ToV8Value(env->context(), res, env->isolate())
201199
.ToLocal(&resource_string) ||
202200
err->Set(env->context(), env->permission_string(), perm_string)
203201
.IsNothing() ||
@@ -263,18 +261,13 @@ bool Permission::is_scope_granted(Environment* env,
263261
v8::Local<v8::Context> context = env->context();
264262
v8::Local<v8::Object> msg =
265263
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
266-
const char* perm_str = PermissionToString(permission);
267264
msg->Set(context,
268265
env->permission_string(),
269-
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
266+
PermissionToString(env, permission))
270267
.Check();
271268
msg->Set(context,
272269
env->resource_string(),
273-
v8::String::NewFromUtf8(isolate,
274-
res.data(),
275-
v8::NewStringType::kNormal,
276-
static_cast<int>(res.size()))
277-
.ToLocalChecked())
270+
ToV8Value(context, res).ToLocalChecked())
278271
.Check();
279272
ch->Publish(env, msg);
280273
publishing_ = false;
@@ -333,18 +326,13 @@ void Permission::Drop(Environment* env,
333326
v8::Local<v8::Context> context = env->context();
334327
v8::Local<v8::Object> msg =
335328
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
336-
const char* perm_str = PermissionToString(scope);
337329
msg->Set(context,
338330
env->permission_string(),
339-
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
331+
PermissionToString(env, scope))
340332
.Check();
341333
msg->Set(context,
342334
env->resource_string(),
343-
v8::String::NewFromUtf8(isolate,
344-
param.data(),
345-
v8::NewStringType::kNormal,
346-
static_cast<int>(param.size()))
347-
.ToLocalChecked())
335+
ToV8Value(context, param).ToLocalChecked())
348336
.Check();
349337
msg->Set(context,
350338
FIXED_ONE_BYTE_STRING(isolate, "drop"),

‎src/permission/permission.h‎

Lines changed: 2 additions & 1 deletion

0 commit comments

Comments
 (0)