Skip to content

Commit 084c379

Browse files
committed
src: associate is_main_thread() with worker_context()
In our codebase, the assumption generally is that `!is_main_thread()` means that the current Environment belongs to a Node.js Worker thread. PR-URL: #30467 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
1 parent 64c0122 commit 084c379

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

src/api/environment.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,7 @@ Environment* CreateEnvironment(IsolateData* isolate_data,
345345
context,
346346
args,
347347
exec_args,
348-
static_cast<Environment::Flags>(Environment::kIsMainThread |
349-
Environment::kOwnsProcessState |
348+
static_cast<Environment::Flags>(Environment::kOwnsProcessState |
350349
Environment::kOwnsInspector));
351350
env->InitializeLibuv(per_process::v8_is_profiling);
352351
if (env->RunBootstrapping().IsEmpty()) {

src/env-inl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ inline void Environment::set_has_serialized_options(bool value) {
889889
}
890890

891891
inline bool Environment::is_main_thread() const {
892-
return flags_ & kIsMainThread;
892+
return worker_context() == nullptr;
893893
}
894894

895895
inline bool Environment::owns_process_state() const {

src/env.h

-1
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,6 @@ class Environment : public MemoryRetainer {
859859

860860
enum Flags {
861861
kNoFlags = 0,
862-
kIsMainThread = 1 << 0,
863862
kOwnsProcessState = 1 << 1,
864863
kOwnsInspector = 1 << 2,
865864
};

src/node_main_instance.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@ NodeMainInstance::CreateMainEnvironment(int* exit_code) {
207207
context,
208208
args_,
209209
exec_args_,
210-
static_cast<Environment::Flags>(Environment::kIsMainThread |
211-
Environment::kOwnsProcessState |
210+
static_cast<Environment::Flags>(Environment::kOwnsProcessState |
212211
Environment::kOwnsInspector)) };
213212
env->InitializeLibuv(per_process::v8_is_profiling);
214213
env->InitializeDiagnostics();

0 commit comments

Comments
 (0)