Changeset 21102 in vbox

Timestamp:

Jun 30, 2009 7:38:12 PM (16 years ago)

Author:

vboxsync

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

49365

Message:

VBoxGuest (common): poll() update.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-linux.c (modified) (4 diffs)
• VBoxGuest.cpp (modified) (6 diffs)

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

@@ -669 +669 @@
 
 /**
+ * Asynchronous notification activation method.
+ *
+ * @returns 0 on success, negative errno on failure.
+ *
+ * @param   fd          The file descriptor.
+ * @param   pFile       The file structure.
+ * @param   fOn         On/off indicator.
+ */
+static int vboxguestFAsync(int fd, struct file *pFile, int fOn)
+{
+    return fasync_helper(fd, pFile, fOn, &g_pFAsyncQueue);
+}
+
+
+/**
  * Poll function.
  *
@@ -678 +693 @@
  * @param   pFile       The file structure.
  * @param   pPt         The poll table.
+ *
+ * @remarks This is probably not really used, X11 is said to use the fasync
+ *          interface instead.
  */
 static unsigned int vboxguestPoll(struct file *pFile, poll_table *pPt)
@@ -686 +704 @@
                                   ? POLLIN | POLLRDNORM
                                   : 0;
-#if 1 /** @todo this isn't quite right... but it's what we used to do. */
-    pSession->u32MousePosChangedSeq = u32CurSeq;
-#endif
     poll_wait(pFile, &g_PollEventQueue, pPt);
     return fMask;
-}
-
-
-/**
- * Asynchronous notification activation method.
- *
- * @returns 0 on success, negative errno on failure.
- *
- * @param   fd          The file descriptor.
- * @param   pFile       The file structure.
- * @param   fOn         On/off indicator.
- */
-static int vboxguestFAsync(int fd, struct file *pFile, int fOn)
-{
-    return fasync_helper(fd, pFile, fOn, &g_pFAsyncQueue);
 }
 
@@ -718 +718 @@
  * @param   cbRead      The max number of bytes to read.
  * @param   poff        The current file position.
+ *
+ * @remarks This is probably not really used as X11 lets the driver do its own
+ *          event reading. The poll condition is therefore also cleared when we
+ *          see VMMDevReq_GetMouseStatus in VBoxGuestCommonIOCtl_VMMRequest.
  */
 static ssize_t vboxguestRead(struct file *pFile, char *pbBuf, size_t cbRead, loff_t *poff)
 {
+    PVBOXGUESTSESSION   pSession  = (PVBOXGUESTSESSION)pFile->private_data;
+    uint32_t            u32CurSeq = ASMAtomicUoReadU32(&g_DevExt.u32MousePosChangedSeq);
+
     if (*poff != 0)
         return -EINVAL;
 
-    if (cbRead > 0)
-    {
-        /* Indicate that we're up to speed. */
-        PVBOXGUESTSESSION   pSession    = (PVBOXGUESTSESSION)pFile->private_data;
-        uint32_t            u32CurSeq   = ASMAtomicUoReadU32(&g_DevExt.u32MousePosChangedSeq);
+    /*
+     * Fake a single byte read if we're not up to date with the current mouse position.
+     */
+    if (    pSession->u32MousePosChangedSeq != u32CurSeq
+        &&  cbRead > 0)
+    {
         pSession->u32MousePosChangedSeq = u32CurSeq;
-
         pbBuf[0] = 0;
         return 1;
     }
-
-#if 1 /** @todo This is wrong, see man 2 read. Does it server any purpose? */
-    return -EINVAL;
-#else
     return 0;
-#endif
 }
 

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

@@ -747 +747 @@
 
 
-static int VBoxGuestCommonIOCtl_VMMRequest(PVBOXGUESTDEVEXT pDevExt, VMMDevRequestHeader *pReqHdr,
-                                           size_t cbData, size_t *pcbDataReturned)
+static int VBoxGuestCommonIOCtl_VMMRequest(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,
+                                           VMMDevRequestHeader *pReqHdr, size_t cbData, size_t *pcbDataReturned)
 {
     Log(("VBoxGuestCommonIOCtl: VMMREQUEST type %d\n", pReqHdr->requestType));
@@ -755 +755 @@
      * Validate the header and request size.
      */
-    const uint32_t cbReq = pReqHdr->size;
-    const uint32_t cbMinSize = vmmdevGetRequestSize(pReqHdr->requestType);
+    const VMMDevRequestType enmType   = pReqHdr->requestType;
+    const uint32_t          cbReq     = pReqHdr->size;
+    const uint32_t          cbMinSize = vmmdevGetRequestSize(enmType);
     if (cbReq < cbMinSize)
     {
         Log(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid hdr size %#x, expected >= %#x; type=%#x!!\n",
-             cbReq, cbMinSize, pReqHdr->requestType));
+             cbReq, cbMinSize, enmType));
         return VERR_INVALID_PARAMETER;
     }
@@ -766 +767 @@
     {
         Log(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid size %#x, expected >= %#x (hdr); type=%#x!!\n",
-             cbData, cbReq, pReqHdr->requestType));
+             cbData, cbReq, enmType));
         return VERR_INVALID_PARAMETER;
     }
@@ -778 +779 @@
      */
     VMMDevRequestHeader *pReqCopy;
-    int rc = VbglGRAlloc(&pReqCopy, cbReq, pReqHdr->requestType);
+    int rc = VbglGRAlloc(&pReqCopy, cbReq, enmType);
     if (RT_FAILURE(rc))
     {
@@ -785 +786 @@
         return rc;
     }
-
     memcpy(pReqCopy, pReqHdr, cbReq);
+
+    if (enmType == VMMDevReq_GetMouseStatus) /* clear poll condition. */
+        pSession->u32MousePosChangedSeq = ASMAtomicUoReadU32(&pDevExt->u32MousePosChangedSeq);
+
     rc = VbglGRPerform(pReqCopy);
     if (    RT_SUCCESS(rc)
@@ -1269 +1273 @@
     {
         CHECKRET_MIN_SIZE("VMMREQUEST", sizeof(VMMDevRequestHeader));
-        rc = VBoxGuestCommonIOCtl_VMMRequest(pDevExt, (VMMDevRequestHeader *)pvData, cbData, pcbDataReturned);
+        rc = VBoxGuestCommonIOCtl_VMMRequest(pDevExt, pSession, (VMMDevRequestHeader *)pvData, cbData, pcbDataReturned);
     }
 #ifdef VBOX_WITH_HGCM