Changeset 100235 in vbox for trunk

Timestamp:

Jun 21, 2023 10:39:24 AM (18 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Got rid of the X11 request worker, as this simplifies code (again). bugref:9437

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp (modified) (12 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp

@@ -52 +52 @@
 #include "clipboard.h"
 
-#include <iprt/req.h>
-
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
-#if 0
-/**
- * Worker for reading the transfer root list from the host.
- */
-static DECLCALLBACK(int) vbclX11ReqTransferReadRootListWorker(PSHCLCONTEXT pCtx, PSHCLTRANSFER pTransfer)
-{
-    RT_NOREF(pCtx);
-
-    LogFlowFuncEnter();
-
-    int rc = ShClTransferRootListRead(pTransfer);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-#endif
-
 /**
  * Worker for waiting for a transfer status change.
@@ -206 +187 @@
  * Worker for a reading clipboard from the host.
  */
-static DECLCALLBACK(int) vbclX11ReqReadDataWorker(PSHCLCONTEXT pCtx, SHCLFORMAT uFmt, void **ppv, uint32_t *pcb, void *pvUser)
+static DECLCALLBACK(int) vbclX11ReadDataWorker(PSHCLCONTEXT pCtx, SHCLFORMAT uFmt, void **ppv, uint32_t *pcb, void *pvUser)
 {
     RT_NOREF(pvUser);
@@ -286 +267 @@
     LogFlowFunc(("pCtx=%p, uFmt=%#x\n", pCtx, uFmt));
 
-    /* Request reading host clipboard data. */
-    PRTREQ pReq = NULL;
-    int rc = RTReqQueueCallEx(pCtx->X11.hReqQ, &pReq, SHCL_TIMEOUT_DEFAULT_MS, RTREQFLAGS_IPRT_STATUS,
-                              (PFNRT)vbclX11ReqReadDataWorker, 5, pCtx, uFmt, ppv, pcb, pvUser);
-    RTReqRelease(pReq);
+    int rc;
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
@@ -297 +274 @@
         PSHCLHTTPSERVER pSrv = &pCtx->X11.HttpCtx.HttpServer;
 
-        rc = ShClTransferHttpServerWaitForStatusChange(pSrv, SHCLHTTPSERVERSTATUS_TRANSFER_REGISTERED, SHCL_TIMEOUT_DEFAULT_MS);
+        rc = vbclX11ReadDataWorker(pCtx, uFmt, ppv, pcb, pvUser);
         if (RT_SUCCESS(rc))
-        {
-            PSHCLTRANSFER pTransfer = ShClTransferHttpServerGetTransferFirst(pSrv);
+            rc = ShClTransferHttpServerWaitForStatusChange(pSrv, SHCLHTTPSERVERSTATUS_TRANSFER_REGISTERED, 5000 /* SHCL_TIMEOUT_DEFAULT_MS */);
+        if (RT_SUCCESS(rc))
+        {
+            PSHCLTRANSFER pTransfer = ShClTransferHttpServerGetTransferLast(pSrv);
             if (pTransfer)
             {
@@ -313 +292 @@
                     *pcb = strlen(pszData) + 1 /* Include terminator */;
 
+                    LogFlowFunc(("pszURL=%s\n", pszURL));
+
                     RTStrFree(pszURL);
 
                     rc = VINF_SUCCESS;
-
-                    LogFlowFunc(("pszURL=%s\n", pszURL));
                 }
             }
@@ -326 +305 @@
             LogRel(("Shared Clipboard: Could not start transfer, as the HTTP server is not running\n"));
     }
+    else /* Anything else */
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP */
+    {
+        rc = vbclX11ReadDataWorker(pCtx, uFmt, ppv, pcb, pvUser);
+    }
 
     if (RT_FAILURE(rc))
@@ -336 +319 @@
 
 /**
- * Worker for reporting clipboard formats to the host.
- */
-static DECLCALLBACK(int) vbclX11ReqReportFormatsWorker(PSHCLCONTEXT pCtx, uint32_t fFormats, void *pvUser)
+ * @copydoc SHCLCALLBACKS::pfnReportFormats
+ *
+ * Reports clipboard formats to the host.
+ *
+ * @thread  X11 event thread.
+ */
+static DECLCALLBACK(int) vbclX11ReportFormatsCallback(PSHCLCONTEXT pCtx, uint32_t fFormats, void *pvUser)
 {
     RT_NOREF(pvUser);
@@ -345 +332 @@
 
     int rc = VbglR3ClipboardReportFormats(pCtx->CmdCtx.idClient, fFormats);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-/**
- * @copydoc SHCLCALLBACKS::pfnReportFormats
- *
- * Reports clipboard formats to the host.
- *
- * @thread  X11 event thread.
- */
-static DECLCALLBACK(int) vbclX11ReportFormatsCallback(PSHCLCONTEXT pCtx, uint32_t fFormats, void *pvUser)
-{
-    /* Request reading host clipboard data. */
-    PRTREQ pReq = NULL;
-    int rc = RTReqQueueCallEx(pCtx->X11.hReqQ, &pReq, SHCL_TIMEOUT_DEFAULT_MS, RTREQFLAGS_IPRT_STATUS,
-                              (PFNRT)vbclX11ReqReportFormatsWorker, 3, pCtx, fFormats, pvUser);
-    RTReqRelease(pReq);
 
     LogFlowFuncLeaveRC(rc);
@@ -430 +398 @@
 {
     PSHCLCONTEXT pCtx = &g_Ctx;
-
-    int rc = RTReqQueueCreate(&pCtx->X11.hReqQ);
-    AssertRCReturn(rc, rc);
 
     bool fShutdown = false;
@@ -459 +424 @@
                  pCtx->CmdCtx.fUseLegacyProtocol, pCtx->CmdCtx.fHostFeatures));
 
-    /* The thread processes incoming messages from the host and the worker queue. */
-    PVBGLR3CLIPBOARDEVENT pEvent = NULL;
+    int rc;
+
+    /* The thread waits for incoming messages from the host. */
     for (;;)
     {
-        if (!pEvent)
-            pEvent = (PVBGLR3CLIPBOARDEVENT)RTMemAllocZ(sizeof(VBGLR3CLIPBOARDEVENT));
+        PVBGLR3CLIPBOARDEVENT pEvent = (PVBGLR3CLIPBOARDEVENT)RTMemAllocZ(sizeof(VBGLR3CLIPBOARDEVENT));
         AssertPtrBreakStmt(pEvent, rc = VERR_NO_MEMORY);
 
         uint32_t idMsg  = 0;
         uint32_t cParms = 0;
-        rc = VbglR3ClipboardMsgPeek(&pCtx->CmdCtx, &idMsg, &cParms, NULL /* pidRestoreCheck */);
+        rc = VbglR3ClipboardMsgPeekWait(&pCtx->CmdCtx, &idMsg, &cParms, NULL /* pidRestoreCheck */);
         if (RT_SUCCESS(rc))
         {
@@ -477 +442 @@
             rc = VbglR3ClipboardEventGetNext(idMsg, cParms, &pCtx->CmdCtx, pEvent);
 #endif
-        }
-        else if (rc == VERR_TRY_AGAIN) /* No new message (yet). */
-        {
-            RTReqQueueProcess(pCtx->X11.hReqQ, RT_MS_1SEC);
-            continue;
         }
 
@@ -592 +552 @@
     }
 
-    RTReqQueueDestroy(pCtx->X11.hReqQ);
-
     LogFlowFuncLeaveRC(rc);
     return rc;