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

src: do not use `std::function` for `OnScopeLeave` · nodejs/node@058a8d5 · GitHub

/ node Public

Commit 058a8d5

Browse files
addaleax
authored and
MylesBorins
committed
src: do not use std::function for OnScopeLeave
Using `std::function` adds an extra layer of indirection, and in particular, heap allocations that are not necessary in our use case here. PR-URL: #30134 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 31a3b72 commit 058a8d5

12 files changed

Lines changed: 45 additions & 22 deletions

‎src/api/callback.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void InternalCallbackScope::Close() {
105105

106106
if (!env_->can_call_into_js()) return;
107107

108-
OnScopeLeave weakref_cleanup([&]() { env_->RunWeakRefCleanup(); });
108+
auto weakref_cleanup = OnScopeLeave([&]() { env_->RunWeakRefCleanup(); });
109109

110110
if (!tick_info->has_tick_scheduled()) {
111111
MicrotasksScope::PerformCheckpoint(env_->isolate());

‎src/large_pages/node_large_page.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ MoveTextRegionToLargePages(const text_region& r) {
333333
PrintSystemError(errno);
334334
return -1;
335335
}
336-
OnScopeLeave munmap_on_return([nmem, size]() {
336+
auto munmap_on_return = OnScopeLeave([nmem, size]() {
337337
if (-1 == munmap(nmem, size)) PrintSystemError(errno);
338338
});
339339

‎src/node_binding.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void* wrapped_dlopen(const char* filename, int flags) {
152152
Mutex::ScopedLock lock(dlhandles_mutex);
153153

154154
uv_fs_t req;
155-
OnScopeLeave cleanup([&]() { uv_fs_req_cleanup(&req); });
155+
auto cleanup = OnScopeLeave([&]() { uv_fs_req_cleanup(&req); });
156156
int rc = uv_fs_stat(nullptr, &req, filename, nullptr);
157157

158158
if (rc != 0) {

‎src/node_env_var.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Local<Array> RealEnvStore::Enumerate(Isolate* isolate) const {
149149
uv_env_item_t* items;
150150
int count;
151151

152-
OnScopeLeave cleanup([&]() { uv_os_free_environ(items, count); });
152+
auto cleanup = OnScopeLeave([&]() { uv_os_free_environ(items, count); });
153153
CHECK_EQ(uv_os_environ(&items, &count), 0);
154154

155155
MaybeStackBuffer<Local<Value>, 256> env_v(count);

‎src/node_http_parser.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ class Parser : public AsyncWrap, public StreamListener {
586586
// Once we’re done here, either indicate that the HTTP parser buffer
587587
// is free for re-use, or free() the data if it didn’t come from there
588588
// in the first place.
589-
OnScopeLeave on_scope_leave([&]() {
589+
auto on_scope_leave = OnScopeLeave([&]() {
590590
if (buf.base == env()->http_parser_buffer())
591591
env()->set_http_parser_buffer_in_use(false);
592592
else

‎src/node_i18n.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ class ConverterObject : public BaseObject, Converter {
217217
result.AllocateSufficientStorage(limit);
218218

219219
UBool flush = (flags & CONVERTER_FLAGS_FLUSH) == CONVERTER_FLAGS_FLUSH;
220-
OnScopeLeave cleanup([&]() {
220+
auto cleanup = OnScopeLeave([&]() {
221221
if (flush) {
222222
// Reset the converter state.
223223
converter->bomSeen_ = false;

‎src/node_options.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ void GetOptions(const FunctionCallbackInfo<Value>& args) {
809809
per_process::cli_options->per_isolate = env->isolate_data()->options();
810810
auto original_per_env = per_process::cli_options->per_isolate->per_env;
811811
per_process::cli_options->per_isolate->per_env = env->options();
812-
OnScopeLeave on_scope_leave([&]() {
812+
auto on_scope_leave = OnScopeLeave([&]() {
813813
per_process::cli_options->per_isolate->per_env = original_per_env;
814814
per_process::cli_options->per_isolate = original_per_isolate;
815815
});

‎src/node_os.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static void GetUserInfo(const FunctionCallbackInfo<Value>& args) {
302302
return args.GetReturnValue().SetUndefined();
303303
}
304304

305-
OnScopeLeave free_passwd([&]() { uv_os_free_passwd(&pwd); });
305+
auto free_passwd = OnScopeLeave([&]() { uv_os_free_passwd(&pwd); });
306306

307307
Local<Value> error;
308308

‎src/node_process_methods.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ static void DebugProcess(const FunctionCallbackInfo<Value>& args) {
362362
LPTHREAD_START_ROUTINE* handler = nullptr;
363363
DWORD pid = 0;
364364

365-
OnScopeLeave cleanup([&]() {
365+
auto cleanup = OnScopeLeave([&]() {
366366
if (process != nullptr) CloseHandle(process);
367367
if (thread != nullptr) CloseHandle(thread);
368368
if (handler != nullptr) UnmapViewOfFile(handler);

‎src/node_worker.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ void Worker::Run() {
242242
SealHandleScope outer_seal(isolate_);
243243

244244
DeleteFnPtr<Environment, FreeEnvironment> env_;
245-
OnScopeLeave cleanup_env([&]() {
245+
auto cleanup_env = OnScopeLeave([&]() {
246246
if (!env_) return;
247247
env_->set_can_call_into_js(false);
248248
Isolate::DisallowJavascriptExecutionScope disallow_js(isolate_,

0 commit comments

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