Changeset 6981 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 18, 2008 10:05:36 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

28172

Message:

HostServices/SharedClipboard: attempt to handle the guest reconnecting without first disconnecting more gracefully

File:

• trunk/src/VBox/Main/hgcm/HGCM.cpp (modified) (42 diffs)

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -97 +97 @@
         char *m_pszSvcName;
         char *m_pszSvcLibrary;
-
+        
         RTLDRMOD m_hLdrMod;
         PFNVBOXHGCMSVCLOAD m_pfnLoad;
@@ -107 +107 @@
 
         uint32_t *m_paClientIds;
-
+        
         HGCMSVCEXTHANDLE m_hExtension;
 
@@ -126 +126 @@
 
         static DECLCALLBACK(void) svcHlpCallComplete (VBOXHGCMCALLHANDLE callHandle, int32_t rc);
-
+        static DECLCALLBACK(void) svcHlpDisconnectClient (void *pvInstance, uint32_t u32ClientId);
+        
     public:
 
@@ -147 +148 @@
 
         int CreateAndConnectClient (uint32_t *pu32ClientIdOut, uint32_t u32ClientIdIn);
-        int DisconnectClient (uint32_t u32ClientId);
+        int DisconnectClient (uint32_t u32ClientId, bool fFromService);
 
         int HostCall (uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM *paParms);
@@ -239 +240 @@
      * If only library name is specified, then try to load it from:
      *   - RTPathAppPrivateArch
-     *   - RTPathSharedLibs (legacy)
+     *   - RTPathSharedLibs
+     *   - default system LIBPATH.
      */
     int rc = VINF_SUCCESS;
-
+    
     if (RTPathHavePath (pszName))
     {
@@ -250 +252 @@
     else
     {
+        if (strlen (pszName) >= RTPATH_MAX)
+        {
+            return VERR_FILENAME_TOO_LONG;
+        }
+    
         /* Try default locations. */
         char szBase[RTPATH_MAX];
-
+        
         /* Get the appropriate base path. */
         int i;
-        for (i = 0; i < 2; i++)
+        for (i = 0; i < 3; i++)
         {
             if (i == 0)
@@ -261 +268 @@
                 rc = RTPathAppPrivateArch(szBase, sizeof (szBase));
             }
-            else
+            else if (i == 1)
             {
                 rc = RTPathSharedLibs(szBase, sizeof (szBase));
             }
-
+            else
+            {
+                szBase[0] = 0;
+                rc = VINF_SUCCESS;
+            }
+            
             if (RT_SUCCESS(rc))
             {
                 char szPath[RTPATH_MAX];
-
+        
                 /* szPath = pszBase + pszName */
-                rc = RTPathAbsEx (szBase, pszName, szPath, sizeof (szPath));
-
+                if (szBase[0] != 0)
+                {
+                    rc = RTPathAbsEx (szBase, pszName, szPath, sizeof (szPath));
+                }
+                else
+                {
+                    strcpy (szPath, pszName);
+                }
+            
                 if (RT_SUCCESS(rc))
                 {
                     rc = RTLdrLoad (szPath, phLdrMod);
-
+            
                     if (RT_SUCCESS(rc))
                     {
@@ -286 +305 @@
         }
     }
-
+    
     return rc;
 }
@@ -430 +449 @@
     public:
         HGCMMsgHeader () : pCmd (NULL), pHGCMPort (NULL) {};
-
+        
         /* Command pointer/identifier. */
         PVBOXHGCMCMD pCmd;
@@ -501 +520 @@
         case SVC_MSG_HOSTCALL:    return new HGCMMsgHostCallSvc ();
         case SVC_MSG_GUESTCALL:   return new HGCMMsgCall ();
-        case SVC_MSG_LOADSTATE:
+        case SVC_MSG_LOADSTATE:      
         case SVC_MSG_SAVESTATE:   return new HGCMMsgLoadSaveStateClient ();
         case SVC_MSG_REGEXT:      return new HGCMMsgSvcRegisterExtension ();
@@ -676 +695 @@
                 }
             } break;
-
+            
             case SVC_MSG_REGEXT:
             {
@@ -682 +701 @@
 
                 LogFlowFunc(("SVC_MSG_REGEXT handle = %p, pfn = %p\n", pMsg->handle, pMsg->pfnExtension));
-
+                
                 if (pSvc->m_hExtension)
                 {
@@ -697 +716 @@
                         rc = VERR_NOT_SUPPORTED;
                     }
-
+                    
                     if (VBOX_SUCCESS (rc))
                     {
@@ -710 +729 @@
 
                 LogFlowFunc(("SVC_MSG_UNREGEXT handle = %p\n", pMsg->handle));
-
+                
                 if (pSvc->m_hExtension != pMsg->handle)
                 {
@@ -725 +744 @@
                         rc = VERR_NOT_SUPPORTED;
                     }
-
+                    
                     pSvc->m_hExtension = NULL;
                 }
@@ -753 +772 @@
    if (pMsgCore->MsgId () == SVC_MSG_GUESTCALL)
    {
-       /* Only call the completion for these messages. The helper
+       /* Only call the completion for these messages. The helper 
         * is called by the service, and the service does not get
         * any other messages.
@@ -765 +784 @@
 }
 
+/* static */ DECLCALLBACK(void) HGCMService::svcHlpDisconnectClient (void *pvInstance, uint32_t u32ClientId)
+{
+     HGCMService *pService = static_cast <HGCMService *> (pvInstance);
+     
+     if (pService)
+     {
+         pService->DisconnectClient (u32ClientId, true);
+     }
+}
+
 static DECLCALLBACK(void) hgcmMsgCompletionCallback (int32_t result, HGCMMsgCore *pMsgCore)
 {
@@ -803 +832 @@
             RTStrFree (m_pszSvcLibrary);
             m_pszSvcLibrary = NULL;
-
+            
             RTStrFree (m_pszSvcName);
             m_pszSvcName = NULL;
-
+            
             rc = VERR_NO_MEMORY;
         }
@@ -812 +841 @@
         {
             /* Initialize service helpers table. */
-            m_svcHelpers.pfnCallComplete = svcHlpCallComplete;
-            m_svcHelpers.pvInstance      = this;
-
+            m_svcHelpers.pfnCallComplete     = svcHlpCallComplete;
+            m_svcHelpers.pvInstance          = this;
+            m_svcHelpers.pfnDisconnectClient = svcHlpDisconnectClient;
+            
             /* Execute the load request on the service thread. */
             HGCMMSGHANDLE hMsg;
@@ -924 +954 @@
     HGCMService *pSvc;
     int rc = HGCMService::ResolveService (&pSvc, pszServiceName);
-
+    
     if (VBOX_SUCCESS (rc))
     {
@@ -950 +980 @@
                 pSvc->m_pSvcNext = sm_pSvcListHead;
                 pSvc->m_pSvcPrev = NULL;
-
+                
                 if (sm_pSvcListHead)
                 {
@@ -1079 +1109 @@
     ASMAtomicIncU32 (&m_u32RefCnt);
     LogFlowFunc(("m_u32RefCnt = %d\n", m_u32RefCnt));
-}
+}       
 
 /** The method dereferences a service and deletes it when no more refs.
@@ -1116 +1146 @@
         {
             LogFlowFunc(("handle %d\n", pSvc->m_paClientIds[0]));
-            pSvc->DisconnectClient (pSvc->m_paClientIds[0]);
+            pSvc->DisconnectClient (pSvc->m_paClientIds[0], false);
         }
 
@@ -1138 +1168 @@
 
     LogFlowFunc(("%d services to be saved:\n", sm_cServices));
-
+    
     /* Save number of services. */
     rc = SSMR3PutU32(pSSM, sm_cServices);
@@ -1210 +1240 @@
     rc = SSMR3GetU32(pSSM, &cServices);
     AssertRCReturn(rc, rc);
-
+    
     LogFlowFunc(("%d services to be restored:\n", cServices));
 
@@ -1219 +1249 @@
         AssertRCReturn(rc, rc);
         AssertReturn(u32 <= VBOX_HGCM_SVC_NAME_MAX_BYTES, VERR_SSM_UNEXPECTED_DATA);
-
+        
         char *pszServiceName = (char *)alloca (u32);
 
@@ -1225 +1255 @@
         rc = SSMR3GetStrZ(pSSM, pszServiceName, u32);
         AssertRCReturn(rc, rc);
-
+        
         LogFlowFunc(("Restoring service [%s]\n", pszServiceName));
-
+    
         /* Resolve the service instance. */
-        HGCMService *pSvc;
+        HGCMService *pSvc; 
         rc = ResolveService (&pSvc, pszServiceName);
         AssertReturn(pSvc, VERR_SSM_UNEXPECTED_DATA);
-
+            
         /* Get the number of clients. */
         uint32_t cClients;
@@ -1301 +1331 @@
 
     uint32_t handle;
-
+    
     if (pu32ClientIdOut != NULL)
     {
@@ -1335 +1365 @@
 
             rc = hgcmMsgSend (hMsg);
-
+        
             if (VBOX_SUCCESS (rc))
             {
@@ -1345 +1375 @@
                     m_cClientsAllocated += 64;
                 }
-
+            
                 m_paClientIds[m_cClients] = handle;
                 m_cClients++;
@@ -1365 +1395 @@
         ReferenceService ();
     }
-
+    
     LogFlowFunc(("rc = %Vrc\n", rc));
     return rc;
@@ -1375 +1405 @@
  * @return VBox rc.
  */
-int HGCMService::DisconnectClient (uint32_t u32ClientId)
-{
-    LogFlowFunc(("client id = %d\n", u32ClientId));
-
-    /* Call the service. */
-    HGCMMSGHANDLE hMsg;
-
-    int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
-
-    if (VBOX_SUCCESS(rc))
-    {
-        HGCMMsgSvcDisconnect *pMsg = (HGCMMsgSvcDisconnect *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
-        AssertRelease(pMsg);
-
-        pMsg->u32ClientId = u32ClientId;
-
-        hgcmObjDereference (pMsg);
-
-        rc = hgcmMsgSend (hMsg);
-
+int HGCMService::DisconnectClient (uint32_t u32ClientId, bool fFromService)
+{
+    int rc = VINF_SUCCESS;
+
+    LogFlowFunc(("client id = %d, fFromService = %d\n", u32ClientId, fFromService));
+
+    if (!fFromService)
+    {
+        /* Call the service. */
+        HGCMMSGHANDLE hMsg;
+
+        rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
+
+        if (VBOX_SUCCESS(rc))
+        {
+            HGCMMsgSvcDisconnect *pMsg = (HGCMMsgSvcDisconnect *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
+            AssertRelease(pMsg);
+
+            pMsg->u32ClientId = u32ClientId;
+
+            hgcmObjDereference (pMsg);
+
+            rc = hgcmMsgSend (hMsg);
+        }
+    }
+
+    if (VBOX_SUCCESS (rc))
+    {
         /* Remove the client id from the array in any case. */
         int i;
@@ -1403 +1441 @@
             {
                 m_cClients--;
-
+                
                 if (m_cClients > i)
                 {
                     memmove (&m_paClientIds[i], &m_paClientIds[i + 1], m_cClients - i);
                 }
-
+                
                 break;
             }
@@ -1552 +1590 @@
 
 
-/*
+/* 
  * Main HGCM thread that manages services.
  */
-
+ 
 /* Messages processed by the main HGCM thread. */
 #define HGCM_MSG_CONNECT    (10)  /* Connect a client to a service. */
@@ -1649 +1687 @@
         case HGCM_MSG_LOAD:       return new HGCMMsgMainLoad ();
         case HGCM_MSG_HOSTCALL:   return new HGCMMsgMainHostCall ();
-        case HGCM_MSG_LOADSTATE:
+        case HGCM_MSG_LOADSTATE:      
         case HGCM_MSG_SAVESTATE:  return new HGCMMsgMainLoadSaveState ();
         case HGCM_MSG_RESET:      return new HGCMMsgMainReset ();
@@ -1730 +1768 @@
 
                 /* Call the service instance to disconnect the client. */
-                rc = pService->DisconnectClient (pMsg->u32ClientId);
+                rc = pService->DisconnectClient (pMsg->u32ClientId, false);
 
                 hgcmObjDereference (pClient);
@@ -1801 +1839 @@
             {
                 HGCMMsgMainRegisterExtension *pMsg = (HGCMMsgMainRegisterExtension *)pMsgCore;
-
+                
                 LogFlowFunc(("HGCM_MSG_REGEXT\n"));
-
+                
                 /* Allocate the handle data. */
                 HGCMSVCEXTHANDLE handle = (HGCMSVCEXTHANDLE)RTMemAllocZ (sizeof (struct _HGCMSVCEXTHANDLEDATA)
                                                                          + strlen (pMsg->pszServiceName)
                                                                          + sizeof (char));
-
+                
                 if (handle == NULL)
                 {
@@ -1817 +1855 @@
                     handle->pszServiceName = (char *)((uint8_t *)handle + sizeof (struct _HGCMSVCEXTHANDLEDATA));
                     strcpy (handle->pszServiceName, pMsg->pszServiceName);
-
+                    
                     HGCMService *pService;
                     rc = HGCMService::ResolveService (&pService, handle->pszServiceName);
@@ -1827 +1865 @@
                         pService->ReleaseService ();
                     }
-
+                    
                     if (VBOX_FAILURE (rc))
                     {
@@ -1854 +1892 @@
                     pService->ReleaseService ();
                 }
-
+                
                 RTMemFree (pMsg->handle);
             } break;
@@ -2219 +2257 @@
         HGCMMsgMainHostCall *pMsg = (HGCMMsgMainHostCall *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
         AssertRelease(pMsg);
-
+        
         pMsg->pszServiceName = (char *)pszServiceName;
         pMsg->u32Function    = u32Function;
@@ -2237 +2275 @@
 {
     LogFlowFunc(("\n"));
-
+    
     /* Disconnect all clients.
      */