src: move ImmediateInfo out of Environment

joyeecheung · joyeecheung · commit 4565698227c2 · 2019-03-27T10:30:12.000-04:00
PR-URL: #26824 Refs: #26776 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -232,39 +232,39 @@ inline void Environment::PopAsyncCallbackScope() {
   async_callback_scope_depth_--;
 }
 
-inline Environment::ImmediateInfo::ImmediateInfo(v8::Isolate* isolate)
+inline ImmediateInfo::ImmediateInfo(v8::Isolate* isolate)
     : fields_(isolate, kFieldsCount) {}
 
 inline AliasedBuffer<uint32_t, v8::Uint32Array>&
-    Environment::ImmediateInfo::fields() {
+    ImmediateInfo::fields() {
   return fields_;
 }
 
-inline uint32_t Environment::ImmediateInfo::count() const {
+inline uint32_t ImmediateInfo::count() const {
   return fields_[kCount];
 }
 
-inline uint32_t Environment::ImmediateInfo::ref_count() const {
+inline uint32_t ImmediateInfo::ref_count() const {
   return fields_[kRefCount];
 }
 
-inline bool Environment::ImmediateInfo::has_outstanding() const {
+inline bool ImmediateInfo::has_outstanding() const {
   return fields_[kHasOutstanding] == 1;
 }
 
-inline void Environment::ImmediateInfo::count_inc(uint32_t increment) {
+inline void ImmediateInfo::count_inc(uint32_t increment) {
   fields_[kCount] += increment;
 }
 
-inline void Environment::ImmediateInfo::count_dec(uint32_t decrement) {
+inline void ImmediateInfo::count_dec(uint32_t decrement) {
   fields_[kCount] -= decrement;
 }
 
-inline void Environment::ImmediateInfo::ref_count_inc(uint32_t increment) {
+inline void ImmediateInfo::ref_count_inc(uint32_t increment) {
   fields_[kRefCount] += increment;
 }
 
-inline void Environment::ImmediateInfo::ref_count_dec(uint32_t decrement) {
+inline void ImmediateInfo::ref_count_dec(uint32_t decrement) {
   fields_[kRefCount] -= decrement;
 }
 
@@ -435,7 +435,7 @@ inline AsyncHooks* Environment::async_hooks() {
   return &async_hooks_;
 }
 
-inline Environment::ImmediateInfo* Environment::immediate_info() {
+inline ImmediateInfo* Environment::immediate_info() {
   return &immediate_info_;
 }
 
diff --git a/src/env.h b/src/env.h
@@ -624,6 +624,29 @@ class AsyncCallbackScope {
   Environment* env_;
 };
 
+class ImmediateInfo {
+ public:
+  inline AliasedBuffer<uint32_t, v8::Uint32Array>& fields();
+  inline uint32_t count() const;
+  inline uint32_t ref_count() const;
+  inline bool has_outstanding() const;
+  inline void count_inc(uint32_t increment);
+  inline void count_dec(uint32_t decrement);
+  inline void ref_count_inc(uint32_t increment);
+  inline void ref_count_dec(uint32_t decrement);
+
+  ImmediateInfo(const ImmediateInfo&) = delete;
+  ImmediateInfo& operator=(const ImmediateInfo&) = delete;
+
+ private:
+  friend class Environment;  // So we can call the constructor.
+  inline explicit ImmediateInfo(v8::Isolate* isolate);
+
+  enum Fields { kCount, kRefCount, kHasOutstanding, kFieldsCount };
+
+  AliasedBuffer<uint32_t, v8::Uint32Array> fields_;
+};
+
 class Environment {
  public:
   Environment(const Environment&) = delete;
@@ -633,36 +656,6 @@ class Environment {
   inline void PushAsyncCallbackScope();
   inline void PopAsyncCallbackScope();
 
-  class ImmediateInfo {
-   public:
-    inline AliasedBuffer<uint32_t, v8::Uint32Array>& fields();
-    inline uint32_t count() const;
-    inline uint32_t ref_count() const;
-    inline bool has_outstanding() const;
-
-    inline void count_inc(uint32_t increment);
-    inline void count_dec(uint32_t decrement);
-
-    inline void ref_count_inc(uint32_t increment);
-    inline void ref_count_dec(uint32_t decrement);
-
-    ImmediateInfo(const ImmediateInfo&) = delete;
-    ImmediateInfo& operator=(const ImmediateInfo&) = delete;
-
-   private:
-    friend class Environment;  // So we can call the constructor.
-    inline explicit ImmediateInfo(v8::Isolate* isolate);
-
-    enum Fields {
-      kCount,
-      kRefCount,
-      kHasOutstanding,
-      kFieldsCount
-    };
-
-    AliasedBuffer<uint32_t, v8::Uint32Array> fields_;
-  };
-
   class TickInfo {
    public:
     inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();

Original file line number	Diff line number	Diff line change
`@@ -232,39 +232,39 @@ inline void Environment::PopAsyncCallbackScope() {`
`232`	`232`	`async_callback_scope_depth_--;`
`233`	`233`	`}`
`234`	`234`
`235`		`-inline Environment::ImmediateInfo::ImmediateInfo(v8::Isolate* isolate)`
	`235`	`+inline ImmediateInfo::ImmediateInfo(v8::Isolate* isolate)`
`236`	`236`	`: fields_(isolate, kFieldsCount) {}`
`237`	`237`
`238`	`238`	`inline AliasedBuffer<uint32_t, v8::Uint32Array>&`
`239`		`- Environment::ImmediateInfo::fields() {`
	`239`	`+ ImmediateInfo::fields() {`
`240`	`240`	`return fields_;`
`241`	`241`	`}`
`242`	`242`
`243`		`-inline uint32_t Environment::ImmediateInfo::count() const {`
	`243`	`+inline uint32_t ImmediateInfo::count() const {`
`244`	`244`	`return fields_[kCount];`
`245`	`245`	`}`
`246`	`246`
`247`		`-inline uint32_t Environment::ImmediateInfo::ref_count() const {`
	`247`	`+inline uint32_t ImmediateInfo::ref_count() const {`
`248`	`248`	`return fields_[kRefCount];`
`249`	`249`	`}`
`250`	`250`
`251`		`-inline bool Environment::ImmediateInfo::has_outstanding() const {`
	`251`	`+inline bool ImmediateInfo::has_outstanding() const {`
`252`	`252`	`return fields_[kHasOutstanding] == 1;`
`253`	`253`	`}`
`254`	`254`
`255`		`-inline void Environment::ImmediateInfo::count_inc(uint32_t increment) {`
	`255`	`+inline void ImmediateInfo::count_inc(uint32_t increment) {`
`256`	`256`	`fields_[kCount] += increment;`
`257`	`257`	`}`
`258`	`258`
`259`		`-inline void Environment::ImmediateInfo::count_dec(uint32_t decrement) {`
	`259`	`+inline void ImmediateInfo::count_dec(uint32_t decrement) {`
`260`	`260`	`fields_[kCount] -= decrement;`
`261`	`261`	`}`
`262`	`262`
`263`		`-inline void Environment::ImmediateInfo::ref_count_inc(uint32_t increment) {`
	`263`	`+inline void ImmediateInfo::ref_count_inc(uint32_t increment) {`
`264`	`264`	`fields_[kRefCount] += increment;`
`265`	`265`	`}`
`266`	`266`
`267`		`-inline void Environment::ImmediateInfo::ref_count_dec(uint32_t decrement) {`
	`267`	`+inline void ImmediateInfo::ref_count_dec(uint32_t decrement) {`
`268`	`268`	`fields_[kRefCount] -= decrement;`
`269`	`269`	`}`
`270`	`270`
`@@ -435,7 +435,7 @@ inline AsyncHooks* Environment::async_hooks() {`
`435`	`435`	`return &async_hooks_;`
`436`	`436`	`}`
`437`	`437`
`438`		`-inline Environment::ImmediateInfo* Environment::immediate_info() {`
	`438`	`+inline ImmediateInfo* Environment::immediate_info() {`
`439`	`439`	`return &immediate_info_;`
`440`	`440`	`}`
`441`	`441`