Bug 1824465 - Part 18: Make PSocketProcess refcounted, r=necko-review…

…ers,kershaw Differential Revision: https://phabricator.services.mozilla.com/D173733
iaxat · Apr 19, 2023 · 633e8f7 · 633e8f7
1 parent 9082d1b
commit 633e8f7
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 15 deletions.
diff --git a/netwerk/ipc/PSocketProcess.ipdl b/netwerk/ipc/PSocketProcess.ipdl
@@ -88,7 +88,7 @@ struct SocketPorcessInitAttributes {
   FileDescriptor? mSandboxBroker;
 };
 
-[ManualDealloc, NeedsOtherPid]
+[NeedsOtherPid]
 sync protocol PSocketProcess
 {
   manages PDNSRequest;

diff --git a/netwerk/ipc/SocketProcessChild.cpp b/netwerk/ipc/SocketProcessChild.cpp
@@ -295,9 +295,15 @@ mozilla::ipc::IPCResult SocketProcessChild::RecvInitSocketProcessBridgeParent(
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!mSocketProcessBridgeParentMap.Contains(aContentProcessId));
 
-  mSocketProcessBridgeParentMap.InsertOrUpdate(
-      aContentProcessId, MakeRefPtr<SocketProcessBridgeParent>(
-                             aContentProcessId, std::move(aEndpoint)));
+  if (NS_WARN_IF(!aEndpoint.IsValid())) {
+    return IPC_FAIL(this, "invalid endpoint");
+  }
+
+  auto bridge = MakeRefPtr<SocketProcessBridgeParent>(aContentProcessId);
+  MOZ_ALWAYS_TRUE(aEndpoint.Bind(bridge));
+
+  mSocketProcessBridgeParentMap.InsertOrUpdate(aContentProcessId,
+                                               std::move(bridge));
   return IPC_OK();
 }
 

diff --git a/netwerk/ipc/SocketProcessChild.h b/netwerk/ipc/SocketProcessChild.h
@@ -27,7 +27,7 @@ class BackgroundDataBridgeParent;
 // This is allocated and kept alive by SocketProcessImpl.
 class SocketProcessChild final : public PSocketProcessChild {
  public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SocketProcessChild)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SocketProcessChild, final)
 
   SocketProcessChild();
 

diff --git a/netwerk/ipc/SocketProcessHost.cpp b/netwerk/ipc/SocketProcessHost.cpp
@@ -165,7 +165,7 @@ void SocketProcessHost::InitAfterConnect(bool aSucceeded) {
     return;
   }
 
-  mSocketProcessParent = MakeUnique<SocketProcessParent>(this);
+  mSocketProcessParent = MakeRefPtr<SocketProcessParent>(this);
   DebugOnly<bool> rv = TakeInitialEndpoint().Bind(mSocketProcessParent.get());
   MOZ_ASSERT(rv);
 

diff --git a/netwerk/ipc/SocketProcessHost.h b/netwerk/ipc/SocketProcessHost.h
@@ -115,7 +115,7 @@ class SocketProcessHost final : public mozilla::ipc::GeckoChildProcessHost {
   enum class LaunchPhase { Unlaunched, Waiting, Complete };
   LaunchPhase mLaunchPhase;
 
-  UniquePtr<SocketProcessParent> mSocketProcessParent;
+  RefPtr<SocketProcessParent> mSocketProcessParent;
   // mShutdownRequested is set to true only when Shutdown() is called.
   // If mShutdownRequested is false and the IPC channel is closed,
   // OnProcessUnexpectedShutdown will be invoked.

diff --git a/netwerk/ipc/SocketProcessImpl.cpp b/netwerk/ipc/SocketProcessImpl.cpp
@@ -67,10 +67,10 @@ bool SocketProcessImpl::Init(int aArgc, char* aArgv[]) {
     return false;
   }
 
-  return mSocketProcessChild.Init(TakeInitialEndpoint(), *parentBuildID);
+  return mSocketProcessChild->Init(TakeInitialEndpoint(), *parentBuildID);
 }
 
-void SocketProcessImpl::CleanUp() { mSocketProcessChild.CleanUp(); }
+void SocketProcessImpl::CleanUp() { mSocketProcessChild->CleanUp(); }
 
 }  // namespace net
 }  // namespace mozilla
diff --git a/netwerk/ipc/SocketProcessImpl.h b/netwerk/ipc/SocketProcessImpl.h
@@ -26,7 +26,7 @@ class SocketProcessImpl final : public mozilla::ipc::ProcessChild {
   void CleanUp() override;
 
  private:
-  SocketProcessChild mSocketProcessChild;
+  RefPtr<SocketProcessChild> mSocketProcessChild = new SocketProcessChild;
 };
 
 }  // namespace net

diff --git a/netwerk/ipc/SocketProcessParent.cpp b/netwerk/ipc/SocketProcessParent.cpp
@@ -293,18 +293,18 @@ mozilla::ipc::IPCResult SocketProcessParent::RecvCachePushCheck(
 class DeferredDeleteSocketProcessParent : public Runnable {
  public:
   explicit DeferredDeleteSocketProcessParent(
-      UniquePtr<SocketProcessParent>&& aParent)
+      RefPtr<SocketProcessParent>&& aParent)
       : Runnable("net::DeferredDeleteSocketProcessParent"),
         mParent(std::move(aParent)) {}
 
   NS_IMETHODIMP Run() override { return NS_OK; }
 
  private:
-  UniquePtr<SocketProcessParent> mParent;
+  RefPtr<SocketProcessParent> mParent;
 };
 
 /* static */
-void SocketProcessParent::Destroy(UniquePtr<SocketProcessParent>&& aParent) {
+void SocketProcessParent::Destroy(RefPtr<SocketProcessParent>&& aParent) {
   NS_DispatchToMainThread(
       new DeferredDeleteSocketProcessParent(std::move(aParent)));
 }

diff --git a/netwerk/ipc/SocketProcessParent.h b/netwerk/ipc/SocketProcessParent.h
@@ -31,8 +31,9 @@ class SocketProcessParent final
  public:
   friend class SocketProcessHost;
 
+  NS_INLINE_DECL_REFCOUNTING(SocketProcessParent, final)
+
   explicit SocketProcessParent(SocketProcessHost* aHost);
-  ~SocketProcessParent();
 
   static SocketProcessParent* GetSingleton();
 
@@ -112,10 +113,12 @@ class SocketProcessParent final
 #endif  // defined(XP_WIN)
 
  private:
+  ~SocketProcessParent();
+
   SocketProcessHost* mHost;
   UniquePtr<dom::MemoryReportRequestHost> mMemoryReportRequest;
 
-  static void Destroy(UniquePtr<SocketProcessParent>&& aParent);
+  static void Destroy(RefPtr<SocketProcessParent>&& aParent);
 };
 
 }  // namespace net