Changeset 55275 in vbox for trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

Timestamp:

Apr 15, 2015 10:57:04 AM (10 years ago)

Author:

vboxsync

Message:

heartbeat service: document it, sanity check and fixed logging

File:

• trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -409 +409 @@
         if (!pThis->fHasMissedHB && uIntervalNs >= pThis->u64HeartbeatInterval)
         {
-            LogRel(("VMMDev: HeartBeatCheckTimer: Guest seems to be unresponsive. Last heartbeat received %RU64 sec ago\n",
+            LogRel(("VMMDev: HeartBeatCheckTimer: Guest seems to be unresponsive. Last heartbeat received %RU64 seconds ago\n",
                     uIntervalNs / RT_NS_1SEC_64));
             ASMAtomicWriteBool(&pThis->fHasMissedHB, true);
@@ -440 +440 @@
             rc = vmmDevHeartbeatTimerReset(pThis);
             if (RT_SUCCESS(rc))
-            {
-                /** @todo r=ramshankar: Why are we using 500000000 here? The comment in
-                 *        u64HeartbeatInterval doesn't indicate anything special.  */
-                LogRel(("VMMDev: Heartbeat checking timer set to trigger every %RU64 sec\n", pThis->u64HeartbeatInterval / 500000000));
-            }
+                LogRel(("VMMDev: Heartbeat checking timer set to trigger every %RU64 milliseconds\n",
+                        pThis->u64HeartbeatTimeout / RT_NS_1MS));
             else
                 LogRel(("VMMDev: Cannot create heartbeat check timer, rc=%Rrc\n", rc));
@@ -3874 +3871 @@
                                   "GuestCoreDumpDir|"
                                   "GuestCoreDumpCount|"
+                                  "HeartbeatInterval|"
+                                  "HeartbeatTimeout|"
                                   "TestingEnabled|"
                                   "TestingMMIO|"
@@ -3933 +3932 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"HeartbeatInterval\" as a 64-bit unsigned integer"));
+    if (pThis->u64HeartbeatInterval < RT_NS_100MS/2)
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Heartbeat interval \"HeartbeatInterval\" too small"));
 
     rc = CFGMR3QueryU64Def(pCfg, "HeartbeatTimeout", &pThis->u64HeartbeatTimeout, pThis->u64HeartbeatInterval * 2);
@@ -3938 +3940 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"HeartbeatTimeout\" as a 64-bit unsigned integer"));
+    if (pThis->u64HeartbeatTimeout < RT_NS_100MS)
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Heartbeat timeout timer interval \"HeartbeatTimeout\" too small"));
 
 #ifndef VBOX_WITHOUT_TESTING_FEATURES