Skip to content

Commit 2770778

Browse files
maclover7targos
authored andcommitted
src: make Environment::is_stopping_worker inline
Fixes a TODO comment. PR-URL: #21720 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6920091 commit 2770778

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

‎src/env-inl.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include"node_perf_common.h"
3434
#include"node_context_data.h"
3535
#include"tracing/agent.h"
36+
#include"node_worker.h"
3637

3738
#include<stddef.h>
3839
#include<stdint.h>
@@ -623,6 +624,11 @@ inline void Environment::remove_sub_worker_context(worker::Worker* context) {
623624
sub_worker_contexts_.erase(context);
624625
}
625626

627+
inlineboolEnvironment::is_stopping_worker() const {
628+
CHECK(!is_main_thread());
629+
return worker_context_->is_stopped();
630+
}
631+
626632
inline performance::performance_state* Environment::performance_state() {
627633
return performance_state_.get();
628634
}

‎src/env.cc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -653,9 +653,4 @@ void Environment::stop_sub_worker_contexts() {
653653
}
654654
}
655655

656-
boolEnvironment::is_stopping_worker() const {
657-
CHECK(!is_main_thread());
658-
return worker_context_->is_stopped();
659-
}
660-
661656
} // namespace node

‎src/env.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -723,9 +723,6 @@ class Environment {
723723
inlineboolcan_call_into_js() const;
724724
inlinevoidset_can_call_into_js(bool can_call_into_js);
725725

726-
// TODO(addaleax): This should be inline.
727-
boolis_stopping_worker() const;
728-
729726
inlineboolis_main_thread() const;
730727
inlineuint64_tthread_id() const;
731728
inlinevoidset_thread_id(uint64_t id);
@@ -734,6 +731,7 @@ class Environment {
734731
inlinevoidadd_sub_worker_context(worker::Worker* context);
735732
inlinevoidremove_sub_worker_context(worker::Worker* context);
736733
voidstop_sub_worker_contexts();
734+
inlineboolis_stopping_worker() const;
737735

738736
inlinevoidThrowError(constchar* errmsg);
739737
inlinevoidThrowTypeError(constchar* errmsg);

0 commit comments

Comments
 (0)