Changeset 41852 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jun 20, 2012 3:59:57 PM (13 years ago)

Author:

vboxsync

Message:

Additions/common and solaris/vboxmouse: large code drop.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• Init.cpp (modified) (9 diffs)
• Makefile.kmk (modified) (1 diff)
• Mouse.cpp (added)
• VBGLInternal.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp

@@ -33 +33 @@
 #include <iprt/string.h>
 #include <iprt/assert.h>
+#include <iprt/semaphore.h>
 
 /*******************************************************************************
@@ -41 +42 @@
 
 /**
- * Used by vbglQueryVMMDevPort and VbglInit to try get the host feature mask and
+ * Used by vbglQueryDriverInfo and VbglInit to try get the host feature mask and
  * version information (g_vbgldata::hostVersion).
  *
@@ -78 +79 @@
  *
  */
-static void vbglQueryVMMDevPort (void)
+static void vbglQueryDriverInfo (void)
 {
     int rc = VINF_SUCCESS;
 
-    VBGLDRIVER driver;
-
-    rc = vbglDriverOpen (&driver);
+    rc = RTSemFastMutexRequest(g_vbgldata.mutexDriverInit);
+    
+    if (RT_FAILURE(rc))
+        return;
+
+    if (g_vbgldata.status == VbglStatusReady)
+    {
+        RTSemFastMutexRelease(g_vbgldata.mutexDriverInit);
+        return;
+    }
+
+    rc = vbglDriverOpen(&g_vbgldata.driver);
 
     if (RT_SUCCESS(rc))
@@ -93 +103 @@
         VBoxGuestPortInfo port;
 
-        rc = vbglDriverIOCtl (&driver, VBOXGUEST_IOCTL_GETVMMDEVPORT, &port, sizeof (port));
+        rc = vbglDriverIOCtl (&g_vbgldata.driver,
+                              VBOXGUEST_IOCTL_GETVMMDEVPORT, &port,
+                              sizeof (port));
 
         if (RT_SUCCESS (rc))
@@ -106 +118 @@
             vbglR0QueryHostVersion();
         }
-
-        vbglDriverClose (&driver);
-    }
-
-    dprintf (("vbglQueryVMMDevPort rc = %d\n", rc));
+    }
+    RTSemFastMutexRelease(g_vbgldata.mutexDriverInit);
+    dprintf (("vbglQueryDriverInfo rc = %d\n", rc));
 }
 #endif /* !VBGL_VBOXGUEST */
@@ -128 +138 @@
     if (g_vbgldata.status == VbglStatusInitializing)
     {
-        vbglQueryVMMDevPort ();
+        vbglQueryDriverInfo ();
     }
 #endif
@@ -234 +244 @@
     if (RT_SUCCESS(rc))
     {
-        /* Try to obtain VMMDev port via IOCTL to VBoxGuest main driver. */
-        vbglQueryVMMDevPort ();
+        rc = RTSemFastMutexCreate(&g_vbgldata.mutexDriverInit);
+        if (RT_SUCCESS(rc))
+        {
+            /* Try to obtain VMMDev port via IOCTL to VBoxGuest main driver. */
+            vbglQueryDriverInfo ();
 
 # ifdef VBOX_WITH_HGCM
-        rc = vbglR0HGCMInit ();
+            rc = vbglR0HGCMInit ();
 # endif /* VBOX_WITH_HGCM */
+
+            if (RT_FAILURE(rc))
+            {
+                RTSemFastMutexDestroy(g_vbgldata.mutexDriverInit);
+                g_vbgldata.mutexDriverInit = NIL_RTSEMFASTMUTEX;
+            }
+        }
 
         if (RT_FAILURE(rc))
@@ -245 +265 @@
             vbglTerminateCommon ();
         }
+        
     }
 
     return rc;
+}
+
+DECLVBGL(bool) VbglIsReady(void)
+{
+    return(g_vbgldata.status == VbglStatusReady);
 }
 
@@ -257 +283 @@
 
     vbglTerminateCommon ();
+    vbglDriverClose(&g_vbgldata.driver);
+    RTSemFastMutexDestroy(g_vbgldata.mutexDriverInit);
+    g_vbgldata.mutexDriverInit = NIL_RTSEMFASTMUTEX;
 
     return;
 }
 
+int vbglGetDriver(VBGLDRIVER **ppDriver)
+{
+    if (g_vbgldata.status != VbglStatusReady)
+    {
+        vbglQueryDriverInfo();
+        if (g_vbgldata.status != VbglStatusReady)
+            return VERR_TRY_AGAIN;
+    }
+    *ppDriver = &g_vbgldata.driver;
+    return VINF_SUCCESS;
+}
+
 #endif /* !VBGL_VBOXGUEST */
-

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -61 +61 @@
         PhysHeap.cpp \
         Init.cpp \
+        Mouse.cpp \
         VMMDev.cpp \
         HGCM.cpp \

trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h

@@ -101 +101 @@
 #ifndef VBGL_VBOXGUEST
     /**
+     * Handle for the main driver instance.
+     * @{
+     */
+
+    RTSEMFASTMUTEX mutexDriverInit;
+
+    VBGLDRIVER driver;
+
+    /** @} */
+
+    /**
      * Fast heap for HGCM handles data.
      * @{
@@ -156 +167 @@
 #endif /* VBOX_WITH_HGCM */
 
+#ifndef VBGL_VBOXGUEST
+/**
+ * Get a handle to the main VBoxGuest driver.
+ * @returns VERR_TRY_AGAIN if the main driver has not yet been loaded.
+ */
+int vbglGetDriver(VBGLDRIVER **ppDriver);
+#endif
+
 #endif /* !___VBoxGuestLib_VBGLInternal_h */