Changeset 41265 in vbox for trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

Timestamp:

May 14, 2012 7:50:32 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: more vboxhgcm connection cleanup

File:

• trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c (modified) (16 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -316 +316 @@
     {
         int rc = _crVBoxHGSMIClientInit(pClient, pHgsmi);
-        AssertRC(rc);
         if (RT_SUCCESS(rc))
             return (HVBOXCRHGSMI_CLIENT)pClient;
+        else
+            crWarning("_crVBoxHGSMIClientCreate: _crVBoxHGSMIClientInit failed rc %d", rc);
 
         crFree(pCLient);
@@ -348 +349 @@
         {
             int rc = _crVBoxHGSMIClientInit(&conn->HgsmiClient, pHgsmi);
-            AssertRC(rc);
             if (RT_SUCCESS(rc))
             {
@@ -354 +354 @@
                 return &conn->HgsmiClient;
             }
+            else
+                crWarning("_crVBoxHGSMIClientGet: _crVBoxHGSMIClientInit failed rc %d", rc);
             VBoxCrHgsmiDestroy(pHgsmi);
         }
@@ -393 +395 @@
     pBuf = pHdr->pBuffer;
     rc = pBuf->pfnUnlock(pBuf);
-    AssertRC(rc);
     if (RT_FAILURE(rc))
     {
+        crWarning("_crVBoxHGSMIBufFromHdr: pfnUnlock failed rc %d", rc);
         return NULL;
     }
@@ -424 +426 @@
     fFlags.bDiscard = 1;
     rc = pClient->pCmdBuffer->pfnLock(pClient->pCmdBuffer, 0, cbBuffer, fFlags, (void**)&pHdr);
-    AssertRC(rc);
     if (RT_SUCCESS(rc))
         return pHdr;
+    else
+        crWarning("_crVBoxHGSMICmdBufferLock: pfnLock failed rc %d", rc);
 
     crWarning("Failed to Lock the command buffer of size(%d), rc(%d)\n", cbBuffer, rc);
@@ -444 +447 @@
      * 3. guest must wait for command completion in the same order as it submits them
      * in case we can not satisfy any of the above, we should introduce multiple command buffers */
-    CRVBOXHGSMIHDR * pHdr;
+    CRVBOXHGSMIHDR * pHdr = NULL;
     VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags;
     int rc;
@@ -450 +453 @@
     fFlags.bReadOnly = 1;
     rc = pClient->pCmdBuffer->pfnLock(pClient->pCmdBuffer, 0, cbBuffer, fFlags, (void**)&pHdr);
-    AssertRC(rc);
     if (RT_FAILURE(rc))
         crWarning("Failed to Lock the command buffer of size(%d), rc(%d)\n", cbBuffer, rc);
@@ -459 +461 @@
 {
     int rc = pClient->pCmdBuffer->pfnUnlock(pClient->pCmdBuffer);
-    AssertRC(rc);
     if (RT_FAILURE(rc))
-        crWarning("Failed to Unlock the command buffer rc(%d)\n", rc);
+        crError("Failed to Unlock the command buffer rc(%d)\n", rc);
 }
 
@@ -473 +474 @@
     fFlags.bReadOnly = 1;
     rc = pClient->pCmdBuffer->pfnLock(pClient->pCmdBuffer, 0, sizeof (*pHdr), fFlags, (void**)&pHdr);
-    AssertRC(rc);
     if (RT_FAILURE(rc))
     {
@@ -508 +508 @@
     fFlags.Value = 0;
     rc = pClient->pHGBuffer->pfnLock(pClient->pHGBuffer, 0, cbBuffer, fFlags, &pClient->pvHGBuffer);
-    AssertRC(rc);
     if (RT_SUCCESS(rc))
-    {
         return pClient->pvHGBuffer;
-    }
+    else
+        crWarning("_crVBoxHGSMIRecvBufData: pfnLock failed rc %d", rc);
+
     return NULL;
 }
@@ -1439 +1439 @@
         if (g_crvboxhgcm.hGuestDrv == INVALID_HANDLE_VALUE)
         {
-            crDebug("could not open VBox Guest Additions driver! rc = %d\n", GetLastError());
-            CRASSERT(0);
+            crWarning("could not open VBox Guest Additions driver! rc = %d\n", GetLastError());
             VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
             return FALSE;
@@ -1836 +1835 @@
 
     rc = pClient->pHgsmi->pfnBufferSubmit(pClient->pHgsmi, aSubmit, 2);
-    AssertRC(rc);
     if (RT_FAILURE(rc))
     {
@@ -1924 +1922 @@
         fFlags.bWriteOnly = 1;
         rc = pBuf->pfnLock(pBuf, 0, len, fFlags, &pvBuf);
-        AssertRC(rc);
         if (RT_SUCCESS(rc))
         {
             memcpy(pvBuf, buf, len);
             rc = pBuf->pfnUnlock(pBuf);
-            AssertRC(rc);
             CRASSERT(RT_SUCCESS(rc));
         }
         else
         {
+            crWarning("_crVBoxHGSMIWriteReadExact: pfnUnlock failed rc %d", rc);
             _crVBoxHGSMIBufFree(pClient, pBuf);
             /* fallback */
@@ -1968 +1965 @@
 
         rc = pClient->pHgsmi->pfnBufferSubmit(pClient->pHgsmi, aSubmit, 3);
-        AssertRC(rc);
         if (RT_FAILURE(rc))
         {
@@ -2077 +2073 @@
 
         rc = pClient->pHgsmi->pfnBufferSubmit(pClient->pHgsmi, aSubmit, 2);
-        AssertRC(rc);
         if (RT_SUCCESS(rc))
         {
@@ -2110 +2105 @@
 
         rc = pClient->pHgsmi->pfnBufferSubmit(pClient->pHgsmi, aSubmit, 2);
-        AssertRC(rc);
         if (RT_SUCCESS(rc))
         {