Changeset 2440 in vbox for trunk

Timestamp:

Apr 30, 2007 3:55:21 PM (18 years ago)

Author:

vboxsync

Message:

XPCOM/IPC/DConnect: Improved: Prune all object instances created on behalf of a peer when it disconnects (normally or abnormally) to release affected objects.

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

• daemon/src/ipcd.cpp (modified) (2 diffs)
• extensions/dconnect/src/ipcDConnectService.cpp (modified) (4 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcd.cpp

@@ -118 +118 @@
 IPC_NotifyClientUp(ipcClient *client)
 {
+    LOG(("IPC_NotifyClientUp: clientID=%d\n", client->ID()));
+
     // notify modules before other clients
     IPC_NotifyModulesClientUp(client);
@@ -131 +133 @@
 IPC_NotifyClientDown(ipcClient *client)
 {
+    LOG(("IPC_NotifyClientDown: clientID=%d\n", client->ID()));
+
     // notify modules before other clients
     IPC_NotifyModulesClientDown(client);

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -68 +68 @@
 
 // XXX TODO:
-//  1. add a client observer and prune mInstances when a peer disconnects
-//  2. add thread affinity field to SETUP messages
-//  3. support array parameters
+//  1. add thread affinity field to SETUP messages
+//  2. support array parameters
 
 //-----------------------------------------------------------------------------
@@ -213 +212 @@
   nsISupports      *RealInstance()  { return mInstance; }
   nsIInterfaceInfo *InterfaceInfo() { return mIInfo; }
+  PRUint32          Peer()          { return mPeer; }
 
   DConnectInstanceKey::Key GetKey() {
@@ -2220 +2220 @@
 {
   // this method is to be called on ipcDConnectService shutdown only
-  // (after which no DConnectInstance's may exist), so forcedly delete them
+  // (after which no DConnectInstances may exist), so forcibly delete them
   // disregarding the reference counter
     
@@ -2646 +2646 @@
 }
 
+struct PruneInstanceMapForPeerArgs
+{
+  PRUint32 clientID;
+  DConnectInstanceMap &instances;
+  DConnectInstanceSet &instanceSet;
+};
+
+PR_STATIC_CALLBACK(PLDHashOperator)
+PruneInstanceMapForPeer (const DConnectInstanceKey::Key &aKey,
+                         DConnectInstance *aData,
+                         void *userArg)
+{
+  PruneInstanceMapForPeerArgs *args = (PruneInstanceMapForPeerArgs *)userArg;
+  NS_ASSERTION(args, "PruneInstanceMapForPeerArgs is NULL");
+
+  if (args && args->clientID == aData->Peer())
+  {
+#ifdef IPC_LOGGING
+    const char *name;
+    aData->InterfaceInfo()->GetNameShared(&name);
+    LOG(("PruneInstanceMapForClient(): instance=%p iface=%p {%s} peer=%d\n",
+         aData, aData->RealInstance(), name, args->clientID));
+#endif
+    args->instances.Remove(aKey);
+    args->instanceSet.Remove(aData);
+    /* ignore the reference counter: the client is officially dead */
+    delete aData;
+  }
+  return PL_DHASH_NEXT;
+}
+
 NS_IMETHODIMP
 ipcDConnectService::OnClientStateChange(PRUint32 aClientID,
                                         PRUint32 aClientState)
 {
-  LOG (("ipcDConnectService::OnClientStateChange: aClientID=%d, aClientState=%d\n",
-        aClientID, aClientState));
-
-  if (aClientID == IPC_SENDER_ANY)
-  {
+  LOG(("ipcDConnectService::OnClientStateChange: aClientID=%d, aClientState=%d\n",
+       aClientID, aClientState));
+
+  if (aClientState == ipcIClientObserver::CLIENT_DOWN)
+  {
+    if (aClientID == IPC_SENDER_ANY)
+    {
       // a special case: our IPC system is being shutdown, try to safely
       // uninitialize everything...
       Shutdown();
+    }
+    else
+    {
+      LOG(("ipcDConnectService::OnClientStateChange: "
+           "pruning all instances created for peer %d...\n", aClientID));
+
+      nsAutoLock lock (mLock);
+
+      // make sure we have released all instances
+      PruneInstanceMapForPeerArgs args = { aClientID, mInstances, mInstanceSet };
+      mInstances.EnumerateRead(PruneInstanceMapForPeer, (void *)&args);
+    }
   }