Changeset 40839 in vbox for trunk

Timestamp:

Apr 9, 2012 2:18:19 PM (13 years ago)

Author:

vboxsync

Message:

VBoxTpG: Drop the file name in the probe location, it isn't useful to DTrace. Also use FUNCTION instead of PRETTY_FUNCTION to note down the name of the enclosing function.

Location:

trunk

Files:

• include/VBox/VBoxTpG.h (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDrvTracer.cpp (modified) (1 diff)
• src/bldprogs/VBoxTpG.cpp (modified) (2 diffs)

trunk/include/VBox/VBoxTpG.h

@@ -35 +35 @@
     uint32_t    idProbe;
     const char *pszFunction;
-    const char *pszFile;
     uint8_t    *pbProbe;
-#if ARCH_BITS == 32 /* Make the structure a multiple of 8. */
-    uint32_t    u32Padding;
-#endif
 } VTGPROBELOC;
 /** Pointer to a probe location. */
@@ -228 +224 @@
 
 /** The current VTGOBJHDR::szMagic value. */
-#define VTGOBJHDR_MAGIC     "VTG Object Header v1.0\0"
+#define VTGOBJHDR_MAGIC     "VTG Object Header v1.1\0"
 
 /** The name of the VTG data object header symbol in the object file. */

trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp

@@ -311 +311 @@
             return VERR_SUPDRV_VTG_BAD_PROBE_LOC;
         MY_WITHIN_IMAGE(pVtgHdr->paProbLocs[i].pszFunction, VERR_SUPDRV_VTG_BAD_PROBE_LOC);
-        MY_WITHIN_IMAGE(pVtgHdr->paProbLocs[i].pszFile,     VERR_SUPDRV_VTG_BAD_PROBE_LOC);
         offTmp = (uintptr_t)pVtgHdr->paProbLocs[i].pbProbe - (uintptr_t)pVtgHdr->paProbes;
         if (offTmp >= pVtgHdr->cbProbes)

trunk/src/bldprogs/VBoxTpG.cpp

@@ -489 +489 @@
                     "                ;0         1         2         3\n"
                     "                ;012345678901234567890123456789012\n"
-                    "    db          'VTG Object Header v1.0', 0, 0\n"
+                    "    db          'VTG Object Header v1.1', 0, 0\n"
                     "    dd          %u\n"
                     "    dd          0\n"
@@ -958 +958 @@
                             "        { \\\n"
                             "            VTG_DECL_VTGPROBELOC(s_VTGProbeLoc) = \\\n"
-                            "            { __LINE__, 0, UINT32_MAX, __PRETTY_FUNCTION__, __FILE__, &g_VTGProbeData_%s_%s }; \\\n"
+                            "            { __LINE__, 0, UINT32_MAX, __FUNCTION__, &g_VTGProbeData_%s_%s }; \\\n"
                             "            VTGProbeStub_%s_%s(&s_VTGProbeLoc",
                             pProv->pszName, pProbe->pszMangledName,