Changeset 40867 in vbox

Timestamp:

Apr 11, 2012 10:53:53 AM (13 years ago)

Author:

vboxsync

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

77407

Message:

A couple of tracing bug fixes.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv-dtrace.cpp (modified) (2 diffs)
• SUPDrvTracer.cpp (modified) (8 diffs)

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

@@ -114 +114 @@
     } while (0)
 
-/** SUPR0Printf logging.  */
-#if 0
+/** Simple SUPR0Printf-style logging.  */
+#if 0 /*def DEBUG_bird*/
 # define LOG_DTRACE(a) SUPR0Printf a
 #else
@@ -359 +359 @@
             pProbeLoc->fEnabled = 0;
             if (ASMAtomicDecU32(&pProbeDesc->u32User) == 0)
-                pProv->pHdr->pafProbeEnabled[pProbeDesc->idxEnabled] = 1;
+                pProv->pHdr->pafProbeEnabled[pProbeDesc->idxEnabled] = 0;
         }
     }

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

@@ -86 +86 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
+/** Simple SUPR0Printf-style logging.  */
 #ifdef DEBUG_bird
 # define LOG_TRACER(a_Args)  SUPR0Printf a_Args
@@ -239 +240 @@
     if ((uintptr_t)pVtgHdr->paProbLocs > (uintptr_t)pVtgHdr->paProbLocsEnd)
     {
-        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR_PTR - paProbeLocs=%p > paProbLocsEnd=%p\n", 
+        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR_PTR - paProbeLocs=%p > paProbLocsEnd=%p\n",
                     pVtgHdr->paProbLocs, pVtgHdr->paProbLocsEnd);
         return VERR_SUPDRV_VTG_BAD_HDR_PTR;
@@ -246 +247 @@
     if (cbTmp < sizeof(VTGPROBELOC))
     {
-        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR_TOO_FEW - cbTmp=%#zx paProbeLocs=%p paProbLocsEnd=%p\n", 
+        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR_TOO_FEW - cbTmp=%#zx paProbeLocs=%p paProbLocsEnd=%p\n",
                     cbTmp, pVtgHdr->paProbLocs, pVtgHdr->paProbLocsEnd);
         return VERR_SUPDRV_VTG_BAD_HDR_TOO_FEW;
@@ -252 +253 @@
     if (cbTmp >= _128K * sizeof(VTGPROBELOC))
     {
-        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR_TOO_MUCH - cbTmp=%#zx paProbeLocs=%p paProbLocsEnd=%p\n", 
+        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR_TOO_MUCH - cbTmp=%#zx paProbeLocs=%p paProbLocsEnd=%p\n",
                     cbTmp, pVtgHdr->paProbLocs, pVtgHdr->paProbLocsEnd);
         return VERR_SUPDRV_VTG_BAD_HDR_TOO_MUCH;
@@ -258 +259 @@
     if (cbTmp / sizeof(VTGPROBELOC) * sizeof(VTGPROBELOC) != cbTmp)
     {
-        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR_NOT_MULTIPLE - cbTmp=%#zx cbUnit=%#zx paProbeLocs=%p paProbLocsEnd=%p\n", 
+        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR_NOT_MULTIPLE - cbTmp=%#zx cbUnit=%#zx paProbeLocs=%p paProbLocsEnd=%p\n",
                     cbTmp, sizeof(VTGPROBELOC), pVtgHdr->paProbLocs, pVtgHdr->paProbLocsEnd);
         return VERR_SUPDRV_VTG_BAD_HDR_NOT_MULTIPLE;
@@ -265 +266 @@
     if (pVtgHdr->cbProbes / sizeof(VTGDESCPROBE) != pVtgHdr->cbProbeEnabled)
     {
-        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR - cbProbeEnabled=%#zx cbProbes=%#zx\n", 
+        SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_VTG_BAD_HDR - cbProbeEnabled=%#zx cbProbes=%#zx\n",
                     pVtgHdr->cbProbeEnabled, pVtgHdr->cbProbes);
         return VERR_SUPDRV_VTG_BAD_HDR;
@@ -1079 +1080 @@
 # else
 #  error "Which arch is this?"
-#endif
+# endif
 __asm__("\
                                                                         \n\
@@ -1374 +1375 @@
 #ifdef VBOX_WITH_NATIVE_DTRACE_R0DRV
         pDevExt->pTracerOps = supdrvDTraceInit();
+        if (pDevExt->pTracerOps)
+            g_pfnSupdrvProbeFireKernel = (PFNRT)pDevExt->pTracerOps->pfnProbeFireKernel;
 #endif
 
-        /* 
+        /*
          * Register the provider for this module, if compiled in.
          */