Changeset 40617 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Mar 25, 2012 7:36:15 PM (13 years ago)

Author:

vboxsync

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

77032

Message:

SUPDrv-dtrace.c: Made it work.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp (modified) (12 diffs)

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

@@ -78 +78 @@
     /** The ID of this provider. */
     dtrace_provider_id_t idDtProv;
+    /** The number of probes we've provided to DTrace. */
+    uint32_t            cProvidedProbes;
 } SUPDRVDTPROVIDER;
 /** Pointer to the data for a provider. */
@@ -454 +456 @@
         if (pProv)
         {
-            pProv->pDesc        = pDesc;
-            pProv->pHdr         = pVtgHdr;
-            pProv->pImage       = pImage;
-            pProv->pSession     = pSession;
-            pProv->pszModName   = pszModName;
-            pProv->idDtProv     = 0;
+            pProv->pDesc            = pDesc;
+            pProv->pHdr             = pVtgHdr;
+            pProv->pImage           = pImage;
+            pProv->pSession         = pSession;
+            pProv->pszModName       = pszModName;
+            pProv->idDtProv         = 0;
+            pProv->cProvidedProbes  = 0;
             supdrvVtgConvAttr(&pProv->DtAttrs.dtpa_provider, &pDesc->AttrSelf);
             supdrvVtgConvAttr(&pProv->DtAttrs.dtpa_mod,      &pDesc->AttrModules);
@@ -674 +677 @@
         return;  /* We don't generate probes, so never mind these requests. */
 
+    if (pProv->cProvidedProbes >= pProv->pDesc->cProbes)
+        return;
+
      /* Need a buffer for extracting the function names and mangling them in
         case of collision. */
@@ -689 +695 @@
      {
          PVTGDESCPROBE pProbeDesc = (PVTGDESCPROBE)pProbeLoc->pbProbe;
-         if (pProbeDesc->idxProvider == idxProv)
+         if (   pProbeDesc->idxProvider == idxProv
+             && pProbeLoc->idProbe      == UINT32_MAX)
          {
              /* The function name normally needs to be stripped since we're
@@ -751 +758 @@
              pProbeLoc->idProbe = dtrace_probe_create(pProv->idDtProv, pProv->pszModName, pszFnNmBuf, pszPrbName,
                                                       0 /*aframes*/, pProbeLoc);
+             pProv->cProvidedProbes++;
          }
 
@@ -765 +773 @@
 static int      supdrvDTracePOps_Enable(void *pvProv, dtrace_id_t idProbe, void *pvProbe)
 {
-    PVTGPROBELOC    pProbeLoc  = (PVTGPROBELOC)pvProbe;
-    PVTGDESCPROBE   pProbeDesc = (PVTGDESCPROBE)pProbeLoc->pbProbe;
+    PSUPDRVDTPROVIDER   pProv      = (PSUPDRVDTPROVIDER)pvProv;
+    PVTGPROBELOC        pProbeLoc  = (PVTGPROBELOC)pvProbe;
+    PVTGDESCPROBE       pProbeDesc = (PVTGDESCPROBE)pProbeLoc->pbProbe;
 
     if (!pProbeLoc->fEnabled)
@@ -772 +781 @@
         pProbeLoc->fEnabled = 1;
         if (ASMAtomicIncU32(&pProbeDesc->u32User) == 1)
-            pProbeLoc->fEnabled = 1;
+            pProv->pHdr->pafProbeEnabled[pProbeDesc->idxEnabled] = 1;
     }
 
@@ -785 +794 @@
 static void     supdrvDTracePOps_Disable(void *pvProv, dtrace_id_t idProbe, void *pvProbe)
 {
-    PVTGPROBELOC    pProbeLoc  = (PVTGPROBELOC)pvProbe;
-    PVTGDESCPROBE   pProbeDesc = (PVTGDESCPROBE)pProbeLoc->pbProbe;
+    PSUPDRVDTPROVIDER   pProv      = (PSUPDRVDTPROVIDER)pvProv;
+    PVTGPROBELOC        pProbeLoc  = (PVTGPROBELOC)pvProbe;
+    PVTGDESCPROBE       pProbeDesc = (PVTGDESCPROBE)pProbeLoc->pbProbe;
 
     if (pProbeLoc->fEnabled)
@@ -792 +802 @@
         pProbeLoc->fEnabled = 0;
         if (ASMAtomicDecU32(&pProbeDesc->u32User) == 0)
-            pProbeLoc->fEnabled = 0;
+            pProv->pHdr->pafProbeEnabled[pProbeDesc->idxEnabled] = 1;
     }
 
@@ -816 +826 @@
         size_t      cchType = strlen(pszType);
         if (cchType < sizeof(pArgDesc->dtargd_native))
+        {
             memcpy(pArgDesc->dtargd_native, pszType, cchType + 1);
+            /** @todo mapping */
+        }
         else
             pArgDesc->dtargd_ndx = DTRACE_ARGNONE;
@@ -842 +855 @@
 static void    supdrvDTracePOps_Destroy(void *pvProv, dtrace_id_t idProbe, void *pvProbe)
 {
+    PSUPDRVDTPROVIDER   pProv      = (PSUPDRVDTPROVIDER)pvProv;
     PVTGPROBELOC        pProbeLoc  = (PVTGPROBELOC)pvProbe;
 
@@ -847 +861 @@
     Assert(pProbeLoc->idProbe == idProbe); NOREF(idProbe);
     pProbeLoc->idProbe = UINT32_MAX;
-
-    NOREF(pvProv);
-}
-
+    pProv->cProvidedProbes--;
+}
+