Changeset 58920 in vbox

Timestamp:

Nov 30, 2015 2:10:59 PM (9 years ago)

Author:

vboxsync

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

104422

Message:

VBoxTpG,SupDrv: Added a per provider enabled probe counter: VTGDESCPROVIDER::cProbesEnabled, <PROVIDER>_ANY_PROBES_ENABLED()

Location:

trunk

Files:

• include/VBox/VBoxTpG.h (modified) (2 diffs)
• src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp (modified) (4 diffs)
• src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp (modified) (4 diffs)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvTracer.cpp (modified) (1 diff)
• src/bldprogs/VBoxTpG.cpp (modified) (7 diffs)

trunk/include/VBox/VBoxTpG.h

@@ -305 +305 @@
     VTGDESCATTR     AttrArguments;
     uint8_t         bReserved;
+    uint32_t        cProbesEnabled;
 } VTGDESCPROVIDER;
+AssertCompileSize(VTGDESCPROVIDER, 28);
 /** Pointer to a VTG provider descriptor. */
 typedef VTGDESCPROVIDER    *PVTGDESCPROVIDER;
@@ -412 +414 @@
 
 /** The current VTGOBJHDR::szMagic value. */
-#define VTGOBJHDR_MAGIC     "VTG Object Header v1.5\0"
+#define VTGOBJHDR_MAGIC     "VTG Object Header v1.6\0"
 
 /** The name of the VTG data object header symbol in the object file. */

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp

@@ -1512 +1512 @@
                 pProbeLocEn->fEnabled = 1;
                 ASMAtomicIncU32(&pProv->pacProbeEnabled[idxProbe]);
+                ASMAtomicIncU32(&pProv->pDesc->cProbesEnabled);
             }
         }
@@ -1521 +1522 @@
                 pProv->paR0ProbeLocs[idxProbeLoc].fEnabled = 1;
                 ASMAtomicIncU32(&pProv->paR0Probes[idxProbe].cEnabled);
+                ASMAtomicIncU32(&pProv->pDesc->cProbesEnabled);
             }
 
@@ -1557 +1559 @@
                 pProbeLocEn->fEnabled = 0;
                 ASMAtomicDecU32(&pProv->pacProbeEnabled[idxProbe]);
+                ASMAtomicDecU32(&pProv->pDesc->cProbesEnabled);
             }
         }
@@ -1566 +1569 @@
                 pProv->paR0ProbeLocs[idxProbeLoc].fEnabled = 0;
                 ASMAtomicDecU32(&pProv->paR0Probes[idxProbe].cEnabled);
+                ASMAtomicDecU32(&pProv->pDesc->cProbesEnabled);
             }
 

trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp

@@ -451 +451 @@
                 pProbeLocEn->fEnabled = 1;
                 ASMAtomicIncU32(&pProv->pacProbeEnabled[idxProbe]);
+                ASMAtomicIncU32(&pProv->pDesc->cProbesEnabled);
             }
         }
@@ -460 +461 @@
                 pProv->paR0ProbeLocs[idxProbeLoc].fEnabled = 1;
                 ASMAtomicIncU32(&pProv->paR0Probes[idxProbe].cEnabled);
+                ASMAtomicIncU32(&pProv->pDesc->cProbesEnabled);
             }
 
@@ -496 +498 @@
                 pProbeLocEn->fEnabled = 0;
                 ASMAtomicDecU32(&pProv->pacProbeEnabled[idxProbe]);
+                ASMAtomicIncU32(&pProv->pDesc->cProbesEnabled);
             }
         }
@@ -505 +508 @@
                 pProv->paR0ProbeLocs[idxProbeLoc].fEnabled = 0;
                 ASMAtomicDecU32(&pProv->paR0Probes[idxProbe].cEnabled);
+                ASMAtomicDecU32(&pProv->pDesc->cProbesEnabled);
             }
 

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -215 +215 @@
  *          - nothing.
  */
-#define SUPDRV_IOC_VERSION                              0x00240000
+#define SUPDRV_IOC_VERSION                              0x00250000
 
 /** SUP_IOCTL_COOKIE. */

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

@@ -538 +538 @@
         MY_VALIDATE_ATTR(pProvider->AttrArguments);
         MY_CHECK_RET(pProvider->bReserved == 0, VERR_SUPDRV_VTG_BAD_PROVIDER);
+        MY_CHECK_RET(pProvider->cProbesEnabled == 0, VERR_SUPDRV_VTG_BAD_PROVIDER);
     }
 

trunk/src/bldprogs/VBoxTpG.cpp

@@ -533 +533 @@
                     "                ;0         1         2         3\n"
                     "                ;012345678901234567890123456789012\n"
-                    "    db          'VTG Object Header v1.5', 0, 0\n"
+                    "    db          'VTG Object Header v1.6', 0, 0\n"
                     "    dd          %u\n"
                     "    dd          NAME(g_acVTGProbeEnabled_End) - NAME(g_VTGObjHeader)\n"
@@ -738 +738 @@
                         "    db %d, %d, %d ; AttrArguments\n"
                         "    db 0       ; reserved\n"
+                        "VTG_GLOBAL g_cVTGProviderProbesEnabled_%s, data\n"
+                        "    dd 0\n"
                         ,
                         iProvider, pProvider->pszName,
@@ -747 +749 @@
                         pProvider->AttrFunctions.enmCode,   pProvider->AttrFunctions.enmData,   pProvider->AttrFunctions.enmDataDep,
                         pProvider->AttrName.enmCode,        pProvider->AttrName.enmData,        pProvider->AttrName.enmDataDep,
-                        pProvider->AttrArguments.enmCode,   pProvider->AttrArguments.enmData,   pProvider->AttrArguments.enmDataDep);
+                        pProvider->AttrArguments.enmCode,   pProvider->AttrArguments.enmData,   pProvider->AttrArguments.enmDataDep,
+                        pProvider->pszName);
         iProvider++;
     }
@@ -909 +912 @@
 
 
+static RTEXITCODE generateProviderDefineName(char *pszBuf, size_t cbBuf, const char *pszProvider)
+{
+    size_t cbMax = strlen(pszProvider) + 1;
+    if (cbMax > cbBuf || cbMax > 80)
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Provider '%s' ends up with a too long defined\n", pszProvider);
+
+    while (*pszProvider)
+        *pszBuf++ = RT_C_TO_UPPER(*pszProvider++);
+
+    *pszBuf = '\0';
+    return RTEXITCODE_SUCCESS;
+}
+
+
 /**
  * Called via generateFile to generate the header file.
@@ -980 +997 @@
     RTListForEach(&g_ProviderHead, pProv, VTGPROVIDER, ListEntry)
     {
+        /* This macro is not available in ring-3 because we don't have
+           anything similar available for native dtrace. */
+        ScmStreamPrintf(pStrm, "\n\n");
+        if (g_fTypeContext != VTG_TYPE_CTX_R3)
+        {
+            generateProviderDefineName(szTmp, sizeof(szTmp), pProv->pszName);
+            ScmStreamPrintf(pStrm,
+                            "extern uint32_t        g_cVTGProviderProbesEnabled_%s;\n"
+                            "# define %s_ANY_PROBES_ENABLED() \\\n"
+                            "    (RT_UNLIKELY(g_cVTGProviderProbesEnabled_%s))\n"
+                            "\n",
+                            pProv->pszName,
+                            szTmp, pProv->pszName);
+        }
+
         RTListForEach(&pProv->ProbeHead, pProbe, VTGPROBE, ListEntry)
         {
@@ -1286 +1318 @@
 }
 
+
 /**
  * Handles a C++ one line comment.
@@ -1297 +1330 @@
     return RTEXITCODE_SUCCESS;
 }
+
 
 /**