src: move MemoryInfo() for worker code to .cc files

addaleax · codebytere · commit f56de5a3b43a · 2020-02-17T10:54:24.000-08:00
This is a) the right thing to do anyway because these functions can not be inlined by the compiler and b) avoids compilation warnings in the following commit. PR-URL: #31386 Refs: openjs-foundation/summit#240 Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/src/node_messaging.cc b/src/node_messaging.cc
@@ -899,6 +899,10 @@ void MessagePort::Entangle(MessagePort* a, MessagePortData* b) {
   MessagePortData::Entangle(a->data_.get(), b);
 }
 
+void MessagePort::MemoryInfo(MemoryTracker* tracker) const {
+  tracker->TrackField("data", data_);
+}
+
 Local<FunctionTemplate> GetMessagePortConstructorTemplate(Environment* env) {
   // Factor generating the MessagePort JS constructor into its own piece
   // of code, because it is needed early on in the child environment setup.
diff --git a/src/node_messaging.h b/src/node_messaging.h
@@ -191,10 +191,7 @@ class MessagePort : public HandleWrap {
   // NULL pointer to the C++ MessagePort object is also detached.
   inline bool IsDetached() const;
 
-  void MemoryInfo(MemoryTracker* tracker) const override {
-    tracker->TrackField("data", data_);
-  }
-
+  void MemoryInfo(MemoryTracker* tracker) const override;
   SET_MEMORY_INFO_NAME(MessagePort)
   SET_SELF_SIZE(MessagePort)
 
diff --git a/src/node_worker.cc b/src/node_worker.cc
@@ -655,6 +655,10 @@ void Worker::Exit(int code) {
   }
 }
 
+void Worker::MemoryInfo(MemoryTracker* tracker) const {
+  tracker->TrackField("parent_port", parent_port_);
+}
+
 namespace {
 
 // Return the MessagePort that is global for this Environment and communicates
diff --git a/src/node_worker.h b/src/node_worker.h
@@ -39,13 +39,10 @@ class Worker : public AsyncWrap {
   // Wait for the worker thread to stop (in a blocking manner).
   void JoinThread();
 
-  void MemoryInfo(MemoryTracker* tracker) const override {
-    tracker->TrackField("parent_port", parent_port_);
-  }
-
   template <typename Fn>
   inline bool RequestInterrupt(Fn&& cb);
 
+  void MemoryInfo(MemoryTracker* tracker) const override;
   SET_MEMORY_INFO_NAME(Worker)
   SET_SELF_SIZE(Worker)
 

Original file line number	Diff line number	Diff line change
`@@ -655,6 +655,10 @@ void Worker::Exit(int code) {`
`655`	`655`	`}`
`656`	`656`	`}`
`657`	`657`
	`658`	`+void Worker::MemoryInfo(MemoryTracker* tracker) const {`
	`659`	`+ tracker->TrackField("parent_port", parent_port_);`
	`660`	`+}`
	`661`	`+`
`658`	`662`	`namespace {`
`659`	`663`
`660`	`664`	`// Return the MessagePort that is global for this Environment and communicates`