Changeset 50537 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Feb 21, 2014 12:11:24 PM (11 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuest: simplify the mouse call-back management.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest.cpp (modified) (7 diffs)
• VBoxGuestInternal.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -927 +927 @@
     pDevExt->MouseNotifyCallback.pfnNotify = NULL;
     pDevExt->MouseNotifyCallback.pvUser = NULL;
-    pDevExt->cISR = 0;
 
     /*
@@ -1463 +1462 @@
  * @param   pDevExt         The device extension.
  * @param   pNotify         The new callback information.
- * @note  This function takes the session spinlock to update the callback
- *        information, but the interrupt handler will not do this.  To make
- *        sure that the interrupt handler sees a consistent structure, we
- *        set the function pointer to NULL before updating the data and only
- *        set it to the correct value once the data is updated.  Since the
- *        interrupt handler executes atomically this ensures that the data is
- *        valid if the function pointer is non-NULL.
  */
 int VBoxGuestCommonIOCtl_SetMouseNotifyCallback(PVBOXGUESTDEVEXT pDevExt, VBoxGuestMouseSetNotifyCallback *pNotify)
@@ -1478 +1470 @@
     pDevExt->MouseNotifyCallback = *pNotify;
     RTSpinlockReleaseNoInts(pDevExt->EventSpinlock);
-
-    /* Make sure no active ISR is referencing the old data - hacky but should be
-     * effective. */
-    while (pDevExt->cISR > 0)
-        ASMNopPause();
-
     return VINF_SUCCESS;
 }
@@ -2969 +2955 @@
 bool VBoxGuestCommonISR(PVBOXGUESTDEVEXT pDevExt)
 {
-#ifndef RT_OS_WINDOWS
-    VBoxGuestMouseSetNotifyCallback MouseNotifyCallback   = { NULL, NULL };
-#endif
     bool                            fMousePositionChanged = false;
     VMMDevEvents volatile          *pReq                  = pDevExt->pIrqAckEvents;
@@ -2984 +2967 @@
 
     /*
-     * Enter the spinlock, increase the ISR count and check if it's our IRQ or
-     * not.
+     * Enter the spinlock and check if it's our IRQ or not.
      */
     RTSpinlockAcquire(pDevExt->EventSpinlock);
-    ASMAtomicIncU32(&pDevExt->cISR);
     fOurIrq = pDevExt->pVMMDevMemory->V.V1_04.fHaveEvents;
     if (fOurIrq)
@@ -3014 +2995 @@
             if (fEvents & VMMDEV_EVENT_MOUSE_POSITION_CHANGED)
             {
-#ifndef RT_OS_WINDOWS
-                MouseNotifyCallback = pDevExt->MouseNotifyCallback;
-#endif
                 fMousePositionChanged = true;
                 fEvents &= ~VMMDEV_EVENT_MOUSE_POSITION_CHANGED;
+#ifndef RT_OS_WINDOWS
+                if (pDevExt->MouseNotifyCallback.pfnNotify)
+                    pDevExt->MouseNotifyCallback.pfnNotify
+                                          (pDevExt->MouseNotifyCallback.pvUser);
+#endif
             }
 
@@ -3096 +3079 @@
         ASMAtomicIncU32(&pDevExt->u32MousePosChangedSeq);
         VBoxGuestNativeISRMousePollEvent(pDevExt);
-#ifndef RT_OS_WINDOWS
-        if (MouseNotifyCallback.pfnNotify)
-            MouseNotifyCallback.pfnNotify(MouseNotifyCallback.pvUser);
-#endif
-    }
-
-    ASMAtomicDecU32(&pDevExt->cISR);
+    }
+
     Assert(rc == 0);
     NOREF(rc);

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -170 +170 @@
     /** Memory balloon information for RTR0MemObjAllocPhysNC(). */
     VBOXGUESTMEMBALLOON         MemBalloon;
-    /** Counter of number of active ISRs.  Currently used for safely removing
-     * the mouse handler callback. */
-    uint32_t volatile           cISR;
     /** Callback and user data for a kernel mouse handler. */
     VBoxGuestMouseSetNotifyCallback MouseNotifyCallback;