Changeset 80654 in vbox

Timestamp:

Sep 8, 2019 11:51:15 PM (5 years ago)

Author:

vboxsync

Message:

Main/GuestImpl: Start the Guest::i_staticUpdateStats in paused mode so that it matches the default mStatUpdateInterval value (0) and change logic in Guest::setStatisticsUpdateInterval. No need to work STAM and PGM once a second and IPC the results into VBoxSVC. Also fixed missing seconds to nanoseconds conversion in two RTTimerLRChangeInterval calls, resulting in the timer always running at 1 Hz regardless of the update interval set by the API user.

Location:

trunk/src/VBox/Main

Files:

• include/GuestImpl.h (modified) (1 diff)
• src-client/GuestImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/GuestImpl.h

@@ -220 +220 @@
 
     ULONG                           mMemoryBalloonSize;
-    ULONG                           mStatUpdateInterval;
+    ULONG                           mStatUpdateInterval; /**< In seconds. */
     uint64_t                        mNetStatRx;
     uint64_t                        mNetStatTx;

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

@@ -108 +108 @@
 
     mMagic = GUEST_MAGIC;
-    int vrc = RTTimerLRCreate(&mStatTimer, 1000 /* ms */,
-                              &Guest::i_staticUpdateStats, this);
+    int vrc = RTTimerLRCreateEx(&mStatTimer, RT_NS_1SEC, 0 /*fFlags*/, &Guest::i_staticUpdateStats, this);
     AssertMsgRC(vrc, ("Failed to create guest statistics update timer (%Rrc) - ignored\n", vrc));
 
@@ -628 +627 @@
 
     if (mStatUpdateInterval)
+    {
         if (aStatisticsUpdateInterval == 0)
             RTTimerLRStop(mStatTimer);
         else
-            RTTimerLRChangeInterval(mStatTimer, aStatisticsUpdateInterval);
-    else
-        if (aStatisticsUpdateInterval != 0)
-        {
-            RTTimerLRChangeInterval(mStatTimer, aStatisticsUpdateInterval);
-            RTTimerLRStart(mStatTimer, 0);
-        }
+            RTTimerLRChangeInterval(mStatTimer, aStatisticsUpdateInterval * RT_NS_1SEC_64);
+    }
+    else if (aStatisticsUpdateInterval != 0)
+    {
+        RTTimerLRChangeInterval(mStatTimer, aStatisticsUpdateInterval * RT_NS_1SEC_64);
+        RTTimerLRStart(mStatTimer, 0);
+    }
     mStatUpdateInterval = aStatisticsUpdateInterval;
-    /* forward the information to the VMM device */
+
+    /* Forward the information to the VMM device.
+       MUST release all locks before calling VMM device as its critsect
+       has higher lock order than anything in Main. */
     VMMDev *pVMMDev = mParent->i_getVMMDev();
-    /* MUST release all locks before calling VMM device as its critsect
-     * has higher lock order than anything in Main. */
     alock.release();
     if (pVMMDev)