Changeset 38759 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 15, 2011 11:11:27 AM (13 years ago)

Author:

vboxsync

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

74040

Message:

Additions/common/VBoxGuest-linux: push the mouse position update into a work queue

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (7 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -61 +61 @@
 #endif
 
+/* The definition of work queue functions changed in Linux 2.6.20. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+typedef struct work_struct *WQ_PARAM;
+#else
+typedef void *WQ_PARAM;
+#endif
 
 /*******************************************************************************
@@ -78 +84 @@
 static unsigned int vboxguestPoll(struct file *pFile, poll_table *pPt);
 static ssize_t vboxguestRead(struct file *pFile, char *pbBuf, size_t cbRead, loff_t *poff);
+static void vboxguestReportMousePosition(WQ_PARAM unused);
 
 
@@ -99 +106 @@
 /** Wait queue used by polling. */
 static wait_queue_head_t        g_PollEventQueue;
+/** The IRQ bottom half work queue for reporting the mouse position */
+static struct work_struct       g_MouseEventWQ;
 /** Asynchronous notification stuff.  */
 static struct fasync_struct    *g_pFAsyncQueue;
@@ -346 +355 @@
 
 /**
- * Registers the ISR and initializes the poll wait queue.
+ * Registers the ISR and initializes the poll wait queue and the
+ * bottom half work-queue for mouse reporting.
  */
 static int __init vboxguestLinuxInitISR(void)
@@ -353 +363 @@
 
     init_waitqueue_head(&g_PollEventQueue);
+    INIT_WORK(&g_MouseEventWQ, vboxguestReportMousePosition
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+              , NULL
+#endif
+              );
     rc = request_irq(g_pPciDev->irq,
                      vboxguestLinuxISR,
@@ -933 +948 @@
 
 
-void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt)
+void vboxguestReportMousePosition(WQ_PARAM unused)
 {
     VMMDevReqMouseStatus *pReq;
     int rc;
+
+    NOREF(unused);
+    /* Report events to the kernel input device */
+    rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_GetMouseStatus);
+    if (RT_SUCCESS(rc))
+    {
+        pReq->mouseFeatures = 0;
+        pReq->pointerXPos = 0;
+        pReq->pointerYPos = 0;
+        rc = VbglGRPerform(&pReq->header);
+        input_report_abs(g_pInputDevice, ABS_X, pReq->pointerXPos);
+        input_report_abs(g_pInputDevice, ABS_Y, pReq->pointerYPos);
+#ifdef EV_SYN
+        input_sync(g_pInputDevice);
+#endif
+        VbglGRFree(&pReq->header);
+    }
+}
+
+
+void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt)
+{
     NOREF(pDevExt);
 
@@ -947 +984 @@
     Log(("VBoxGuestNativeISRMousePollEvent: kill_fasync\n"));
     kill_fasync(&g_pFAsyncQueue, SIGIO, POLL_IN);
-    /* Report events to the kernel input device */
-    rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_GetMouseStatus);
-    if (RT_SUCCESS(rc))
-    {
-        pReq->mouseFeatures = 0;
-        pReq->pointerXPos = 0;
-        pReq->pointerYPos = 0;
-        rc = VbglGRPerform(&pReq->header);
-        input_report_abs(g_pInputDevice, ABS_X, pReq->pointerXPos);
-        input_report_abs(g_pInputDevice, ABS_Y, pReq->pointerYPos);
-#ifdef EV_SYN
-        input_sync(g_pInputDevice);
-#endif
-        VbglGRFree(&pReq->header);
-    }
     Log(("VBoxGuestNativeISRMousePollEvent: done\n"));
+    schedule_work(&g_MouseEventWQ);
 }