src: move Environment ctor/dtor into env.cc

This makes it easier to use methods from other headers in the constructor and destructor. Backport-PR-URL: #21599 PR-URL: #19202 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Aug 16, 2018 · 2ee4bb7 · 2ee4bb7
1 parent 8053474
commit 2ee4bb7
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 72 deletions.
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -277,76 +277,6 @@ inline Environment* Environment::GetCurrent(
       info.Data().template As<v8::External>()->Value());
 }
 
-inline Environment::Environment(IsolateData* isolate_data,
-                                v8::Local<v8::Context> context)
-    : isolate_(context->GetIsolate()),
-      isolate_data_(isolate_data),
-      timer_base_(uv_now(isolate_data->event_loop())),
-      using_domains_(false),
-      printed_error_(false),
-      trace_sync_io_(false),
-      abort_on_uncaught_exception_(false),
-      makecallback_cntr_(0),
-      scheduled_immediate_count_(isolate_, 1),
-#if HAVE_INSPECTOR
-      inspector_agent_(new inspector::Agent(this)),
-#endif
-      handle_cleanup_waiting_(0),
-      http_parser_buffer_(nullptr),
-      fs_stats_field_array_(nullptr),
-      context_(context->GetIsolate(), context) {
-  // We'll be creating new objects so make sure we've entered the context.
-  v8::HandleScope handle_scope(isolate());
-  v8::Context::Scope context_scope(context);
-  set_as_external(v8::External::New(isolate(), this));
-
-  v8::Local<v8::Primitive> null = v8::Null(isolate());
-  v8::Local<v8::Object> binding_cache_object = v8::Object::New(isolate());
-  CHECK(binding_cache_object->SetPrototype(context, null).FromJust());
-  set_binding_cache_object(binding_cache_object);
-
-  v8::Local<v8::Object> internal_binding_cache_object =
-      v8::Object::New(isolate());
-  CHECK(internal_binding_cache_object->SetPrototype(context, null).FromJust());
-  set_internal_binding_cache_object(internal_binding_cache_object);
-
-  set_module_load_list_array(v8::Array::New(isolate()));
-
-  AssignToContext(context);
-
-  destroy_async_id_list_.reserve(512);
-  performance_state_.reset(new performance::performance_state(isolate()));
-  performance_state_->milestones[
-      performance::NODE_PERFORMANCE_MILESTONE_ENVIRONMENT] =
-          PERFORMANCE_NOW();
-  performance_state_->milestones[
-    performance::NODE_PERFORMANCE_MILESTONE_NODE_START] =
-        performance::performance_node_start;
-  performance_state_->milestones[
-    performance::NODE_PERFORMANCE_MILESTONE_V8_START] =
-        performance::performance_v8_start;
-}
-
-inline Environment::~Environment() {
-  v8::HandleScope handle_scope(isolate());
-
-#if HAVE_INSPECTOR
-  // Destroy inspector agent before erasing the context. The inspector
-  // destructor depends on the context still being accessible.
-  inspector_agent_.reset();
-#endif
-
-  context()->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex,
-                                             nullptr);
-#define V(PropertyName, TypeName) PropertyName ## _.Reset();
-  ENVIRONMENT_STRONG_PERSISTENT_PROPERTIES(V)
-#undef V
-
-  delete[] heap_statistics_buffer_;
-  delete[] heap_space_statistics_buffer_;
-  delete[] http_parser_buffer_;
-}
-
 inline v8::Isolate* Environment::isolate() const {
   return isolate_;
 }

diff --git a/src/env.cc b/src/env.cc
@@ -77,6 +77,76 @@ IsolateData::~IsolateData() {
     platform_->UnregisterIsolate(this);
 }
 
+Environment::Environment(IsolateData* isolate_data,
+                         Local<Context> context)
+    : isolate_(context->GetIsolate()),
+      isolate_data_(isolate_data),
+      timer_base_(uv_now(isolate_data->event_loop())),
+      using_domains_(false),
+      printed_error_(false),
+      trace_sync_io_(false),
+      abort_on_uncaught_exception_(false),
+      makecallback_cntr_(0),
+      scheduled_immediate_count_(isolate_, 1),
+#if HAVE_INSPECTOR
+      inspector_agent_(new inspector::Agent(this)),
+#endif
+      handle_cleanup_waiting_(0),
+      http_parser_buffer_(nullptr),
+      fs_stats_field_array_(nullptr),
+      context_(context->GetIsolate(), context) {
+  // We'll be creating new objects so make sure we've entered the context.
+  v8::HandleScope handle_scope(isolate());
+  v8::Context::Scope context_scope(context);
+  set_as_external(v8::External::New(isolate(), this));
+
+  v8::Local<v8::Primitive> null = v8::Null(isolate());
+  v8::Local<v8::Object> binding_cache_object = v8::Object::New(isolate());
+  CHECK(binding_cache_object->SetPrototype(context, null).FromJust());
+  set_binding_cache_object(binding_cache_object);
+
+  v8::Local<v8::Object> internal_binding_cache_object =
+      v8::Object::New(isolate());
+  CHECK(internal_binding_cache_object->SetPrototype(context, null).FromJust());
+  set_internal_binding_cache_object(internal_binding_cache_object);
+
+  set_module_load_list_array(v8::Array::New(isolate()));
+
+  AssignToContext(context);
+
+  destroy_async_id_list_.reserve(512);
+  performance_state_.reset(new performance::performance_state(isolate()));
+  performance_state_->milestones[
+      performance::NODE_PERFORMANCE_MILESTONE_ENVIRONMENT] =
+          PERFORMANCE_NOW();
+  performance_state_->milestones[
+    performance::NODE_PERFORMANCE_MILESTONE_NODE_START] =
+        performance::performance_node_start;
+  performance_state_->milestones[
+    performance::NODE_PERFORMANCE_MILESTONE_V8_START] =
+        performance::performance_v8_start;
+}
+
+Environment::~Environment() {
+  v8::HandleScope handle_scope(isolate());
+
+#if HAVE_INSPECTOR
+  // Destroy inspector agent before erasing the context. The inspector
+  // destructor depends on the context still being accessible.
+  inspector_agent_.reset();
+#endif
+
+  context()->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex,
+                                             nullptr);
+#define V(PropertyName, TypeName) PropertyName ## _.Reset();
+  ENVIRONMENT_STRONG_PERSISTENT_PROPERTIES(V)
+#undef V
+
+  delete[] heap_statistics_buffer_;
+  delete[] heap_space_statistics_buffer_;
+  delete[] http_parser_buffer_;
+}
+
 void Environment::Start(int argc,
                         const char* const* argv,
                         int exec_argc,

diff --git a/src/env.h b/src/env.h
@@ -547,8 +547,8 @@ class Environment {
   static inline Environment* GetCurrent(
       const v8::PropertyCallbackInfo<T>& info);
 
-  inline Environment(IsolateData* isolate_data, v8::Local<v8::Context> context);
-  inline ~Environment();
+  Environment(IsolateData* isolate_data, v8::Local<v8::Context> context);
+  ~Environment();
 
   void Start(int argc,
              const char* const* argv,