Changeset 72300 in vbox for trunk/include/VBox

Timestamp:

May 23, 2018 3:13:06 PM (7 years ago)

Author:

vboxsync

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

122749

Message:

NEM,STAM: Partition memory statistics for NEM. bugref:9044

• STAM: Redid the way we handle statistics requiring fetching data from ring-0 (or elsewhere) by introducing a refresh group concept. We'll refresh the statistics for a group if needed and only once per enumeration/query. There's a new registration API for these.
• NEM: Added memory balance statistics for the partition. Some failed fumbling thru VID.DLL/SYS, before realizing that hypercall is the only way to get at them.
• NEM: Added a hypervisor input/output page buffer for non-EMT threads so we can get statistics. Put the related data and code into separate structure to save duplication.

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (2 diffs)
• nem.h (modified) (1 diff)
• stam.h (modified) (2 diffs)
• vmm.h (modified) (1 diff)

trunk/include/VBox/vmm/gvm.h

@@ -146 +146 @@
         struct NEMR0PERVM   s;
 # endif
-        uint8_t             padding[128];
+        uint8_t             padding[256];
     } nem;
 #endif
@@ -166 +166 @@
 #ifdef VBOX_WITH_NEM_R0
 AssertCompileMemberOffset(GVM, nem,    64 + 256 + 512);
-AssertCompileMemberOffset(GVM, rawpci, 64 + 256 + 512 + 128);
-AssertCompileMemberOffset(GVM, aCpus,  64 + 256 + 512 + 128 + 64);
+AssertCompileMemberOffset(GVM, rawpci, 64 + 256 + 512 + 256);
+AssertCompileMemberOffset(GVM, aCpus,  64 + 256 + 512 + 256 + 64);
 #else
 AssertCompileMemberOffset(GVM, rawpci, 64 + 256 + 512);

trunk/include/VBox/vmm/nem.h

@@ -92 +92 @@
 VMMR0_INT_DECL(int)  NEMR0ImportState(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint64_t fWhat);
 VMMR0_INT_DECL(VBOXSTRICTRC) NEMR0RunGuestCode(PGVM pGVM, VMCPUID idCpu);
+VMMR0_INT_DECL(int)  NEMR0UpdateStatistics(PGVM pGVM, PVM pVM, VMCPUID idCpu);
 /** @} */
 

trunk/include/VBox/vmm/stam.h

@@ -230 +230 @@
 } STAMUNIT;
 
+/** @name STAM_REFRESH_GRP_XXX - STAM refresh groups
+ * @{ */
+#define STAM_REFRESH_GRP_NONE       UINT8_MAX
+#define STAM_REFRESH_GRP_GVMM       0
+#define STAM_REFRESH_GRP_GMM        1
+#define STAM_REFRESH_GRP_NEM        2
+/** @} */
+
 
 /** @def STAM_REL_U8_INC
@@ -1206 +1214 @@
                                         PFNSTAMR3CALLBACKRESET pfnReset, PFNSTAMR3CALLBACKPRINT pfnPrint,
                                         const char *pszDesc, const char *pszName, va_list args) RT_IPRT_FORMAT_ATTR(8, 0);
+
+VMMR3DECL(int)  STAMR3RegisterRefresh(PUVM pUVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility,
+                                      STAMUNIT enmUnit, uint8_t iRefreshGrp, const char *pszDesc,
+                                      const char *pszName, ...) RT_IPRT_FORMAT_ATTR(8, 9);
+VMMR3DECL(int)  STAMR3RegisterRefreshV(PUVM pUVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility,
+                                       STAMUNIT enmUnit, uint8_t iRefreshGrp, const char *pszDesc,
+                                       const char *pszName, va_list va) RT_IPRT_FORMAT_ATTR(8, 0);
+
 VMMR3DECL(int)  STAMR3Deregister(PUVM pUVM, const char *pszPat);
 VMMR3DECL(int)  STAMR3DeregisterF(PUVM pUVM, const char *pszPatFmt, ...) RT_IPRT_FORMAT_ATTR(2, 3);

trunk/include/VBox/vmm/vmm.h

@@ -446 +446 @@
     /** Call NEMR0ImportState() (host specific). */
     VMMR0_DO_NEM_IMPORT_STATE,
+    /** Call NEMR0UpdateStatistics() (host specific). */
+    VMMR0_DO_NEM_UPDATE_STATISTICS,
 
     /** Official call we use for testing Ring-0 APIs. */