Changeset 41852 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/Init.cpp (modified) (9 diffs)
• common/VBoxGuestLib/Makefile.kmk (modified) (1 diff)
• common/VBoxGuestLib/Mouse.cpp (added)
• common/VBoxGuestLib/VBGLInternal.h (modified) (2 diffs)
• solaris/Mouse/Makefile.kmk (modified) (1 diff)
• solaris/Mouse/testcase/solaris.h (modified) (2 diffs)
• solaris/Mouse/vboxmouse.c (modified) (12 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 */
 

trunk/src/VBox/Additions/solaris/Mouse/Makefile.kmk

@@ -33 +33 @@
 
 #
-# vboxmouse - The Mouse Integration Driver
+# vboxms - The Mouse Integration Driver
 #
-SYSMODS.solaris     += vboxmouse
-vboxmouse_TEMPLATE   = VBOXGUESTR0
-vboxmouse_DEFS       = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV)
-vboxmouse_DEPS      += $(VBOX_SVN_REV_KMK)
-vboxmouse_SOURCES    = \
+SYSMODS.solaris     += vboxms
+vboxms_TEMPLATE   = VBOXGUESTR0
+vboxms_DEFS       = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV)
+vboxms_DEPS      += $(VBOX_SVN_REV_KMK)
+vboxms_SOURCES    = \
         vboxmouse.c
-vboxmouse_LIBS       = \
+vboxms_LIBS       = \
         $(VBOX_LIB_VBGL_R0)
 ifeq ($(KBUILD_HOST),solaris)
- vboxmouse_LDFLAGS         += -N drv/vboxguest -N misc/ctf
+ vboxms_LDFLAGS         += -N drv/vboxguest -N misc/ctf
 else
- vboxmouse_SOURCES         += deps.asm
- vboxmouse_deps.asm_ASFLAGS = -f bin -g null
+ vboxms_SOURCES         += deps.asm
+ vboxms_deps.asm_ASFLAGS = -f bin -g null
 endif
 

trunk/src/VBox/Additions/solaris/Mouse/testcase/solaris.h

@@ -335 +335 @@
 #define RTR0Init(...) VINF_SUCCESS
 #define RTR0Term(...) do {} while(0)
+#define RTR0AssertPanicSystem(...) do {} while(0)
 #define RTLogCreate(...) VINF_SUCCESS
 #define RTLogRelSetDefaultInstance(...) do {} while(0)
 #define RTLogDestroy(...) do {} while(0)
+#if 0
 #define VBoxGuestCreateKernelSession(...) VINF_SUCCESS
 #define VBoxGuestCreateUserSession(...) VINF_SUCCESS
@@ -348 +350 @@
 #define VbglGRPerform(...) VINF_SUCCESS
 #define VbglGRFree(...) do {} while(0)
+#endif
+#define VbglInit(...) VINF_SUCCESS
+#define vbglDriverOpen(...) VINF_SUCCESS
+#define vbglDriverClose(...) do {} while(0)
+#define vbglDriverIOCtl(...) VINF_SUCCESS
 #define qprocson(...) do {} while(0)
 #define qprocsoff(...) do {} while(0)

trunk/src/VBox/Additions/solaris/Mouse/vboxmouse.c

@@ -78 +78 @@
 #define DEVICE_NAME              "vboxmouse"
 /** The module description as seen in 'modinfo'. */
-#define DEVICE_DESC              "VirtualBox MouInt"
+#define DEVICE_DESC              "VBoxMouseIntegr"
 
 
@@ -102 +102 @@
 static struct module_info g_vbmsSolModInfo =
 {
-    0x0ffff,                /* module id number */
-    "vboxmouse",
+    0,                      /* module id number */
+    "vboxms",
     0,                      /* minimum packet size */
     INFPSZ,                 /* maximum packet size accepted */
@@ -159 +159 @@
  */
 static struct fmodsw g_vbmsSolStrWrapper = {
-    "vboxmouse",
+    "vboxms",
     &g_vbmsSolStreamTab,
-    D_MP | D_MTPERMOD
+    D_MP
 };
 
@@ -193 +193 @@
 typedef struct
 {
-    /** Pointer to the Guest Library handle for the main driver. */
-    VBGLDRIVER         Driver;
     /** The STREAMS write queue which we need for sending messages up to
      * user-space. */
@@ -286 +284 @@
 
 /******************************************************************************
-*   Helper routines                                                           *
-******************************************************************************/
-
-/** Calls the kernel IOCtl to report mouse status to the host on behalf of
- * an open session. */
-static int vbmsSolSetMouseStatus(VBGLDRIVER *pDriver, uint32_t fStatus)
-{
-    return vbglDriverIOCtl(pDriver, VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fStatus,
-                           sizeof(fStatus));
-}
-
-
-/******************************************************************************
 *   Main code                                                                 *
 ******************************************************************************/
@@ -341 +326 @@
      * Create a new session.
      */
-    rc = vbglDriverOpen(&pState->Driver);
-    if (RT_SUCCESS(rc))
-    {
-        VBoxGuestMouseSetNotifyCallback NotifyCallback;
-
+    if (VbglIsReady())
+    {
         /* Initialise user data for the queues to our state and vice-versa. */
         WR(pReadQueue)->q_ptr = (char *)pState;
         pReadQueue->q_ptr = (char *)pState;
         /* Enable our IRQ handler. */
-        NotifyCallback.pfnNotify = vbmsSolNotify;
-        NotifyCallback.pvUser    = (void *)pState;
-        vbglDriverIOCtl(&pState->Driver,
-                        VBOXGUEST_IOCTL_SET_MOUSE_NOTIFY_CALLBACK,
-                        &NotifyCallback, sizeof(NotifyCallback));
+        VbglSetMouseNotifyCallback(vbmsSolNotify, (void *)pState);
         qprocson(pReadQueue);
         LogRel((DEVICE_NAME "::Open\n"));
@@ -377 +355 @@
 {
     PVBMSSTATE pState = (PVBMSSTATE)pvState;
-    VMMDevReqMouseStatus *pReq;
     int rc;
+    uint32_t x, y;
     LogFlow((DEVICE_NAME "::NativeISRMousePollEvent:\n"));
 
-    rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq),
-                     VMMDevReq_GetMouseStatus);
-    if (RT_FAILURE(rc))
-        return;  /* If kernel memory is short a missed event is acceptable! */
-    pReq->mouseFeatures = 0;
-    pReq->pointerXPos = 0;
-    pReq->pointerYPos = 0;
-    rc = VbglGRPerform(&pReq->header);
+    rc = VbglGetMouseStatus(NULL, &x, &y);
     if (RT_SUCCESS(rc))
     {
@@ -397 +368 @@
         {
             vbmsSolVUIDPutAbsEvent(pState, LOC_X_ABSOLUTE,
-                                     pReq->pointerXPos * cMaxScreenX
-                                   / VMMDEV_MOUSE_RANGE_MAX);
+                                   x * cMaxScreenX / VMMDEV_MOUSE_RANGE_MAX);
             vbmsSolVUIDPutAbsEvent(pState, LOC_Y_ABSOLUTE,
-                                     pReq->pointerYPos * cMaxScreenY
-                                   / VMMDEV_MOUSE_RANGE_MAX);
+                                   y * cMaxScreenY / VMMDEV_MOUSE_RANGE_MAX);
         }
     }
-    VbglGRFree(&pReq->header);
 }
 
@@ -439 +407 @@
 {
     PVBMSSTATE pState = (PVBMSSTATE)pReadQueue->q_ptr;
-    VBoxGuestMouseSetNotifyCallback NotifyCallback;
 
     LogFlow((DEVICE_NAME "::Close\n"));
@@ -451 +418 @@
     }
 
+    VbglSetMouseStatus(0);
     /* Disable our IRQ handler. */
-    RT_ZERO(NotifyCallback);
-    vbglDriverIOCtl(&pState->Driver,
-                    VBOXGUEST_IOCTL_SET_MOUSE_NOTIFY_CALLBACK,
-                    &NotifyCallback, sizeof(NotifyCallback));
+    VbglSetMouseNotifyCallback(NULL, NULL);
     qprocsoff(pReadQueue);
 
@@ -461 +426 @@
      * Close the session.
      */
-    vbglDriverClose(&pState->Driver);
     ASMAtomicWriteNullPtr(&pState->pWriteQueue);
     pReadQueue->q_ptr = NULL;
@@ -1198 +1162 @@
             pState->cMaxScreenY = pResolution->height - 1;
             /* Note: we don't disable this again until session close. */
-            rc = vbmsSolSetMouseStatus(&pState->Driver,
-                                         VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                       | VMMDEV_MOUSE_NEW_PROTOCOL);
+            rc = VbglSetMouseStatus(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
+                                    | VMMDEV_MOUSE_NEW_PROTOCOL);
             if (RT_SUCCESS(rc))
                 return 0;