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

Timestamp:

Oct 13, 2010 9:06:35 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: chromium hgsmi transport (guest part, disabled)

Location:

trunk/src/VBox/GuestHost/OpenGL/util

Files:

• net.c (modified) (6 diffs)
• net_internals.h (modified) (1 diff)
• vboxhgsmi.c (added)

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

@@ -56 +56 @@
     int                  use_tcscomm;
     int                  use_hgcm;
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    int                  use_hgsmi;
+#endif
 
     int                  num_clients; /* total number of clients (unused?) */
@@ -109 +112 @@
     else if (!crStrcmp(protocol, "vboxhgcm"))
     {
-        cr_net.use_hgcm++;
-        crVBoxHGCMInit(cr_net.recv_list, cr_net.close_list, mtu);
-        crVBoxHGCMConnection(conn);
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        /* for now just use hgcm protocol name
+         * since we still partially use HGCM and have HGCM backend on the host side */
+        if(crVBoxHGSMIInit(cr_net.recv_list, cr_net.close_list, mtu))
+        {
+            cr_net.use_hgsmi++;
+            crVBoxHGSMIConnection(conn);
+        }
+        else
+# endif /* # #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST) */
+        {
+            cr_net.use_hgcm++;
+            crVBoxHGCMInit(cr_net.recv_list, cr_net.close_list, mtu);
+            crVBoxHGCMConnection(conn);
+        }
     }
 #endif
@@ -433 +448 @@
         cr_net.use_hgcm    = 0;
         cr_net.num_clients = 0;
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        cr_net.use_hgsmi = 0;
+#endif
 #ifdef CHROMIUM_THREADSAFE
         crInitMutex(&cr_net.mutex);
@@ -498 +516 @@
 #endif
 
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    if (cr_net.use_hgsmi)
+        crVBoxHGSMITearDown();
+#endif
     /* Note, other protocols used by chromium should free up stuff too,
      * but VBox doesn't use them, so no other checks.
@@ -537 +559 @@
     if ( c ) return c;
 
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    c = crVBoxHGSMIDump( num );
+    if ( c ) return c;
+#endif
 #ifdef VBOX_WITH_HGCM
     c = crVBoxHGCMDump( num );
@@ -1239 +1265 @@
     if ( cr_net.use_tcpip )
         found_work += crTCPIPRecv();
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    if (cr_net.use_hgsmi)
+        found_work += crVBoxHGSMIRecv();
+#endif
 #ifdef VBOX_WITH_HGCM
     if ( cr_net.use_hgcm )

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

@@ -97 +97 @@
 extern void crVBoxHGCMTearDown(void);
 #endif
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+extern bool crVBoxHGSMIInit( CRNetReceiveFuncList *rfl, CRNetCloseFuncList *cfl, unsigned int mtu );
+extern void crVBoxHGSMIConnection( CRConnection *conn );
+extern int crVBoxHGSMIRecv( void );
+extern CRConnection** crVBoxHGSMIDump( int *num );
+extern void crVBoxHGSMITearDown(void);
+#endif /* #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST) */
 
 /*