Changeset 104003 in vbox for trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

Timestamp:

Mar 22, 2024 4:13:12 PM (11 months ago)

Author:

vboxsync

Message:

Guest Control/Main: Added a new define GSTCTL_DEFAULT_TIMEOUT_MS and replaced most of the hardcoded timeout values with it.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -1079 +1079 @@
         if (RT_SUCCESS(vrc))
         {
-            vrc = pEvent->Wait(30 * 1000);
+            vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
             if (RT_SUCCESS(vrc))
             {
@@ -1244 +1244 @@
     if (RT_SUCCESS(vrc))
     {
-        vrc = pEvent->Wait(30 * 1000);
+        vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
         if (pEvent->HasGuestError() && pvrcGuest)
             *pvrcGuest = pEvent->GuestResult();
@@ -1400 +1400 @@
         if (RT_SUCCESS(vrc))
         {
-            vrc = pEvent->Wait(30 * 1000);
+            vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
             if (RT_SUCCESS(vrc))
             {
@@ -1859 +1859 @@
         if (RT_SUCCESS(vrc))
         {
-            vrc = pEvent->Wait(30 * 1000);
+            vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
             if (RT_SUCCESS(vrc))
             {
@@ -1990 +1990 @@
     {
         int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-        vrc = pFile->i_open(30 * 1000 /* 30s timeout */, &vrcGuest);
+        vrc = pFile->i_open(GSTCTL_DEFAULT_TIMEOUT_MS, &vrcGuest);
         if (   vrc == VERR_GSTCTL_GUEST_ERROR
             && pvrcGuest)
@@ -2141 +2141 @@
         if (RT_SUCCESS(vrc))
         {
-            vrc = pEvent->Wait(30 * 1000);
+            vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
             if (RT_SUCCESS(vrc))
             {
@@ -2218 +2218 @@
         if (RT_SUCCESS(vrc))
         {
-            vrc = pEvent->Wait(30 * 1000);
+            vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
             if (RT_SUCCESS(vrc))
             {
@@ -2796 +2796 @@
     {
         vrc = i_waitForStatusChange(pEvent, GuestSessionWaitForFlag_Start,
-                                    30 * 1000 /* 30s timeout */,
-                                    NULL /* Session status */, pvrcGuest);
+                                    GSTCTL_DEFAULT_TIMEOUT_MS, NULL /* Session status */, pvrcGuest);
     }
     else
@@ -3091 +3090 @@
     if (RT_SUCCESS(vrc))
     {
-        vrc = pEvent->Wait(30 * 1000);
+        vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
         if (pEvent->HasGuestError() && pvrcGuest)
             *pvrcGuest = pEvent->GuestResult();
@@ -3134 +3133 @@
     if (RT_SUCCESS(vrc))
     {
-        vrc = pEvent->Wait(30 * 1000);
+        vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
         if (RT_SUCCESS(vrc))
         {
@@ -3187 +3186 @@
     if (RT_SUCCESS(vrc))
     {
-        vrc = pEvent->Wait(30 * 1000);
+        vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
         if (RT_SUCCESS(vrc))
         {
@@ -3237 +3236 @@
     if (RT_SUCCESS(vrc))
     {
-        vrc = pEvent->Wait(30 * 1000);
+        vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
         if (RT_SUCCESS(vrc))
         {
@@ -3621 +3620 @@
     if (RT_SUCCESS(vrc))
     {
-        vrc = pEvent->Wait(30 * 1000);
+        vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
         if (RT_FAILURE(vrc))
         {