Changeset 58161 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Oct 9, 2015 6:07:59 PM (10 years ago)

Author:

vboxsync

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

103269

Message:

VMMDev: Heartbeat adjustments and build fix.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (6 diffs)
• VMMDevState.h (modified) (2 diffs)

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

@@ -438 +438 @@
 {
     int rc;
-    if (pThis->fHBCheckEnabled)
-    {
-        uint64_t const nsNowTS = TMTimerGetNano(pThis->pHearbeatFlatlinedTimer);
-        if (!pThis->fHasMissedHB)
+    if (pThis->fHeartbeatActive)
+    {
+        uint64_t const nsNowTS = TMTimerGetNano(pThis->pFlatlinedTimer);
+        if (!pThis->fFlatlined)
         { /* likely */ }
         else
         {
             LogRel(("VMMDev: GuestHeartBeat: Guest is alive (gone %'llu ns)\n", nsNowTS - pThis->nsLastHeartbeatTS));
-            ASMAtomicWriteBool(&pThis->fHasMissedHB, false);
+            ASMAtomicWriteBool(&pThis->fFlatlined, false);
         }
         ASMAtomicWriteU64(&pThis->nsLastHeartbeatTS, nsNowTS);
 
         /* Postpone (or restart if we missed a beat) the timeout timer. */
-        rc = TMTimerSetNano(pThis->pHearbeatFlatlinedTimer, pThis->cNsHeartbeatTimeout);
+        rc = TMTimerSetNano(pThis->pFlatlinedTimer, pThis->cNsHeartbeatTimeout);
     }
     else
@@ -467 +467 @@
 {
     PVMMDEV pThis = (PVMMDEV)pvUser;
-    if (pThis->fHBCheckEnabled)
+    if (pThis->fHeartbeatActive)
     {
         uint64_t cNsElapsed = TMTimerGetNano(pTimer) - pThis->nsLastHeartbeatTS;
-        if (   !pThis->fHasMissedHB
+        if (   !pThis->fFlatlined
             && cNsElapsed >= pThis->cNsHeartbeatInterval)
         {
             LogRel(("VMMDev: vmmDevHeartbeatFlatlinedTimer: Guest seems to be unresponsive. Last heartbeat received %RU64 seconds ago\n",
                     cNsElapsed / RT_NS_1SEC));
-            ASMAtomicWriteBool(&pThis->fHasMissedHB, true);
+            ASMAtomicWriteBool(&pThis->fFlatlined, true);
         }
     }
@@ -496 +496 @@
     pReq->cNsInterval = pThis->cNsHeartbeatInterval;
 
-    if (pReq->fEnabled != pThis->fHBCheckEnabled)
-    {
-        ASMAtomicWriteBool(&pThis->fHBCheckEnabled, pReq->fEnabled);
+    if (pReq->fEnabled != pThis->fHeartbeatActive)
+    {
+        ASMAtomicWriteBool(&pThis->fHeartbeatActive, pReq->fEnabled);
         if (pReq->fEnabled)
         {
             /* Start the countdown. */
-            rc = TMTimerSetNano(pThis->pHearbeatFlatlinedTimer, pThis->cNsHeartbeatTimeout);
+            rc = TMTimerSetNano(pThis->pFlatlinedTimer, pThis->cNsHeartbeatTimeout);
             if (RT_SUCCESS(rc))
                 LogRel(("VMMDev: Heartbeat checking timer set to trigger every %RU64 milliseconds\n",
@@ -511 +511 @@
         else
         {
-            rc = TMTimerStop(pThis->pHearbeatFlatlinedTimer);
+            rc = TMTimerStop(pThis->pFlatlinedTimer);
             LogRel(("VMMDev: Heartbeat checking timer has been stopped, rc=%Rrc\n", rc));
         }
@@ -517 +517 @@
     else
     {
-        LogRel(("VMMDev: vmmDevReqHandler_HeartbeatConfigure: fHBCheckEnabled=%RTbool\n", pThis->fHBCheckEnabled));
+        LogRel(("VMMDev: vmmDevReqHandler_HeartbeatConfigure: fHBCheckEnabled=%RTbool\n", pThis->fHeartbeatActive));
         rc = VINF_SUCCESS;
     }
@@ -4176 +4176 @@
      */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, vmmDevHeartbeatFlatlinedTimer, pThis,
-                                TMTIMER_FLAGS_NO_CRIT_SECT, "Heartbeat flatlined", &pThis->pHearbeatFlatlinedTimer);
+                                TMTIMER_FLAGS_NO_CRIT_SECT, "Heartbeat flatlined", &pThis->pFlatlinedTimer);
     AssertRCReturn(rc, rc);
 

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -360 +360 @@
 #endif /* !VBOX_WITHOUT_TESTING_FEATURES */
 
+    /** @name Heartbeat
+     * @{ */
     /** Timestamp of the last heartbeat from guest in nanosec. */
     uint64_t volatile   nsLastHeartbeatTS;
     /** Indicates whether we missed HB from guest on last check. */
-    bool volatile       fHasMissedHB;
+    bool volatile       fFlatlined;
     /** Indicates whether heartbeat check is active. */
-    bool volatile       fHBCheckEnabled;
+    bool volatile       fHeartbeatActive;
     /** Alignment padding. */
     bool                afAlignment8[6];
@@ -375 +377 @@
     uint64_t            cNsHeartbeatTimeout;
     /** Timer for signalling a flatlined guest. */
-    PTMTIMERR3          pHearbeatFlatlinedTimer;
+    PTMTIMERR3          pFlatlinedTimer;
+    /** @} */
 } VMMDevState;
 typedef VMMDevState VMMDEV;