Changeset 15707 in vbox

Timestamp:

Dec 19, 2008 6:16:40 PM (16 years ago)

Author:

vboxsync

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

41270

Message:

crOpenGL: make host buffer dynamic in size, fix for 3443

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/util/vboxhgcm.c (modified) (5 diffs)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (2 diffs)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (1 diff)

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

@@ -117 +117 @@
     /* make sure there's host buffer and it's clear */
     CRASSERT(conn->pHostBuffer && !conn->cbHostBuffer);
-    CRASSERT(conn->cbHostBufferAllocated >= len);
+
+    if (conn->cbHostBufferAllocated < len)
+    {
+        crDebug("Host buffer too small %d out of requsted %d bytes, reallocating", conn->cbHostBufferAllocated, len);
+        crFree(conn->pHostBuffer);
+        conn->pHostBuffer = crAlloc(len);
+        if (!conn->pHostBuffer)
+        {
+            conn->cbHostBufferAllocated = 0;
+            crError("OUT_OF_MEMORY trying to allocate %d bytes", len);
+            return FALSE;
+        }
+        conn->cbHostBufferAllocated = len;
+    }
 
     crMemcpy(conn->pHostBuffer, buf, len);
@@ -314 +327 @@
 }
 
+static void crVBoxHGCMReadExact( CRConnection *conn, const void *buf, unsigned int len )
+{
+    CRVBOXHGCMREAD parms;
+    int rc;
+
+    parms.hdr.result      = VINF_SUCCESS;
+    parms.hdr.u32ClientID = conn->u32ClientID;
+    parms.hdr.u32Function = SHCRGL_GUEST_FN_READ;
+    parms.hdr.cParms      = SHCRGL_CPARMS_READ;
+
+    CRASSERT(!conn->pBuffer); //make sure there's no data to process
+    parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_Out;
+    parms.pBuffer.u.Pointer.size         = conn->cbHostBufferAllocated;
+    parms.pBuffer.u.Pointer.u.linearAddr = (VMMDEVHYPPTR) conn->pHostBuffer;
+
+    parms.cbBuffer.type      = VMMDevHGCMParmType_32bit;
+    parms.cbBuffer.u.value32 = 0;
+
+    rc = crVBoxHGCMCall(&parms, sizeof(parms));
+
+    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.result))
+    {
+        crDebug("SHCRGL_GUEST_FN_WRITE_READ failed with %x %x\n", rc, parms.hdr.result);
+        return;
+    }
+
+    if (parms.cbBuffer.u.value32)
+    {
+        conn->pBuffer  = (uint8_t*) parms.pBuffer.u.Pointer.u.linearAddr;
+        conn->cbBuffer = parms.cbBuffer.u.value32;
+    }
+
+    if (conn->cbBuffer)
+        crVBoxHGCMReceiveMessage(conn);
+
+}
+
 /* Same as crVBoxHGCMWriteExact, but combined with read of writeback data.
  * This halves the number of HGCM calls we do,
@@ -354 +404 @@
     if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.result))
     {
-        crDebug("SHCRGL_GUEST_FN_WRITE_READ failed with %x %x\n", rc, parms.hdr.result);
-        return;
+
+        if ((VERR_BUFFER_OVERFLOW == parms.hdr.result) && RT_SUCCESS(rc))
+        {
+            /* reallocate buffer and retry */
+
+            CRASSERT(parms.cbWriteback.u.value32>conn->cbHostBufferAllocated);
+
+            crDebug("Reallocating host buffer from %d to %d bytes", conn->cbHostBufferAllocated, parms.cbWriteback.u.value32);
+
+            crFree(conn->pHostBuffer);
+            conn->cbHostBufferAllocated = parms.cbWriteback.u.value32;
+            conn->pHostBuffer = crAlloc(conn->cbHostBufferAllocated);
+
+            crVBoxHGCMReadExact(conn, buf, len);
+
+            return;
+        }
+        else
+        {
+            crDebug("SHCRGL_GUEST_FN_WRITE_READ failed with %x %x\n", rc, parms.hdr.result);
+            return;
+        }
     }
 
@@ -413 +483 @@
      */
     *bufp = NULL;
-}
-
-static void crVBoxHGCMReadExact( CRConnection *conn, void *buf, unsigned int len )
-{
-    CRASSERT(FALSE);
 }
 
@@ -900 +965 @@
 
     //@todo remove this crap at all later
-    conn->cbHostBufferAllocated = 100*1024;
+    conn->cbHostBufferAllocated = 1*1024;
     conn->pHostBuffer = (uint8_t*) crAlloc(conn->cbHostBufferAllocated);
     CRASSERT(conn->pHostBuffer);

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -297 +297 @@
                 /* Update parameters.*/
                 paParms[0].u.pointer.size = cbBuffer; //@todo guest doesn't see this change somehow?
-                paParms[1].u.uint32 = cbBuffer;
-            }
+            }
+
+            /* Return the required buffer size always */
+            paParms[1].u.uint32 = cbBuffer;
 
             break;
@@ -337 +339 @@
                     /* Update parameters.*/
                     paParms[1].u.pointer.size = cbWriteback;
-                    paParms[2].u.uint32 = cbWriteback;
                 }
+                /* Return the required buffer size always */
+                paParms[2].u.uint32 = cbWriteback;
             }
             break;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -460 +460 @@
         crWarning("crServer: [%lx] ClientRead u32ClientID=%d FAIL, host buffer too small %d of %d",
                   crThreadID(), u32ClientID, *pcbBuffer, pClient->conn->cbHostBuffer);
-        return VERR_INVALID_PARAMETER;
+
+        /* Return the size of needed buffer */
+        *pcbBuffer = pClient->conn->cbHostBuffer;
+
+        return VERR_BUFFER_OVERFLOW;
     }