Changeset 53707 in vbox for trunk

Timestamp:

Jan 2, 2015 12:44:22 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: fixes (r84)

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0.cpp (modified) (11 diffs)

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

@@ -1388 +1388 @@
     AssertReturnVoid(pProv->pHdr->offProbeLocs != 0);
     uint32_t const  cProbeLocs    = pProv->pHdr->cbProbeLocs / sizeof(VTGPROBELOC);
-    uint32_t const  cbProbeLocRW  = pProv->pHdr->cBits == 32 ? sizeof(VTGPROBELOC32) : sizeof(VTGPROBELOC64);
 
 
@@ -1417 +1416 @@
         else
             pidProbe = &pProv->paR0ProbeLocs[idxProbeLoc].idProbe;
-        if (*pidProbe != UINT32_MAX)
+        if (*pidProbe != 0)
             continue;
 
@@ -1453 +1452 @@
             the function name a little to avoid having to deal with having
             multiple location entries with the same probe ID. (lazy bird) */
-         Assert(*pidProbe == UINT32_MAX);
+         Assert(!*pidProbe);
          if (dtrace_probe_lookup(idProvider, pProv->pszModName, pszFnNmBuf, pszPrbName) != DTRACE_IDNONE)
          {
@@ -1661 +1660 @@
             Assert(*pidProbe == idProbe); NOREF(idProbe);
         }
-        *pidProbe = UINT32_MAX;
+        *pidProbe = 0;
     }
     pProv->TracerData.DTrace.cProvidedProbes--;
@@ -1799 +1798 @@
 static DECLCALLBACK(int) vbdt_ProviderRegister(PCSUPDRVTRACERREG pThis, PSUPDRVVDTPROVIDERCORE pCore)
 {
-    AssertReturn(pCore->TracerData.DTrace.idProvider == UINT32_MAX || pCore->TracerData.DTrace.idProvider == 0,
-                 VERR_INTERNAL_ERROR_3);
+    AssertReturn(pCore->TracerData.DTrace.idProvider == 0, VERR_INTERNAL_ERROR_3);
     VBDT_SETUP_STACK_DATA(kVBoxDtCaller_Generic);
 
@@ -1811 +1809 @@
     vboxDtVtgConvAttr(&DtAttrs.dtpa_args,     &pDesc->AttrArguments);
 
-    dtrace_provider_id_t idProvider;
+    AssertCompile(sizeof(dtrace_provider_id_t) == sizeof(pCore->TracerData.DTrace.idProvider));
     int rc = dtrace_register(pCore->pszName,
                              &DtAttrs,
@@ -1818 +1816 @@
                              &g_vboxDtVtgProvOps,
                              pCore,
-                             &idProvider);
+                             &pCore->TracerData.DTrace.idProvider);
     if (!rc)
     {
-        Assert(idProvider != UINT32_MAX && idProvider != 0);
-        pCore->TracerData.DTrace.idProvider = idProvider;
-        Assert(pCore->TracerData.DTrace.idProvider == idProvider);
+        Assert(pCore->TracerData.DTrace.idProvider != 0);
         rc = VINF_SUCCESS;
     }
@@ -1840 +1836 @@
 {
     uintptr_t idProvider = pCore->TracerData.DTrace.idProvider;
-    AssertReturn(idProvider != UINT32_MAX && idProvider != 0, VERR_INTERNAL_ERROR_4);
+    AssertReturn(idProvider != 0, VERR_INTERNAL_ERROR_4);
     VBDT_SETUP_STACK_DATA(kVBoxDtCaller_Generic);
 
@@ -1847 +1843 @@
     if (!rc)
     {
-        pCore->TracerData.DTrace.idProvider = UINT32_MAX;
+        pCore->TracerData.DTrace.idProvider = 0;
         rc = VINF_SUCCESS;
     }
@@ -1868 +1864 @@
 {
     uintptr_t idProvider = pCore->TracerData.DTrace.idProvider;
-    AssertReturn(idProvider != UINT32_MAX && idProvider != 0, VERR_INTERNAL_ERROR_4);
+    AssertReturn(idProvider != 0, VERR_INTERNAL_ERROR_4);
     Assert(pCore->TracerData.DTrace.fZombie);
     VBDT_SETUP_STACK_DATA(kVBoxDtCaller_Generic);
@@ -1875 +1871 @@
     if (!rc)
     {
-        pCore->TracerData.DTrace.idProvider = UINT32_MAX;
+        pCore->TracerData.DTrace.idProvider = 0;
         rc = VINF_SUCCESS;
     }