src: move TrackingTraceStateObserver out of Environment

joyeecheung · joyeecheung · commit 9f37d3c114b2 · 2019-03-27T10:30:16.000-04:00
PR-URL: nodejs#26824 Refs: nodejs#26776 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/env.cc b/src/env.cc
@@ -119,7 +119,7 @@ void InitThreadLocalOnce() {
   CHECK_EQ(0, uv_key_create(&Environment::thread_local_env));
 }
 
-void Environment::TrackingTraceStateObserver::UpdateTraceCategoryState() {
+void TrackingTraceStateObserver::UpdateTraceCategoryState() {
   if (!env_->owns_process_state()) {
     // Ideally, we’d have a consistent story that treats all threads/Environment
     // instances equally here. However, tracing is essentially global, and this
diff --git a/src/env.h b/src/env.h
@@ -665,6 +665,25 @@ class TickInfo {
   AliasedBuffer<uint8_t, v8::Uint8Array> fields_;
 };
 
+class TrackingTraceStateObserver :
+    public v8::TracingController::TraceStateObserver {
+ public:
+  explicit TrackingTraceStateObserver(Environment* env) : env_(env) {}
+
+  void OnTraceEnabled() override {
+    UpdateTraceCategoryState();
+  }
+
+  void OnTraceDisabled() override {
+    UpdateTraceCategoryState();
+  }
+
+ private:
+  void UpdateTraceCategoryState();
+
+  Environment* env_;
+};
+
 class Environment {
  public:
   Environment(const Environment&) = delete;
@@ -979,25 +998,6 @@ class Environment {
   // This needs to be available for the JS-land setImmediate().
   void ToggleImmediateRef(bool ref);
 
-  class TrackingTraceStateObserver :
-      public v8::TracingController::TraceStateObserver {
-   public:
-    explicit TrackingTraceStateObserver(Environment* env) : env_(env) {}
-
-    void OnTraceEnabled() override {
-      UpdateTraceCategoryState();
-    }
-
-    void OnTraceDisabled() override {
-      UpdateTraceCategoryState();
-    }
-
-   private:
-    void UpdateTraceCategoryState();
-
-    Environment* env_;
-  };
-
   class ShouldNotAbortOnUncaughtScope {
    public:
     explicit inline ShouldNotAbortOnUncaughtScope(Environment* env);

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ void InitThreadLocalOnce() {`
`119`	`119`	`CHECK_EQ(0, uv_key_create(&Environment::thread_local_env));`
`120`	`120`	`}`
`121`	`121`
`122`		`-void Environment::TrackingTraceStateObserver::UpdateTraceCategoryState() {`
	`122`	`+void TrackingTraceStateObserver::UpdateTraceCategoryState() {`
`123`	`123`	`if (!env_->owns_process_state()) {`
`124`	`124`	`// Ideally, we’d have a consistent story that treats all threads/Environment`
`125`	`125`	`// instances equally here. However, tracing is essentially global, and this`