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

Timestamp:

Nov 14, 2011 9:58:38 AM (13 years ago)

Author:

vboxsync

Message:

CrOpenGL: avoid blocked client polling & extra memcpy (block hgsmi command until completion)

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• include/cr_net.h (modified) (4 diffs)
• include/cr_server.h (modified) (2 diffs)
• include/cr_unpack.h (modified) (1 diff)
• util/vboxhgcm.c (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

@@ -139 +139 @@
 VBoxOGLhostcrutil_LIBS     = $(LIB_RUNTIME)
 ifdef VBOX_WITH_CRHGSMI
-VBoxOGLhostcrutil_DEFS.win = $(subst VBOX_WITH_CRHGSMI,,$(VBoxOGLcrutil_DEFS.win))
+VBoxOGLhostcrutil_DEFS    += VBOX_WITH_CRHGSMI
 VBoxOGLhostcrutil_LIBS.win = $(subst $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB),,$(VBoxOGLcrutil_LIBS.win))
 endif

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

@@ -106 +106 @@
 } CRMultiBuffer;
 
-#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+#ifdef VBOX_WITH_CRHGSMI
+# ifdef IN_GUEST
 typedef struct CRVBOXHGSMI_CLIENT {
     struct VBOXUHGSMI *pHgsmi;
@@ -114 +115 @@
     struct CRBufferPool_t *bufpool;
 } CRVBOXHGSMI_CLIENT, *PCRVBOXHGSMI_CLIENT;
-#endif
+#endif /* IN_GUEST */
+#endif /* #ifdef VBOX_WITH_CRHGSMI */
 /**
  * Chromium network connection (bidirectional).
@@ -238 +240 @@
 #  endif
 # endif
+#else
+# ifdef VBOX_WITH_CRHGSMI
+    struct _crclient *pClient; /* back reference, just for simplicity */
+    CRVBOXHGSMI_CMDDATA CmdData;
+# endif
 #endif
     /* Used on host side to indicate that we are not allowed to store above pointers for later use
@@ -277 +284 @@
 extern DECLEXPORT(void) crNetReadline( CRConnection *conn, void *buf );
 extern DECLEXPORT(int) crNetRecv( void );
+#define CR_WRITEBACK_WAIT() do { \
+        while (writeback) { \
+            crNetRecv();    \
+        }                   \
+    } while (0)
 extern DECLEXPORT(void) crNetDefaultRecv( CRConnection *conn, CRMessage *msg, unsigned int len );
 extern DECLEXPORT(void) crNetDispatchMessage( CRNetReceiveFuncList *rfl, CRConnection *conn, CRMessage *msg, unsigned int len );

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

@@ -22 +22 @@
 
 #include <VBox/vmm/ssm.h>
+
+#ifdef VBOX_WITH_CRHGSMI
+# include <VBox/VBoxVideo.h>
+#endif
 
 #ifdef __cplusplus
@@ -297 +301 @@
 extern DECLEXPORT(int32_t) crVBoxServerOutputRedirectSet(const CROutputRedirect *pCallbacks);
 
+#ifdef VBOX_WITH_CRHGSMI
+/* We moved all CrHgsmi command processing to crserverlib to keep the logic of dealing with CrHgsmi commands in one place.
+ *
+ * For now we need the notion of CrHgdmi commands in the crserver_lib to be able to complete it asynchronously once it is really processed.
+ * This help avoiding the "blocked-client" issues. The client is blocked if another client is doing begin-end stuff.
+ * For now we eliminated polling that could occur on block, which caused a higher-priority thread (in guest) polling for the blocked command complition
+ * to block the lower-priority thread trying to complete the blocking command.
+ * And removed extra memcpy done on blocked command arrival.
+ *
+ * In the future we will extend CrHgsmi functionality to maintain texture data directly in CrHgsmi allocation to avoid extra memcpy-ing with PBO,
+ * implement command completion and stuff necessary for GPU scheduling to work properly for WDDM Windows guests, etc.
+ *
+ * NOTE: it is ALWAYS responsibility of the crVBoxServerCrHgsmiCmd to complete the command!
+ * */
+extern DECLEXPORT(int32_t) crVBoxServerCrHgsmiCmd(struct VBOXVDMACMD_CHROMIUM_CMD *pCmd);
+extern DECLEXPORT(int32_t) crVBoxServerCrHgsmiCtl(struct VBOXVDMACMD_CHROMIUM_CTL *pCtl);
+#endif
+
 #ifdef __cplusplus
 }

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

@@ -66 +66 @@
     INCR_DATA_PTR( *((int *) cr_unpackData ) )
 
-#define SET_RETURN_PTR( offset ) \
-    crMemcpy( return_ptr, cr_unpackData + (offset), sizeof( *return_ptr ) );
+#define SET_RETURN_PTR( offset ) do { \
+        CRDBGPTR_CHECKZ(return_ptr); \
+        crMemcpy( return_ptr, cr_unpackData + (offset), sizeof( *return_ptr ) ); \
+    } while (0);
 
-#define SET_WRITEBACK_PTR( offset ) \
-    crMemcpy( writeback_ptr, cr_unpackData + (offset), sizeof( *writeback_ptr ) );
+
+#define SET_WRITEBACK_PTR( offset ) do { \
+        CRDBGPTR_CHECKZ(writeback_ptr); \
+        crMemcpy( writeback_ptr, cr_unpackData + (offset), sizeof( *writeback_ptr ) ); \
+    } while (0);
 
 #ifdef __cplusplus

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

@@ -1270 +1270 @@
         msg->header.conn_id = msg->redirptr.pMessage->conn_id;
 
+#if defined(VBOX_WITH_CRHGSMI) && !defined(IN_GUEST)
+        msg->redirptr.CmdData = conn->CmdData;
+        CRVBOXHGSMI_CMDDATA_ASSERT_CONSISTENT(&msg->redirptr.CmdData);
+        CRVBOXHGSMI_CMDDATA_CLEANUP(&conn->CmdData);
+#endif
+
         cached_type = msg->redirptr.pMessage->type;
 
@@ -1278 +1284 @@
     else
     {
+        /* we should NEVER have redir_ptr disabled with HGSMI command now */
+        CRASSERT(!conn->CmdData.pCmd);
         if ( len <= conn->buffer_size )
         {