Changeset 99966 in vbox

Timestamp:

May 25, 2023 8:35:13 AM (23 months ago)

Author:

vboxsync

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

157626

Message:

Shared Clipboard: Use a define for clipboard timeouts. bugref:9437

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-transfers.h (modified) (2 diffs)
• src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (3 diffs)

trunk/include/VBox/GuestHost/SharedClipboard-transfers.h

@@ -80 +80 @@
 /** Defines the default maximum object handles a Shared Clipboard transfer can have. */
 #define SHCL_TRANSFER_DEFAULT_MAX_OBJ_HANDLES   _4K
+/** Defines the default timeout (in ms) to use for clipboard operations. */
+#define SHCL_TIMEOUT_DEFAULT_MS                 RT_MS_30SEC
 
 /**
@@ -941 +943 @@
     /** Absolute path to root entries. */
     char                     *pszPathRootAbs;
-    /** Timeout (in ms) for waiting of events. Default is 30s. */
+    /** Timeout (in ms) for waiting of events. */
     RTMSINTERVAL              uTimeoutMs;
     /** Maximum data chunk size (in bytes) to transfer. Default is 64K. */

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

@@ -635 +635 @@
                 /* Don't block for too long here, as this also will screw other apps running on the OS. */
                 LogFunc(("Waiting for listing to arrive ...\n"));
-                rc = RTSemEventWait(m_EventListComplete, 30 * 1000 /* 30s timeout */);
+                rc = RTSemEventWait(m_EventListComplete, VBOX_SHCL_TIMEOUT_DEFAULT_MS);
                 if (RT_SUCCESS(rc))
                 {

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -1060 +1060 @@
     pTransfer->pszPathRootAbs    = NULL;
 
-#ifdef DEBUG_andy
-    pTransfer->uTimeoutMs     = RT_MS_5SEC;
-#else
-    pTransfer->uTimeoutMs     = RT_MS_30SEC;
-#endif
+    pTransfer->uTimeoutMs      = SHCL_TIMEOUT_DEFAULT_MS;
     pTransfer->cbMaxChunkSize  = cbMaxChunkSize;
     pTransfer->cMaxListHandles = cMaxListHandles;
@@ -1126 +1122 @@
     LogFlowFuncEnter();
 
-    int rc = shClTransferThreadDestroy(pTransfer, 30 * 1000 /* Timeout in ms */);
+    int rc = shClTransferThreadDestroy(pTransfer, RT_MS_30SEC /* Timeout in ms */);
     if (RT_FAILURE(rc))
         return rc;
@@ -1942 +1938 @@
     if (RT_SUCCESS(rc))
     {
-        int rc2 = RTThreadUserWait(pTransfer->Thread.hThread, 30 * 1000 /* Timeout in ms */);
+        int rc2 = RTThreadUserWait(pTransfer->Thread.hThread, RT_MS_30SEC /* Timeout in ms */);
         AssertRC(rc2);
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -168 +168 @@
     {
         PSHCLEVENTPAYLOAD pPayload;
-        rc = ShClEventWait(pEvent, 30 * 1000, &pPayload);
+        rc = ShClEventWait(pEvent, VBOX_SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
         if (RT_SUCCESS(rc))
         {
@@ -638 +638 @@
             if (RT_SUCCESS(rc))
             {
-                int rc2 = RTThreadUserWait(pCtx->hThread, 30 * 1000 /* Timeout in ms */);
+                int rc2 = RTThreadUserWait(pCtx->hThread, RT_MS_30SEC /* Timeout in ms */);
                 AssertRC(rc2);
             }
@@ -682 +682 @@
 
             /* Wait for the window thread to terminate. */
-            rc = RTThreadWait(pCtx->hThread, 30 * 1000 /* Timeout in ms */, NULL);
+            rc = RTThreadWait(pCtx->hThread, RT_MS_30SEC /* Timeout in ms */, NULL);
             if (RT_FAILURE(rc))
                 LogRel(("Shared Clipboard: Waiting for window thread termination failed with rc=%Rrc\n", rc));

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

@@ -288 +288 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(pEvent, 30 * 1000, &pPayload);
+                rc = ShClEventWait(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -469 +469 @@
 
             PSHCLEVENTPAYLOAD pPayload;
-            rc = ShClEventWait(pEvent, 30 * 1000, &pPayload);
+            rc = ShClEventWait(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
             if (RT_SUCCESS(rc))
             {
@@ -547 +547 @@
                 /* X supplies the data asynchronously, so we need to wait for data to arrive first. */
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(pEvent, 30 * 1000, &pPayload);
+                rc = ShClEventWait(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
                 if (RT_SUCCESS(rc))
                 {