Changeset 14829 in vbox for trunk

Timestamp:

Nov 30, 2008 8:16:10 AM (16 years ago)

Author:

vboxsync

Message:

DevVGA: fixed some stats.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.cpp (modified) (13 diffs)
• Graphics/DevVGA.h (modified) (1 diff)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -3490 +3490 @@
 {
     PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
-    STAM_PROFILE_START(&pThis->StatGCMemoryRead, a);
+    STAM_PROFILE_START(&pThis->CTX_MID_Z(Stat,MemoryRead), a);
     NOREF(pvUser);
     switch (cb)
@@ -3525 +3525 @@
         }
     }
-    STAM_PROFILE_STOP(&pThis->StatGCMemoryRead, a);
+    STAM_PROFILE_STOP(&pThis->CTX_MID_Z(Stat,MemoryRead), a);
     return VINF_SUCCESS;
 }
@@ -3544 +3544 @@
     uint8_t  *pu8 = (uint8_t *)pv;
     int rc = VINF_SUCCESS;
-    STAM_PROFILE_START(&pThis->StatGCMemoryWrite, a);
+    STAM_PROFILE_START(&pThis->CTX_MID_Z(Stat,MemoryWrite), a);
 
     switch (cb)
@@ -3600 +3600 @@
 
     }
-    STAM_PROFILE_STOP(&pThis->StatGCMemoryWrite, a);
+    STAM_PROFILE_STOP(&pThis->CTX_MID_Z(Stat,MemoryWrite), a);
     return rc;
 }
@@ -5608 +5608 @@
     pVBEDataHdr->cbData = cb;
 
-#ifndef VRAM_SIZE_FIX
+# ifndef VRAM_SIZE_FIX
     pCurMode = memcpy(pVBEDataHdr + 1, &mode_info_list, sizeof(mode_info_list));
     pCurMode = (ModeInfoListItem *)((uintptr_t)pCurMode + sizeof(mode_info_list));
-#else  /* VRAM_SIZE_FIX defined */
+# else  /* VRAM_SIZE_FIX defined */
     pCurMode = (ModeInfoListItem *)(pVBEDataHdr + 1);
     for (i = 0; i < MODE_INFO_SIZE; i++)
@@ -5628 +5628 @@
         pCurMode++;
     }
-#endif  /* VRAM_SIZE_FIX defined */
+# endif  /* VRAM_SIZE_FIX defined */
 
     /*
@@ -5637 +5637 @@
         ModeInfoListItem *pDefMode = mode_info_list;
         Log(("vgaR3Construct: cyReduction=%u\n", cyReduction));
-#ifndef VRAM_SIZE_FIX
+# ifndef VRAM_SIZE_FIX
         for (i = 0; i < MODE_INFO_SIZE; i++, pCurMode++, pDefMode++)
         {
@@ -5644 +5644 @@
             pCurMode->info.YResolution -= cyReduction;
         }
-#else  /* VRAM_SIZE_FIX defined */
+# else  /* VRAM_SIZE_FIX defined */
         for (i = 0; i < MODE_INFO_SIZE; i++, pDefMode++)
         {
@@ -5660 +5660 @@
             pCurMode++;
         }
-#endif  /* VRAM_SIZE_FIX defined */
+# endif  /* VRAM_SIZE_FIX defined */
     }
 
@@ -5691 +5691 @@
                     return VERR_VGA_INVALID_CUSTOM_MODE;
                 }
-#ifdef VRAM_SIZE_FIX
+# ifdef VRAM_SIZE_FIX
                 if (cx * cy * cBits / 8 >= pThis->vram_size)
                 {
@@ -5698 +5698 @@
                     return VERR_VGA_INVALID_CUSTOM_MODE;
                 }
-#endif  /* VRAM_SIZE_FIX defined */
+# endif  /* VRAM_SIZE_FIX defined */
                 MMR3HeapFree(pszExtraData);
 
@@ -5774 +5774 @@
     if (RT_FAILURE(rc))
         return rc;
-#endif
+#endif /* VBE_NEW_DYN_LIST */
 
     /*
@@ -5937 +5937 @@
      * Statistics.
      */
-    STAM_REG(pVM, &pThis->StatGCMemoryRead,     STAMTYPE_PROFILE, "/Devices/VGA/GC/Memory/Read",         STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCMemoryRead() body.");
-    STAM_REG(pVM, &pThis->StatGCMemoryWrite,    STAMTYPE_PROFILE, "/Devices/VGA/GC/Memory/Write",        STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCMemoryWrite() body.");
-    STAM_REG(pVM, &pThis->StatGCIOPortRead,     STAMTYPE_PROFILE, "/Devices/VGA/GC/IOPort/Read",         STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCIOPortRead() body.");
-    STAM_REG(pVM, &pThis->StatGCIOPortWrite,    STAMTYPE_PROFILE, "/Devices/VGA/GC/IOPort/Write",        STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCIOPortWrite() body.");
+    STAM_REG(pVM, &pThis->StatRZMemoryRead,     STAMTYPE_PROFILE, "/Devices/VGA/RZ/MMIO-Read",  STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCMemoryRead() body.");
+    STAM_REG(pVM, &pThis->StatR3MemoryRead,     STAMTYPE_PROFILE, "/Devices/VGA/R3/MMIO-Read",  STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCMemoryRead() body.");
+    STAM_REG(pVM, &pThis->StatRZMemoryWrite,    STAMTYPE_PROFILE, "/Devices/VGA/RZ/MMIO-Write", STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCMemoryWrite() body.");
+    STAM_REG(pVM, &pThis->StatR3MemoryWrite,    STAMTYPE_PROFILE, "/Devices/VGA/R3/MMIO-Write", STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCMemoryWrite() body.");
 
     return rc;

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -296 +296 @@
     PCIDEVICE                   Dev;
 
-    STAMPROFILE                 StatGCMemoryRead;
-    STAMPROFILE                 StatGCMemoryWrite;
-    STAMPROFILE                 StatGCIOPortRead;
-    STAMPROFILE                 StatGCIOPortWrite;
+    STAMPROFILE                 StatRZMemoryRead;
+    STAMPROFILE                 StatR3MemoryRead;
+    STAMPROFILE                 StatRZMemoryWrite;
+    STAMPROFILE                 StatR3MemoryWrite;
 
 #ifdef VBE_BYTEWISE_IO

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -220 +220 @@
     CHECK_MEMBER_ALIGNMENT(PCNetState, u64LastPoll, 8);
     CHECK_MEMBER_ALIGNMENT(VGASTATE, Dev, 8);
-    CHECK_MEMBER_ALIGNMENT(VGASTATE, StatGCMemoryRead, 8);
+    CHECK_MEMBER_ALIGNMENT(VGASTATE, StatRZMemoryRead, 8);
 #ifdef VBOX_WITH_STATISTICS
 //    CHECK_MEMBER_ALIGNMENT(PCNetState, StatMMIOReadGC, 8);

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -263 +263 @@
     GEN_CHECK_OFF(VGASTATE, cMilliesRefreshInterval);
     GEN_CHECK_OFF(VGASTATE, Dev);
-    GEN_CHECK_OFF(VGASTATE, StatGCMemoryRead);
-    GEN_CHECK_OFF(VGASTATE, StatGCMemoryWrite);
-    GEN_CHECK_OFF(VGASTATE, StatGCIOPortRead);
-    GEN_CHECK_OFF(VGASTATE, StatGCIOPortWrite);
+    GEN_CHECK_OFF(VGASTATE, StatRZMemoryRead);
+    GEN_CHECK_OFF(VGASTATE, StatR3MemoryRead);
+    GEN_CHECK_OFF(VGASTATE, StatRZMemoryWrite);
+    GEN_CHECK_OFF(VGASTATE, StatR3MemoryWrite);
 #ifdef VBE_BYTEWISE_IO
     GEN_CHECK_OFF(VGASTATE, fReadVBEData);