Changeset 5233

Timestamp:

10/10/07 20:02:16 (1 year ago)

Author:

vboxsync

Message:

Added a request for resetting GVMM stats. not hooked up to STAM yet.

Files:

• trunk/include/VBox/gvmm.h (modified) (3 diffs)
• trunk/include/VBox/vmm.h (modified) (1 diff)
• trunk/include/iprt/asm.h (modified) (7 diffs)
• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/include/VBox/gvmm.h

@@ -100 +100 @@
-/** Pointer to the GVMM statistics. */
-typedef GVMMSTATS *PGVMMSTATS;
+/** Const pointer to the GVMM statistics. */
+typedef const GVMMSTATS *PCGVMMSTATS;
-
-
@@ -120 +122 @@
-GVMMR0DECL(int)     GVMMR0SchedPoll(PVM pVM, bool fYield);
-GVMMR0DECL(int)     GVMMR0QueryStatistics(PGVMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM);
+GVMMR0DECL(int)     GVMMR0ResetStatistics(PCGVMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM);
-
-
@@ -155 +158 @@
-    GVMMSTATS       Stats;
-} GVMMQUERYSTATISTICSSREQ;
-MMR0AllocatePagesReq / VMMR0_DO_GMM_ALLOCATE_PAGE
+VMMR0QueryStatisticsReq / VMMR0_DO_GVMM_QUERY_STATISTIC
-typedef GVMMQUERYSTATISTICSSREQ *PGVMMQUERYSTATISTICSSREQ;
-
-GVMMR0DECL(int)     GVMMR0QueryStatisticsReq(PVM pVM, PGVMMQUERYSTATISTICSSREQ pReq);
-
+
+/**
+ * Request buffer for GVMMR0ResetStatisticsReq / VMMR0_DO_GVMM_RESET_STATISTICS.
+ * @see GVMMR0ResetStatistics.
+ */
+typedef struct GVMMRESETSTATISTICSSREQ
+{
+    /** The header. */
+    SUPVMMR0REQHDR  Hdr;
+    /** The support driver session. */
+    PSUPDRVSESSION  pSession;
+    /** The statistics to reset.
+     * Any non-zero entry will be reset (if permitted). */
+    GVMMSTATS       Stats;
+} GVMMRESETSTATISTICSSREQ;
+/** Pointer to a GVMMR0ResetStatisticsReq / VMMR0_DO_GVMM_RESET_STATISTICS request buffer. */
+typedef GVMMRESETSTATISTICSSREQ *PGVMMRESETSTATISTICSSREQ;
+
+GVMMR0DECL(int)     GVMMR0ResetStatisticsReq(PVM pVM, PGVMMRESETSTATISTICSSREQ pReq);
-
-

trunk/include/VBox/vmm.h

@@ -368 +368 @@
-    /** Call GVMMR0QueryStatistics(). */
-    VMMR0_DO_GVMM_QUERY_STATISTICS,
+    /** Call GVMMR0ResetStatistics(). */
+    VMMR0_DO_GVMM_RESET_STATISTICS,
-
-    /** Call VMMR0 Per VM Init. */

trunk/include/iprt/asm.h

@@ -1504 +1504 @@
-/**
- * Compiler memory barrier.
- 
- 
+
+
- * values or any outstanding writes when returning from this function.
- 
- 
- 
+
+
+
- * trapping instruction, etc.
- */
@@ -1519 +1519 @@
-DECLINLINE(void) ASMCompilerBarrier(void)
-{
- 
-
-
-
- 
+
+
+
+
+
-
-
@@ -1782 +1782 @@
-#else
-    return (bool)ASMAtomicXchgU8((volatile uint8_t *)pf, (uint8_t)f);
- 
+
-}
-
@@ -2770 +2770 @@
-
-
+/**
+ * Checks if a memory block is filled with the specified byte.
+ *
+ * This is a sort of inverted memchr.
+ *
+ * @returns Pointer to the byte which doesn't equal u8.
+ * @returns NULL if all equal to u8.
+ *
+ * @param   pv      Pointer to the memory block.
+ * @param   cb      Number of bytes in the block. This MUST be aligned on 32-bit!
+ * @param   u8      The value it's supposed to be filled with.
+ */
+#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
+DECLASM(void *) ASMMemIsAll8(void const *pv, size_t cb, uint8_t u8);
+#else
+DECLINLINE(void *) ASMMemIsAll8(void const *pv, size_t cb, uint8_t u8)
+{
+/** @todo rewrite this in inline assembly. */
+    uint8_t const *pb = (uint8_t const *)pv;
+    for (; cb; cb--, pb++)
+        if (RT_UNLIKELY(*pb != u8))
+            return (void *)pb;
+    return NULL;
+}
+#endif
+
+
-
-/**
@@ -2912 +2939 @@
- * @note    Don't use 64-bit C arithmetic here since some gcc compilers generate references to
- *          __udivdi3 and __umoddi3 even if this inline function is not used.
- 
+
- * @returns (u64A * u32B) / u32C.
- * @param   u64A    The 64-bit value.
@@ -2928 +2955 @@
-    __asm__ __volatile__("mulq %2\n\t"
-                         "divq %3\n\t"
- 
+
-                           "=d" (u64Spill)
-                         : "r" ((uint64_t)u32B),
-                           "r" ((uint64_t)u32C),
- 
+
-                           "1" (0));
-    return u64Result;
@@ -2972 +2999 @@
-    u.s.Lo = (uint32_t)((((u64Hi % u32C) << 32) + (u64Lo & 0xffffffff)) / u32C);
-    return u.u;
- 
-
- 
+
+
+
-
-

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -1467 +1467 @@
-}
-
+
+/**
+ * Resets the specified GVMM statistics.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pStats      Which statistics to reset, that is, non-zero fields indicates which to reset.
+ * @param   pSession    The current session.
+ * @param   pVM         The VM to reset statistics for. Optional.
+ */
+GVMMR0DECL(int) GVMMR0ResetStatistics(PCGVMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM)
+{
+    LogFlow(("GVMMR0ResetStatistics: pStats=%p pSession=%p pVM=%p\n", pStats, pSession, pVM));
+
+    /*
+     * Validate input.
+     */
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
+    AssertPtrReturn(pStats, VERR_INVALID_POINTER);
+
+    /*
+     * Take the lock and get the VM statistics.
+     */
+    PGVMM pGVMM;
+    if (pVM)
+    {
+        PGVM pGVM;
+        int rc = gvmmR0ByVM(pVM, &pGVM, &pGVMM, true /*fTakeUsedLock*/);
+        if (RT_FAILURE(rc))
+            return rc;
+#       define MAYBE_RESET_FIELD(field) \
+            do { if (pStats->SchedVM. field ) { pGVM->gvmm.s.StatsSched. field = 0; } } while (0)
+        MAYBE_RESET_FIELD(cHaltCalls);
+        MAYBE_RESET_FIELD(cHaltBlocking);
+        MAYBE_RESET_FIELD(cHaltTimeouts);
+        MAYBE_RESET_FIELD(cHaltNotBlocking);
+        MAYBE_RESET_FIELD(cHaltWakeUps);
+        MAYBE_RESET_FIELD(cWakeUpCalls);
+        MAYBE_RESET_FIELD(cWakeUpNotHalted);
+        MAYBE_RESET_FIELD(cWakeUpWakeUps);
+        MAYBE_RESET_FIELD(cPollCalls);
+        MAYBE_RESET_FIELD(cPollHalts);
+        MAYBE_RESET_FIELD(cPollWakeUps);
+#       undef MAYBE_RESET_FIELD
+    }
+    else
+    {
+        GVMM_GET_VALID_INSTANCE(pGVMM, VERR_INTERNAL_ERROR);
+
+        int rc = RTSemFastMutexRequest(pGVMM->UsedLock);
+        AssertRCReturn(rc, rc);
+    }
+
+    /*
+     * Enumerate the VMs and add the ones visibile to the statistics.
+     */
+    if (ASMMemIsAll8(&pStats->SchedSum, sizeof(pStats->SchedSum), 0))
+    {
+        for (unsigned i = pGVMM->iUsedHead;
+             i != NIL_GVM_HANDLE && i < RT_ELEMENTS(pGVMM->aHandles);
+             i = pGVMM->aHandles[i].iNext)
+        {
+            PGVM pGVM = pGVMM->aHandles[i].pGVM;
+            void *pvObj = pGVMM->aHandles[i].pvObj;
+            if (    VALID_PTR(pvObj)
+                &&  VALID_PTR(pGVM)
+                &&  pGVM->u32Magic == GVM_MAGIC
+                &&  RT_SUCCESS(SUPR0ObjVerifyAccess(pvObj, pSession, NULL)))
+            {
+#               define MAYBE_RESET_FIELD(field) \
+                    do { if (pStats->SchedSum. field ) { pGVM->gvmm.s.StatsSched. field = 0; } } while (0)
+                MAYBE_RESET_FIELD(cHaltCalls);
+                MAYBE_RESET_FIELD(cHaltBlocking);
+                MAYBE_RESET_FIELD(cHaltTimeouts);
+                MAYBE_RESET_FIELD(cHaltNotBlocking);
+                MAYBE_RESET_FIELD(cHaltWakeUps);
+                MAYBE_RESET_FIELD(cWakeUpCalls);
+                MAYBE_RESET_FIELD(cWakeUpNotHalted);
+                MAYBE_RESET_FIELD(cWakeUpWakeUps);
+                MAYBE_RESET_FIELD(cPollCalls);
+                MAYBE_RESET_FIELD(cPollHalts);
+                MAYBE_RESET_FIELD(cPollWakeUps);
+#               undef MAYBE_RESET_FIELD
+            }
+        }
+    }
+
+    RTSemFastMutexRelease(pGVMM->UsedLock);
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * VMMR0 request wrapper for GVMMR0ResetStatistics.
+ *
+ * @returns see GVMMR0ResetStatistics.
+ * @param   pVM             Pointer to the shared VM structure. Optional.
+ * @param   pReq            The request packet.
+ */
+GVMMR0DECL(int) GVMMR0ResetStatisticsReq(PVM pVM, PGVMMRESETSTATISTICSSREQ pReq)
+{
+    /*
+     * Validate input and pass it on.
+     */
+    AssertPtrReturn(pReq, VERR_INVALID_POINTER);
+    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER);
+
+    return GVMMR0ResetStatistics(&pReq->Stats, pReq->pSession, pVM);
+}
+

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -714 +714 @@
-            return GVMMR0QueryStatisticsReq(pVM, (PGVMMQUERYSTATISTICSSREQ)pReqHdr);
-
+        case VMMR0_DO_GVMM_RESET_STATISTICS:
+            if (u64Arg)
+                return VERR_INVALID_PARAMETER;
+            return GVMMR0QueryStatisticsReq(pVM, (PGVMMQUERYSTATISTICSSREQ)pReqHdr);
+
-        /*
-         * Initialize the R0 part of a VM instance.