Changeset 40405 in vbox for trunk/include/VBox

Timestamp:

Mar 8, 2012 6:27:45 PM (13 years ago)

Author:

vboxsync

Message:

VMM/PDM: Some simple tracepoint infastructure.

Location:

trunk/include/VBox

Files:

• err.h (modified) (1 diff)
• vmm/dbgftrace.h (modified) (3 diffs)
• vmm/pdmapi.h (modified) (1 diff)
• vmm/pdmdev.h (modified) (1 diff)
• vmm/pdmdrv.h (modified) (1 diff)
• vmm/pdmusb.h (modified) (1 diff)
• vmm/vm.h (modified) (2 diffs)
• vmm/vm.mac (modified) (2 diffs)

trunk/include/VBox/err.h

@@ -297 +297 @@
 /** Internal processing error \#2 in the DBGF stack code. */
 #define VERR_DBGF_STACK_IPE_2               (-1218)
+/** No trace buffer available, please change the VM config. */
+#define VERR_DBGF_NO_TRACE_BUFFER           (-1219)
 /** @} */
 

trunk/include/VBox/vmm/dbgftrace.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 
 #include <iprt/trace.h>
+#include <VBox/types.h>
 
 RT_C_DECLS_BEGIN
@@ -45 +46 @@
 # define DBGFTRACE_DISABLED
 #endif
+
+VMMDECL(int) DBGFR3TraceConfig(PVM pVM, const char *pszConfig);
+
 
 /** @name VMM Internal Trace Macros

trunk/include/VBox/vmm/pdmapi.h

@@ -134 +134 @@
 VMMR3DECL(int)  PDMR3VMMDevHeapFree(PVM pVM, RTR3PTR pv);
 VMMR3DECL(int)  PDMR3UnregisterVMMDevHeap(PVM pVM, RTGCPHYS GCPhys);
+VMMR3_INT_DECL(int)     PDMR3TracingConfig(PVM pVM, const char *pszName, size_t cchName, bool fEnable, bool fApply);
+VMMR3_INT_DECL(bool)    PDMR3TracingAreAll(PVM pVM, bool fEnabled);
+VMMR3_INT_DECL(int)     PDMR3TracingQueryConfig(PVM pVM, char *pszConfig, size_t cbConfig);
 /** @} */
 

trunk/include/VBox/vmm/pdmdev.h

@@ -3922 +3922 @@
      * call PDMR3QueryDevice(). */
     PDMIBASE                    IBase;
+
+    /** Tracing indicator. */
+    uint32_t                    fTraceing;
+#if HC_ARCH_BITS == 64
     /** Align the internal data more naturally. */
-    RTR3PTR                     R3PtrPadding;
+    uint32_t                    u32Padding;
+#endif
 
     /** Internal data. */

trunk/include/VBox/vmm/pdmdrv.h

@@ -383 +383 @@
      * The driver constructor initializes this. */
     PDMIBASE                    IBase;
+
+    /** Tracing indicator. */
+    uint32_t                    fTraceing;
+#if HC_ARCH_BITS == 64
     /** Align the internal data more naturally. */
-    RTR3PTR                     R3PtrPadding;
+    uint32_t                    u32Padding;
+#endif
 
     /** Internal data. */

trunk/include/VBox/vmm/pdmusb.h

@@ -729 +729 @@
      * The constructor sets this and the destructor frees it. */
     R3PTRTYPE(char *)           pszName;
+    /** Tracing indicator. */
+    uint32_t                    fTraceing;
     /** Padding to make achInstanceData aligned at 32 byte boundary. */
-    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 5 : 2];
+    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 4 : 1];
     /** Device instance data. The size of this area is defined
      * in the PDMUSBREG::cbInstanceData field. */

trunk/include/VBox/vmm/vm.h

@@ -84 +84 @@
     /** Per CPU forced action.
      * See the VMCPU_FF_* \#defines. Updated atomically. */
-    uint32_t volatile       fLocalForcedActions;
+    uint32_t volatile       fLocalForcedActions;                    /* 0 */
     /** The CPU state. */
-    VMCPUSTATE volatile     enmState;
+    VMCPUSTATE volatile     enmState;                               /* 4 */
 
     /** Pointer to the ring-3 UVMCPU structure. */
-    PUVMCPU                 pUVCpu;
+    PUVMCPU                 pUVCpu;                                 /* 8 */
     /** Ring-3 Host Context VM Pointer. */
-    PVMR3                   pVMR3;
+    PVMR3                   pVMR3;                                  /* 16 / 12 */
     /** Ring-0 Host Context VM Pointer. */
-    PVMR0                   pVMR0;
-    /** Flag indicating that tracing is enabled.  */
-    bool                    fTracingEnabled;
-    /** Alignment padding. */
-    uint8_t                 abAlignment0[HC_ARCH_BITS == 32 ? 3 : 7];
+    PVMR0                   pVMR0;                                  /* 24 / 16 */
     /** Raw-mode Context VM Pointer. */
-    PVMRC                   pVMRC;
+    PVMRC                   pVMRC;                                  /* 32 / 20 */
     /** The CPU ID.
      * This is the index into the VM::aCpu array. */
-    VMCPUID                 idCpu;
+    VMCPUID                 idCpu;                                  /* 36 / 24 */
     /** The native thread handle. */
-    RTNATIVETHREAD          hNativeThread;
+    RTNATIVETHREAD          hNativeThread;                          /* 40 / 28 */
     /** The native R0 thread handle. (different from the R3 handle!) */
-    RTNATIVETHREAD          hNativeThreadR0;
+    RTNATIVETHREAD          hNativeThreadR0;                        /* 48 / 32 */
     /** Which host CPU ID is this EMT running on.
      * Only valid when in RC or HWACCMR0 with scheduling disabled. */
-    RTCPUID volatile        idHostCpu;
-    /** State data for use by ad hoc profiling. */
-    uint32_t                uAdHoc;
-    /** Profiling samples for use by ad hoc profiling. */
-    STAMPROFILEADV          aStatAdHoc[8];
-
-    /** Align the next bit on a 64-byte boundary and make sure it starts at the same
-     *  offset in both 64-bit and 32-bit builds.
+    RTCPUID volatile        idHostCpu;                              /* 56 / 36 */
+
+    /** Trace groups enable flags.  */
+    uint32_t                fTraceGroups;                           /* 60 / 40 */
+    /** Align the structures below bit on a 64-byte boundary and make sure it starts
+     * at the same offset in both 64-bit and 32-bit builds.
      *
      * @remarks The alignments of the members that are larger than 48 bytes should be
@@ -123 +117 @@
      *          following it (to grow into and align the struct size).
      *   */
-    uint8_t                 abAlignment1[HC_ARCH_BITS == 32 ? 16+64 : 56];
+    uint8_t                 abAlignment1[HC_ARCH_BITS == 64 ? 60 : 16+64];
+    /** State data for use by ad hoc profiling. */
+    uint32_t                uAdHoc;
+    /** Profiling samples for use by ad hoc profiling. */
+    STAMPROFILEADV          aStatAdHoc[8];                          /* size: 40*8 = 320 */
 
     /** CPUM part. */

trunk/include/VBox/vmm/vm.mac

@@ -121 +121 @@
     .pVMR3                  RTR3PTR_RES 1
     .pVMR0                  RTR0PTR_RES 1
-    .fTracingEnabled        resb 1
-%if HC_ARCH_BITS == 32
-    .abAlignment0           resb 3
-%else
-    .abAlignment0           resb 7
-%endif
     .pVMRC                  RTRCPTR_RES 1
     .idCpu                  resd 1
@@ -133 +127 @@
     .hNativeThreadR0        RTR0PTR_RES 1
     .idHostCpu              resd 1
+    .fTraceGroups           resd 1
+%if HC_ARCH_BITS == 32
+    .abAlignment1           resb 16+64
+%else
+    .abAlignment1           resb 60
+%endif
     .uAdHoc                 resd 1
     .aStatAdHoc             resb STAMPROFILEADV_size * 8
 
-%if HC_ARCH_BITS == 32
-    .abAlignment1           resd 16+1
-%endif
     alignb 64