Changeset 33988 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Nov 11, 2010 1:03:17 PM (14 years ago)

Author:

vboxsync

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

67651

Message:

crOpenGL/wddm: more multithreading fixes, vista expirience index works now

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• glapi_parser/APIspec.txt (modified) (1 diff)
• include/cr_server.h (modified) (5 diffs)
• util/vboxhgcm.c (modified) (4 diffs)
• util/vboxhgsmi.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/glapi_parser/APIspec.txt

@@ -8516 +8516 @@
 chromium    nopack
 
+name        VBoxPackAttachThread
+return      void
+category    VBox
+chromium    nopack
+
+name        VBoxPackDetachThread
+return      void
+category    VBox
+chromium    nopack
+
 # OpenGL 1.5
 

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -26 +26 @@
 #endif
 
-#define SHCROGL_SSM_VERSION 21
+#define SHCROGL_SSM_VERSION 22
 
 #define CR_MAX_WINDOWS 100
@@ -78 +78 @@
     CRConnection *conn;       /**< network connection from the client */
     int number;        /**< a unique number for each client */
+    uint64_t pid;      /*guest pid*/
     GLint currentContextNumber;
     CRContext *currentCtx;
@@ -89 +90 @@
 } CRClient;
 
+typedef struct _crclientnode {
+    CRClient *pClient;
+    struct _crclientnode *prev, *next;
+} CRClientNode;
+
 typedef struct CRPoly_t {
     int npoints;
@@ -127 +133 @@
     CRClient *clients[CR_MAX_CLIENTS];  /**< array [numClients] */
     CRClient *curClient;
+    CRClientNode *pCleanupClient;  /*list of clients with pending clean up*/
     CRCurrentStatePointers current;
 
@@ -238 +245 @@
 extern DECLEXPORT(int32_t) crVBoxServerClientRead(uint32_t u32ClientID, uint8_t *pBuffer, uint32_t *pcbBuffer);
 extern DECLEXPORT(int32_t) crVBoxServerClientSetVersion(uint32_t u32ClientID, uint32_t vMajor, uint32_t vMinor);
+extern DECLEXPORT(int32_t) crVBoxServerClientSetPID(uint32_t u32ClientID, uint64_t pid);
 
 extern DECLEXPORT(int32_t) crVBoxServerSaveState(PSSMHANDLE pSSM);

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

@@ -35 +35 @@
 #include "cr_threads.h"
 #include "net_internals.h"
+#include "cr_process.h"
 
 #include <iprt/thread.h>
@@ -1250 +1251 @@
 }
 
+static int crVBoxHGCMSetPID(CRConnection *conn, CRpid pid)
+{
+    CRVBOXHGCMSETPID parms;
+    int rc;
+
+    parms.hdr.result      = VERR_WRONG_ORDER;
+    parms.hdr.u32ClientID = conn->u32ClientID;
+    parms.hdr.u32Function = SHCRGL_GUEST_FN_SET_PID;
+    parms.hdr.cParms      = SHCRGL_CPARMS_SET_PID;
+
+    parms.u64PID.type     = VMMDevHGCMParmType_64bit;
+    parms.u64PID.u.value64 = (uintptr_t) pid;
+
+    rc = crVBoxHGCMCall(&parms, sizeof(parms));
+
+    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.result))
+    {
+        Assert(0);
+
+        crWarning("SHCRGL_GUEST_FN_SET_PID failed!");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
 /**
  * The function that actually connects.  This should only be called by clients,
@@ -1322 +1349 @@
     if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CONNECT, &Hdr) >= 0)
 #else
-    /*@todo it'd fail */
     if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CONNECT, &info, sizeof (info)) >= 0)
 #endif
@@ -1328 +1354 @@
         if (info.result == VINF_SUCCESS)
         {
+            int rc;
             conn->u32ClientID = info.u32ClientID;
             crDebug("HGCM connect was successful: client id =0x%x\n", conn->u32ClientID);
 
+            rc = crVBoxHGCMSetVersion(conn, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR);
+            if (!rc)
+            {
+                return rc;
+            }
+            rc = crVBoxHGCMSetPID(conn, crGetPID());
             VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
-            return crVBoxHGCMSetVersion(conn, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR);
+            return rc;
         }
         else

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

@@ -37 +37 @@
 #include "cr_threads.h"
 #include "net_internals.h"
+#include "cr_process.h"
 
 #include <iprt/thread.h>
@@ -1171 +1172 @@
 }
 
+static int crVBoxHGSMISetPID(CRConnection *conn, CRpid pid)
+{
+    CRVBOXHGCMSETPID parms;
+    int rc;
+
+    parms.hdr.result      = VERR_WRONG_ORDER;
+    parms.hdr.u32ClientID = conn->u32ClientID;
+    parms.hdr.u32Function = SHCRGL_GUEST_FN_SET_PID;
+    parms.hdr.cParms      = SHCRGL_CPARMS_SET_PID;
+
+    parms.u64PID.type     = VMMDevHGCMParmType_64bit;
+    parms.u64PID.u.value64 = (uintptr_t) pid;
+
+    rc = crVBoxHGCMCall(&parms, sizeof(parms));
+
+    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.result))
+    {
+        Assert(0);
+
+        crWarning("SHCRGL_GUEST_FN_SET_PID failed!");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
 /**
  * The function that actually connects.  This should only be called by clients,
@@ -1242 +1269 @@
     if (ioctl(g_crvboxhgsmi.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CONNECT, &Hdr) >= 0)
 #else
-    /*@todo it'd fail */
     if (ioctl(g_crvboxhgsmi.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CONNECT, &info, sizeof (info)) >= 0)
 #endif
@@ -1253 +1279 @@
 
             rc = crVBoxHGSMISetVersion(conn, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR);
+            if (!rc)
+            {
+                return rc;
+            }
+            rc = crVBoxHGCMSetPID(conn, crGetPID());
             VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
             return rc;