1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: make Environment::is_stopping_worker inline

Browse Source 
Fixes a TODO comment.

PR-URL: https://github.com/nodejs/node/pull/21720
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Jon Moss 2018-07-09 11:02:11 -04:00
parent 8174d0c8ca
commit fcfd3e1bac
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/env-inl.h
View File

@ -33,6 +33,7 @@
#include "node_perf_common.h" #include "node_perf_common.h"
#include "node_context_data.h" #include "node_context_data.h"
#include "tracing/agent.h" #include "tracing/agent.h"
#include "node_worker.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -623,6 +624,11 @@ inline void Environment::remove_sub_worker_context(worker::Worker* context) {
sub_worker_contexts_.erase(context); sub_worker_contexts_.erase(context);
} }
inline bool Environment::is_stopping_worker() const {
CHECK(!is_main_thread());
return worker_context_->is_stopped();
}
inline performance::performance_state* Environment::performance_state() { inline performance::performance_state* Environment::performance_state() {
return performance_state_.get(); return performance_state_.get();
} }

5
src/env.cc
View File

@ -734,9 +734,4 @@ void Environment::stop_sub_worker_contexts() {
} }
} }
bool Environment::is_stopping_worker() const {
CHECK(!is_main_thread());
return worker_context_->is_stopped();
}
} // namespace node } // namespace node

4
src/env.h
View File

@ -723,9 +723,6 @@ class Environment {
inline bool can_call_into_js() const; inline bool can_call_into_js() const;
inline void set_can_call_into_js(bool can_call_into_js); inline void set_can_call_into_js(bool can_call_into_js);
// TODO(addaleax): This should be inline.
bool is_stopping_worker() const;
inline bool is_main_thread() const; inline bool is_main_thread() const;
inline uint64_t thread_id() const; inline uint64_t thread_id() const;
inline void set_thread_id(uint64_t id); inline void set_thread_id(uint64_t id);
@ -734,6 +731,7 @@ class Environment {
inline void add_sub_worker_context(worker::Worker* context); inline void add_sub_worker_context(worker::Worker* context);
inline void remove_sub_worker_context(worker::Worker* context); inline void remove_sub_worker_context(worker::Worker* context);
void stop_sub_worker_contexts(); void stop_sub_worker_contexts();
inline bool is_stopping_worker() const;
inline void ThrowError(const char* errmsg); inline void ThrowError(const char* errmsg);
inline void ThrowTypeError(const char* errmsg); inline void ThrowTypeError(const char* errmsg);