diff options
author | Joyee Cheung <joyeec9h3@gmail.com> | 2019-03-20 19:42:02 +0800 |
---|---|---|
committer | Joyee Cheung <joyeec9h3@gmail.com> | 2019-03-27 10:30:14 -0400 |
commit | 242466167d6379791858ce59ca11d823c2eb4469 (patch) | |
tree | 5c937f7f0bbfc7801758e98c4c6f4dbef3b0294a | |
parent | 4565698227c2644cc59bcdb705c4f4c92667d0d7 (diff) | |
download | android-node-v8-242466167d6379791858ce59ca11d823c2eb4469.tar.gz android-node-v8-242466167d6379791858ce59ca11d823c2eb4469.tar.bz2 android-node-v8-242466167d6379791858ce59ca11d823c2eb4469.zip |
src: move TickInfo out of Environment
PR-URL: https://github.com/nodejs/node/pull/26824
Refs: https://github.com/nodejs/node/issues/26776
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r-- | src/api/callback.cc | 2 | ||||
-rw-r--r-- | src/env-inl.h | 10 | ||||
-rw-r--r-- | src/env.h | 40 |
3 files changed, 24 insertions, 28 deletions
diff --git a/src/api/callback.cc b/src/api/callback.cc index 4083ae8487..52a8da35b6 100644 --- a/src/api/callback.cc +++ b/src/api/callback.cc @@ -96,7 +96,7 @@ void InternalCallbackScope::Close() { return; } - Environment::TickInfo* tick_info = env_->tick_info(); + TickInfo* tick_info = env_->tick_info(); if (!env_->can_call_into_js()) return; if (!tick_info->has_tick_scheduled()) { diff --git a/src/env-inl.h b/src/env-inl.h index 7481a87718..f379660004 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -268,18 +268,18 @@ inline void ImmediateInfo::ref_count_dec(uint32_t decrement) { fields_[kRefCount] -= decrement; } -inline Environment::TickInfo::TickInfo(v8::Isolate* isolate) +inline TickInfo::TickInfo(v8::Isolate* isolate) : fields_(isolate, kFieldsCount) {} -inline AliasedBuffer<uint8_t, v8::Uint8Array>& Environment::TickInfo::fields() { +inline AliasedBuffer<uint8_t, v8::Uint8Array>& TickInfo::fields() { return fields_; } -inline bool Environment::TickInfo::has_tick_scheduled() const { +inline bool TickInfo::has_tick_scheduled() const { return fields_[kHasTickScheduled] == 1; } -inline bool Environment::TickInfo::has_rejection_to_warn() const { +inline bool TickInfo::has_rejection_to_warn() const { return fields_[kHasRejectionToWarn] == 1; } @@ -439,7 +439,7 @@ inline ImmediateInfo* Environment::immediate_info() { return &immediate_info_; } -inline Environment::TickInfo* Environment::tick_info() { +inline TickInfo* Environment::tick_info() { return &tick_info_; } @@ -647,6 +647,24 @@ class ImmediateInfo { AliasedBuffer<uint32_t, v8::Uint32Array> fields_; }; +class TickInfo { + public: + inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields(); + inline bool has_tick_scheduled() const; + inline bool has_rejection_to_warn() const; + + TickInfo(const TickInfo&) = delete; + TickInfo& operator=(const TickInfo&) = delete; + + private: + friend class Environment; // So we can call the constructor. + inline explicit TickInfo(v8::Isolate* isolate); + + enum Fields { kHasTickScheduled = 0, kHasRejectionToWarn, kFieldsCount }; + + AliasedBuffer<uint8_t, v8::Uint8Array> fields_; +}; + class Environment { public: Environment(const Environment&) = delete; @@ -656,28 +674,6 @@ class Environment { inline void PushAsyncCallbackScope(); inline void PopAsyncCallbackScope(); - class TickInfo { - public: - inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields(); - inline bool has_tick_scheduled() const; - inline bool has_rejection_to_warn() const; - - TickInfo(const TickInfo&) = delete; - TickInfo& operator=(const TickInfo&) = delete; - - private: - friend class Environment; // So we can call the constructor. - inline explicit TickInfo(v8::Isolate* isolate); - - enum Fields { - kHasTickScheduled = 0, - kHasRejectionToWarn, - kFieldsCount - }; - - AliasedBuffer<uint8_t, v8::Uint8Array> fields_; - }; - enum Flags { kNoFlags = 0, kIsMainThread = 1 << 0, |