Changeset 42499 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

Aug 1, 2012 10:26:43 AM (13 years ago)

Author:

vboxsync

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

79662

Message:

crOgl/wddm: per-context connections

Location:

trunk/src/VBox/GuestHost/OpenGL/util

Files:

• net.c (modified) (11 diffs)
• net_internals.h (modified) (1 diff)
• vboxhgcm.c (modified) (9 diffs)

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

@@ -73 +73 @@
  */
 static void
-InitConnection(CRConnection *conn, const char *protocol, unsigned int mtu)
+InitConnection(CRConnection *conn, const char *protocol, unsigned int mtu
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , struct VBOXUHGSMI *pHgsmi
+#endif
+        )
 {
     if (!crStrcmp(protocol, "devnull"))
@@ -111 +115 @@
         cr_net.use_hgcm++;
         crVBoxHGCMInit(cr_net.recv_list, cr_net.close_list, mtu);
-        crVBoxHGCMConnection(conn);
+        crVBoxHGCMConnection(conn
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                    , pHgsmi
+#endif
+                );
     }
 #endif
@@ -184 +192 @@
  *                the mothership
  */
-CRConnection *
-crNetConnectToServer( const char *server, unsigned short default_port,
-                      int mtu, int broker )
+CRConnection * crNetConnectToServer( const char *server, unsigned short default_port, int mtu, int broker
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , struct VBOXUHGSMI *pHgsmi
+#endif
+)
 {
     char hostname[4096], protocol[4096];
@@ -270 +280 @@
 
     /* now, just dispatch to the appropriate protocol's initialization functions. */
-    InitConnection(conn, protocol, mtu);
+    InitConnection(conn, protocol, mtu
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , pHgsmi
+#endif
+            );
 
     if (!crNetConnect( conn ))
@@ -287 +301 @@
 }
 
-
 /**
  * Send a message to the receiver that another connection is needed.
  * We send a CR_MESSAGE_NEWCLIENT packet, then call crNetServerConnect.
  */
-void crNetNewClient( CRConnection *conn, CRNetServer *ns )
+void crNetNewClient( CRConnection *conn, CRNetServer *ns
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , struct VBOXUHGSMI *pHgsmi
+#endif
+)
 {
     /*
@@ -308 +325 @@
     */
 
-    crNetServerConnect( ns );
+    crNetServerConnect( ns
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , pHgsmi
+#endif
+);
 }
 
@@ -368 +389 @@
 
     /* call the protocol-specific init routines */  // ktd (add)
-    InitConnection(conn, protocol_only, mtu);       // ktd (add)
+    InitConnection(conn, protocol_only, mtu
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , NULL
+#endif
+            );       // ktd (add)
     }
     else {
     /* call the protocol-specific init routines */
-      InitConnection(conn, protocol, mtu);
+      InitConnection(conn, protocol, mtu
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , NULL
+#endif
+              );
     }
 
@@ -834 +863 @@
  * When done, the CrNetServer's conn field will be initialized.
  */
-void crNetServerConnect( CRNetServer *ns )
+void crNetServerConnect( CRNetServer *ns
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , struct VBOXUHGSMI *pHgsmi
+#endif
+)
 {
     ns->conn = crNetConnectToServer( ns->name, DEFAULT_SERVER_PORT,
-                                     ns->buffer_size, 0 );
-}
-
+                                     ns->buffer_size, 0
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , pHgsmi
+#endif
+            );
+}
 
 /**
@@ -1186 +1222 @@
         if (len)
             return len;
-        crNetRecv();
+        crNetRecv(
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                conn
+#endif
+                );
     }
 
@@ -1234 +1274 @@
  * is assumed to be placed on queues for processing by the handler.
  */
-int crNetRecv( void )
+int crNetRecv(
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        CRConnection *conn
+#endif
+        )
 {
     int found_work = 0;
@@ -1242 +1286 @@
 #ifdef VBOX_WITH_HGCM
     if ( cr_net.use_hgcm )
-        found_work += crVBoxHGCMRecv();
+        found_work += crVBoxHGCMRecv(
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                    conn
+#endif
+                );
 #endif
 #ifdef SDP_SUPPORT

trunk/src/VBox/GuestHost/OpenGL/util/net_internals.h

@@ -92 +92 @@
 #ifdef VBOX_WITH_HGCM
 extern void crVBoxHGCMInit( CRNetReceiveFuncList *rfl, CRNetCloseFuncList *cfl, unsigned int mtu );
-extern void crVBoxHGCMConnection( CRConnection *conn );
-extern int crVBoxHGCMRecv( void );
+extern void crVBoxHGCMConnection( CRConnection *conn
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        , struct VBOXUHGSMI *pHgsmi
+#endif
+        );
+extern int crVBoxHGCMRecv(
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        CRConnection *conn
+#endif
+        );
 extern CRConnection** crVBoxHGCMDump( int *num );
 extern void crVBoxHGCMTearDown(void);

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

@@ -345 +345 @@
         return &conn->HgsmiClient;
     {
-        PVBOXUHGSMI pHgsmi = VBoxCrHgsmiCreate();
+        PVBOXUHGSMI pHgsmi = conn->pExternalHgsmi ? conn->pExternalHgsmi : VBoxCrHgsmiCreate();
         if (pHgsmi)
         {
@@ -356 +356 @@
             else
                 crWarning("_crVBoxHGSMIClientGet: _crVBoxHGSMIClientInit failed rc %d", rc);
-            VBoxCrHgsmiDestroy(pHgsmi);
+            if (!conn->pExternalHgsmi)
+                VBoxCrHgsmiDestroy(pHgsmi);
         }
         else
@@ -2333 +2334 @@
         _crVBoxHGSMIClientTerm(&conn->HgsmiClient, &pHgsmi);
         CRASSERT(pHgsmi);
-        VBoxCrHgsmiDestroy(pHgsmi);
+        if (!conn->pExternalHgsmi)
+            VBoxCrHgsmiDestroy(pHgsmi);
     }
 #else
@@ -2498 +2500 @@
 }
 
-void crVBoxHGCMConnection(CRConnection *conn)
+void crVBoxHGCMConnection(CRConnection *conn
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        , struct VBOXUHGSMI *pHgsmi
+#endif
+        )
 {
     int i, found = 0;
@@ -2520 +2526 @@
         conn->InstantReclaim = crVBoxHGSMIInstantReclaim;
         conn->HandleNewMessage = crVBoxHGSMIHandleNewMessage;
+        conn->pExternalHgsmi = pHgsmi;
     }
     else
@@ -2577 +2584 @@
 }
 
-int crVBoxHGCMRecv(void)
+#if defined(IN_GUEST)
+void _crVBoxHGCMPerformPollHost(CRConnection *conn)
+{
+    if (conn->type == CR_NO_CONNECTION )
+        return;
+
+    if (!conn->pBuffer)
+    {
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        PCRVBOXHGSMI_CLIENT pClient;
+        if (g_crvboxhgcm.bHgsmiOn && !!(pClient = _crVBoxHGSMIClientGet(conn)))
+        {
+            _crVBoxHGSMIPollHost(conn, pClient);
+        }
+        else
+#endif
+        {
+            crVBoxHGCMPollHost(conn);
+        }
+    }
+}
+#endif
+
+void _crVBoxHGCMPerformReceiveMessage(CRConnection *conn)
+{
+    if ( conn->type == CR_NO_CONNECTION )
+        return;
+
+    if (conn->cbBuffer>0)
+    {
+        _crVBoxHGCMReceiveMessage(conn);
+    }
+}
+
+int crVBoxHGCMRecv(
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        CRConnection *conn
+#endif
+        )
 {
     int32_t i;
@@ -2588 +2633 @@
 
 #ifdef IN_GUEST
+# if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    CRASSERT(!g_crvboxhgcm.bHgsmiOn == !conn);
+    if (conn && g_crvboxhgcm.bHgsmiOn)
+    {
+        _crVBoxHGCMPerformPollHost(conn);
+        _crVBoxHGCMPerformReceiveMessage(conn);
+        VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
+        return 0;
+    }
+# endif
     /* we're on guest side, poll host if it got something for us */
     for (i=0; i<g_crvboxhgcm.num_conns; i++)
@@ -2593 +2648 @@
         CRConnection *conn = g_crvboxhgcm.conns[i];
 
-        if ( !conn || conn->type == CR_NO_CONNECTION )
+        if ( !conn  )
             continue;
 
-        if (!conn->pBuffer)
-        {
-#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
-            PCRVBOXHGSMI_CLIENT pClient;
-            if (g_crvboxhgcm.bHgsmiOn && !!(pClient = _crVBoxHGSMIClientGet(conn)))
-            {
-                _crVBoxHGSMIPollHost(conn, pClient);
-            }
-            else
-#endif
-            {
-                crVBoxHGCMPollHost(conn);
-            }
-        }
+        _crVBoxHGCMPerformPollHost(conn);
     }
 #endif
@@ -2617 +2659 @@
         CRConnection *conn = g_crvboxhgcm.conns[i];
 
-        if ( !conn || conn->type == CR_NO_CONNECTION )
+        if ( !conn )
             continue;
 
-        if (conn->cbBuffer>0)
-        {
-            _crVBoxHGCMReceiveMessage(conn);
-        }
+        _crVBoxHGCMPerformReceiveMessage(conn);
     }