Changeset 4686 in vbox for trunk/src/VBox/Additions/WINNT/VBoxService

Timestamp:

Sep 11, 2007 8:42:32 AM (17 years ago)

Author:

vboxsync

Message:

Adjusted timeout. VBoxGuest used to wait 10 times longer than it should.

Location:

trunk/src/VBox/Additions/WINNT/VBoxService

Files:

• VBoxDisplay.cpp (modified) (1 diff)
• VBoxMemBalloon.cpp (modified) (1 diff)
• VBoxRestore.cpp (modified) (1 diff)
• VBoxSeamless.cpp (modified) (1 diff)
• VBoxStatistics.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxDisplay.cpp

@@ -319 +319 @@
         /* wait for a display change event */
         VBoxGuestWaitEventInfo waitEvent;
-        waitEvent.u32TimeoutIn = 100;
+        waitEvent.u32TimeoutIn = 1000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
         if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxMemBalloon.cpp

@@ -103 +103 @@
         /* wait for a seamless change event */
         VBoxGuestWaitEventInfo waitEvent;
-        waitEvent.u32TimeoutIn = 1000;
+        waitEvent.u32TimeoutIn = 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST;
         if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxRestore.cpp

@@ -116 +116 @@
         /* wait for a seamless change event */
         VBoxGuestWaitEventInfo waitEvent;
-        waitEvent.u32TimeoutIn = 1000;
+        waitEvent.u32TimeoutIn = 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_RESTORED;
         if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxSeamless.cpp

@@ -293 +293 @@
         /* wait for a seamless change event */
         VBoxGuestWaitEventInfo waitEvent;
-        waitEvent.u32TimeoutIn = 1000;
+        waitEvent.u32TimeoutIn = 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
         if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxStatistics.cpp

@@ -93 +93 @@
         *(uintptr_t *)&gCtx.pfnGlobalMemoryStatusEx = (uintptr_t)GetProcAddress(hMod, "GlobalMemoryStatusEx");
         if (gCtx.pfnGlobalMemoryStatusEx)
-            dprintf(("gCtx.GlobalMemoryStatus= %x\n", gCtx.pfnGlobalMemoryStatusEx));
+            dprintf(("gCtx.GlobalMemoryStatusEx = %x\n", gCtx.pfnGlobalMemoryStatusEx));
         else
         {
             /** @todo now fails in NT4; do we care? */
-            dprintf(("KERNEL32.GlobalMemoryStatus not found!!\n"));
+            dprintf(("KERNEL32.GlobalMemoryStatusEx not found!!\n"));
             return VERR_NOT_IMPLEMENTED;
         }
@@ -260 +260 @@
         /* wait for a seamless change event */
         VBoxGuestWaitEventInfo waitEvent;
-        waitEvent.u32TimeoutIn = (pCtx->uStatInterval) ? pCtx->uStatInterval : 1000;
+        waitEvent.u32TimeoutIn = (pCtx->uStatInterval) ? pCtx->uStatInterval : 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
         if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))