Changeset 43917 in vbox for trunk/src/VBox/HostServices/HostChannel/HostChannel.cpp

Timestamp:

Nov 20, 2012 9:11:14 AM (12 years ago)

Author:

vboxsync

Message:

HostServices/HostChannel: fixes and code cleanup.

File:

• trunk/src/VBox/HostServices/HostChannel/HostChannel.cpp (modified) (16 diffs)

trunk/src/VBox/HostServices/HostChannel/HostChannel.cpp

@@ -229 +229 @@
 static void vhcInstanceDestroy(VBOXHOSTCHINSTANCE *pInstance)
 {
-    /* @todo free u32Handle? */
+    HOSTCHLOG(("HostChannel: destroy %p\n", pInstance));
 }
 
 static int32_t vhcInstanceAddRef(VBOXHOSTCHINSTANCE *pInstance)
 {
+    HOSTCHLOG(("INST: %p %d addref\n", pInstance, pInstance->cRefs));
     return ASMAtomicIncS32(&pInstance->cRefs);
 }
@@ -240 +241 @@
 {
     int32_t c = ASMAtomicDecS32(&pInstance->cRefs);
+    HOSTCHLOG(("INST: %p %d release\n", pInstance, pInstance->cRefs));
     Assert(c >= 0);
     if (c == 0)
@@ -264 +266 @@
             if (RT_SUCCESS(rc))
             {
+                /* Used by the client, that is in the list of channels. */
                 vhcInstanceAddRef(pInstance);
-
+                /* Add to the list of created channel instances. It is inactive while pClient is 0. */
+                RTListAppend(&pClient->listChannels, &pInstance->nodeClient);
+
+                /* Return to the caller. */
+                vhcInstanceAddRef(pInstance);
                 *ppInstance = pInstance;
             }
@@ -296 +303 @@
         RTListForEach(&pClient->listChannels, pIter, VBOXHOSTCHINSTANCE, nodeClient)
         {
-            if (pIter->u32Handle == u32Handle)
+            if (   pIter->pClient
+                && pIter->u32Handle == u32Handle)
             {
                 pInstance = pIter;
@@ -328 +336 @@
         RTListForEach(&pClient->listChannels, pIter, VBOXHOSTCHINSTANCE, nodeClient)
         {
-            if (pIter->pvChannel == pvChannel)
+            if (   pIter->pClient
+                && pIter->pvChannel == pvChannel)
             {
                 pInstance = pIter;
@@ -346 +355 @@
 static void vhcInstanceDetach(VBOXHOSTCHINSTANCE *pInstance)
 {
+    HOSTCHLOG(("HostChannel: detach %p\n", pInstance));
+
     if (pInstance->pProvider)
     {
@@ -351 +362 @@
         RTListNodeRemove(&pInstance->nodeProvider);
         vhcProviderRelease(pInstance->pProvider);
-        vhcInstanceRelease(pInstance); /* Not in the list anymore. */
-    }
-
-    RTListNodeRemove(&pInstance->nodeClient);
-    vhcInstanceRelease(pInstance); /* Not in the list anymore. */
+        pInstance->pProvider = NULL;
+        vhcInstanceRelease(pInstance); /* Not in the provider's list anymore. */
+    }
+
+    int rc = vboxHostChannelLock();
+
+    if (RT_SUCCESS(rc))
+    {
+        RTListNodeRemove(&pInstance->nodeClient);
+
+        vboxHostChannelUnlock();
+
+        vhcInstanceRelease(pInstance); /* Not used by the client anymore. */
+    }
 }
 
@@ -497 +517 @@
 void vboxHostChannelClientDisconnect(VBOXHOSTCHCLIENT *pClient)
 {
-    /* Clear the list of contexts. */
+    /* Clear the list of contexts and prevent acceess to the client. */
     int rc = vboxHostChannelLock();
     if (RT_SUCCESS(rc))
     {
         VBOXHOSTCHCALLBACKCTX *pIter;
-        RTListForEach(&pClient->listContexts, pIter, VBOXHOSTCHCALLBACKCTX, nodeClient)
+        VBOXHOSTCHCALLBACKCTX *pNext;
+        RTListForEachSafe(&pClient->listContexts, pIter, pNext, VBOXHOSTCHCALLBACKCTX, nodeClient)
         {
             pIter->pClient = NULL;
+            RTListNodeRemove(&pIter->nodeClient);
         }
 
@@ -558 +580 @@
                     pInstance->pvChannel = pvChannel;
 
-                    vhcInstanceAddRef(pInstance); /* Referenced by the list client's channels. */
-                    RTListAppend(&pClient->listChannels, &pInstance->nodeClient);
+                    /* It is already in the channels list of the client. */
 
                     vhcInstanceAddRef(pInstance); /* Referenced by the list of provider's channels. */
@@ -575 +596 @@
             }
 
+            if (RT_FAILURE(rc))
+            {
+                vhcInstanceDetach(pInstance);
+            }
+
             vhcInstanceRelease(pInstance);
         }
@@ -622 +648 @@
     VBOXHOSTCHINSTANCE *pInstance = vhcInstanceFind(pClient, u32Handle);
 
-    if (   pInstance
-        && pInstance->pProvider)
-    {
-        pInstance->pProvider->iface.HostChannelSend(pInstance->pvChannel, pvData, cbData);
+    if (pInstance)
+    {
+        if (pInstance->pProvider)
+        {
+            pInstance->pProvider->iface.HostChannelSend(pInstance->pvChannel, pvData, cbData);
+        }
 
         vhcInstanceRelease(pInstance);
@@ -650 +678 @@
     VBOXHOSTCHINSTANCE *pInstance = vhcInstanceFind(pClient, u32Handle);
 
-    if (   pInstance
-        && pInstance->pProvider)
-    {
-        rc = pInstance->pProvider->iface.HostChannelRecv(pInstance->pvChannel, pvData, cbData,
-                                                         pu32SizeReceived, pu32SizeRemaining);
-
-        HOSTCHLOG(("HostChannel: Recv: (%d) handle %d, rc %Rrc, recv %d, rem %d\n",
-                        pClient->u32ClientID, u32Handle, rc, cbData, *pu32SizeReceived, *pu32SizeRemaining));
+    if (pInstance)
+    {
+        if (pInstance->pProvider)
+        {
+            rc = pInstance->pProvider->iface.HostChannelRecv(pInstance->pvChannel, pvData, cbData,
+                                                             pu32SizeReceived, pu32SizeRemaining);
+
+            HOSTCHLOG(("HostChannel: Recv: (%d) handle %d, rc %Rrc, recv %d, rem %d\n",
+                            pClient->u32ClientID, u32Handle, rc, cbData, *pu32SizeReceived, *pu32SizeRemaining));
+        }
 
         vhcInstanceRelease(pInstance);
@@ -684 +714 @@
     VBOXHOSTCHINSTANCE *pInstance = vhcInstanceFind(pClient, u32Handle);
 
-    if (   pInstance
-        && pInstance->pProvider)
-    {
-        pInstance->pProvider->iface.HostChannelControl(pInstance->pvChannel, u32Code,
-                                                       pvParm, cbParm,
-                                                       pvData, cbData, pu32SizeDataReturned);
+    if (pInstance)
+    {
+        if (pInstance->pProvider)
+        {
+            pInstance->pProvider->iface.HostChannelControl(pInstance->pvChannel, u32Code,
+                                                           pvParm, cbParm,
+                                                           pvData, cbData, pu32SizeDataReturned);
+        }
 
         vhcInstanceRelease(pInstance);
@@ -785 +817 @@
 }
 
-
 /* @thread provider */
 static DECLCALLBACK(void) HostChannelCallbackEvent(void *pvCallbacks, void *pvChannel,
@@ -844 +875 @@
     if (!pInstance)
     {
-        vboxHostChannelUnlock();
-
-#ifdef DEBUG_sunlover
-        AssertFailed();
-#endif
+        /* Instance was already detached. Skip the event. */
+        vboxHostChannelUnlock();
+
         return;
     }
@@ -887 +916 @@
             pEvent->cbEvent = cbEvent;
 
-            if (RT_SUCCESS(rc))
-            {
-                RTListAppend(&pClient->listEvents, &pEvent->NodeEvent);
-            }
-            else
-            {
-                RTMemFree(pEvent);
-            }
+            RTListAppend(&pClient->listEvents, &pEvent->NodeEvent);
         }
     }
 
     vboxHostChannelUnlock();
-}
-
+
+    vhcInstanceRelease(pInstance);
+}
+
+/* @thread provider */
 static DECLCALLBACK(void) HostChannelCallbackDeleted(void *pvCallbacks, void *pvChannel)
 {