Changeset 40763 in vbox for trunk/src

Timestamp:

Apr 4, 2012 2:40:09 PM (13 years ago)

Author:

vboxsync

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

77258

Message:

SUPR0VtgFireProbe -> SUPR0TracerFireProbe and other SUPDrv-tracer.cpp changes.

Location:

trunk/src

Files:

• VBox/HostDrivers/Support/SUPDrv-dtrace.cpp (modified) (6 diffs)
• VBox/HostDrivers/Support/SUPDrv-tracer.cpp (modified) (10 diffs)
• VBox/HostDrivers/Support/SUPDrv.c (modified) (4 diffs)
• VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (3 diffs)
• VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)
• bldprogs/VBoxTpG.cpp (modified) (1 diff)

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

@@ -25 +25 @@
  */
 
+/** @todo Convert this to a generic tracer implementation. */
 
 /*******************************************************************************
@@ -596 +597 @@
  * @param   pszName             The driver name.
  */
-SUPR0DECL(int) SUPR0VtgRegisterDrv(PSUPDRVSESSION pSession, PVTGOBJHDR pVtgHdr, const char *pszName)
+SUPR0DECL(int) SUPR0TracerRegisterDrv(PSUPDRVSESSION pSession, PVTGOBJHDR pVtgHdr, const char *pszName)
 {
     int rc;
@@ -622 +623 @@
  * @param   pVtgHdr             The VTG header.
  */
-SUPR0DECL(void) SUPR0VtgDeregisterDrv(PSUPDRVSESSION pSession)
+SUPR0DECL(void) SUPR0TracerDeregisterDrv(PSUPDRVSESSION pSession)
 {
     PSUPDRVDTPROVIDER pProv, pProvNext;
@@ -662 +663 @@
  * @param   pVtgHdr             The VTG header.
  */
-SUPR0DECL(int) SUPR0VtgRegisterModule(void *hMod, PVTGOBJHDR pVtgHdr)
+SUPR0DECL(int) SUPR0TracerRegisterModule(void *hMod, PVTGOBJHDR pVtgHdr)
 {
     PSUPDRVLDRIMAGE pImage = (PSUPDRVLDRIMAGE)hMod;
@@ -736 +737 @@
  * @returns VBox status code.
  * @param   pDevExt             The device extension structure.
- * @param   pVtgFireProbe       Pointer to the SUPR0VtgFireProbe entry.
- */
-int VBOXCALL supdrvVtgInit(PSUPDRVDEVEXT pDevExt, PSUPFUNC pVtgFireProbe)
-{
-    Assert(!strcmp(pVtgFireProbe->szName, "SUPR0VtgFireProbe"));
+ * @param   pFireProbeEntry     Pointer to the SUPR0TracerFireProbe entry.
+ */
+int VBOXCALL supdrvVtgInit(PSUPDRVDEVEXT pDevExt, PSUPFUNC pFireProbeEntry)
+{
+    Assert(!strcmp(pFireProbeEntry->szName, "SUPR0TracerFireProbe"));
 
     /*
@@ -749 +750 @@
     {
 #ifdef RT_OS_SOLARIS
-        pVtgFireProbe->pfn = (void *)(uintptr_t)dtrace_probe;
+        pFireProbeEntry->pfn = (void *)(uintptr_t)dtrace_probe;
 #endif
         RTListInit(&pDevExt->DtProviderList);

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

@@ -65 +65 @@
      * SUPR0VtgRegisterDrv.  NULL if pImage is set. */
     PSUPDRVSESSION          pSession;
-    /** The module name. */
-    const char             *pszModName;
 
     /** Set when the module is unloaded or the driver deregisters its probes. */
@@ -95 +93 @@
 
 
+
+/**
+ * Validates a VTG string against length and characterset limitations.
+ *
+ * @returns VINF_SUCCESS, VERR_SUPDRV_VTG_BAD_STRING or
+ *          VERR_SUPDRV_VTG_STRING_TOO_LONG.
+ * @param   psz                 The string.
+ */
 static int supdrvVtgValidateString(const char *psz)
 {
@@ -120 +126 @@
     return VERR_SUPDRV_VTG_STRING_TOO_LONG;
 }
+
 
 /**
@@ -533 +540 @@
             pProv->Core.pHdr        = pVtgHdr;
             pProv->Core.pszName     = &pProv->szName[0];
+            pProv->Core.pszModName  = pszModName;
             pProv->pImage           = pImage;
             pProv->pSession         = pSession;
-            pProv->pszModName       = pszModName;
             pProv->fZombie          = false;
             pProv->fRegistered      = true;
@@ -598 +605 @@
  * @param   pszName             The driver name.
  */
-SUPR0DECL(int) SUPR0VtgRegisterDrv(PSUPDRVSESSION pSession, PVTGOBJHDR pVtgHdr, const char *pszName)
+SUPR0DECL(int) SUPR0TracerRegisterDrv(PSUPDRVSESSION pSession, PVTGOBJHDR pVtgHdr, const char *pszName)
 {
     int rc;
@@ -624 +631 @@
  * @param   pVtgHdr             The VTG header.
  */
-SUPR0DECL(void) SUPR0VtgDeregisterDrv(PSUPDRVSESSION pSession)
+SUPR0DECL(void) SUPR0TracerDeregisterDrv(PSUPDRVSESSION pSession)
 {
     PSUPDRVTPPROVIDER pProv, pProvNext;
@@ -664 +671 @@
  * @param   pVtgHdr             The VTG header.
  */
-SUPR0DECL(int) SUPR0VtgRegisterModule(void *hMod, PVTGOBJHDR pVtgHdr)
+SUPR0DECL(int) SUPR0TracerRegisterModule(void *hMod, PVTGOBJHDR pVtgHdr)
 {
     PSUPDRVLDRIMAGE pImage = (PSUPDRVLDRIMAGE)hMod;
@@ -704 +711 @@
 
 /**
- * Registers the tracer.
+ * Registers the tracer implementation.
  *
  * This should be called from the ModuleInit code or from a ring-0 session.
@@ -714 +721 @@
  * @param   ppHlp               Where to return the tracer helper method table.
  */
-SUPR0DECL(int) SUPR0TracerRegister(void *hMod, PSUPDRVSESSION pSession, PCSUPDRVTRACERREG pReg, PCSUPDRVTRACERHLP *ppHlp)
+SUPR0DECL(int) SUPR0TracerRegisterImpl(void *hMod, PSUPDRVSESSION pSession, PCSUPDRVTRACERREG pReg, PCSUPDRVTRACERHLP *ppHlp)
 {
     PSUPDRVLDRIMAGE pImage = (PSUPDRVLDRIMAGE)hMod;
@@ -774 +781 @@
 
 /**
- * Deregister a tracer associated with a ring-0 session.
+ * Deregister a tracer implementation associated with a ring-0 session.
  *
  * @returns VBox status code.
  * @param   pSession            Ring-0 session handle.
  */
-SUPR0DECL(int) SUPR0TracerDeregister(PSUPDRVSESSION pSession)
+SUPR0DECL(int) SUPR0TracerDeregisterImpl(PSUPDRVSESSION pSession)
 {
     PSUPDRVDEVEXT   pDevExt;

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -163 +163 @@
     { "SUPR0AbsKernelFS",                       (void *)0 },
     { "SUPR0AbsKernelGS",                       (void *)0 },
-    { "SUPR0VtgFireProbe",                      (void *)SUPR0VtgFireProbe },
+    { "SUPR0TracerFireProbe",                   (void *)SUPR0TracerFireProbe },
         /* Normal function pointers: */
     { "SUPR0ComponentRegisterFactory",          (void *)SUPR0ComponentRegisterFactory },
@@ -204 +204 @@
     { "SUPR0GetPagingMode",                     (void *)SUPR0GetPagingMode },
     { "SUPR0EnableVTx",                         (void *)SUPR0EnableVTx },
-    { "SUPR0VtgRegisterModule",                 (void *)SUPR0VtgRegisterModule },
+    { "SUPR0TracerRegisterModule",              (void *)SUPR0TracerRegisterModule },
     { "SUPGetGIP",                              (void *)SUPGetGIP },
     { "g_pSUPGlobalInfoPage",                   (void *)&g_pSUPGlobalInfoPage },
@@ -3685 +3685 @@
  * Stub function.
  */
-SUPR0DECL(void) SUPR0VtgFireProbe(uint32_t idProbe, uintptr_t uArg0, uintptr_t uArg1, uintptr_t uArg2,
-                                  uintptr_t uArg3, uintptr_t uArg4)
+SUPR0DECL(void) SUPR0TracerFireProbe(uint32_t idProbe, uintptr_t uArg0, uintptr_t uArg1, uintptr_t uArg2,
+                                     uintptr_t uArg3, uintptr_t uArg4)
 {
     NOREF(idProbe); NOREF(uArg0); NOREF(uArg1); NOREF(uArg2); NOREF(uArg3); NOREF(uArg4);
@@ -3696 +3696 @@
  * Stub function.
  */
-SUPR0DECL(int) SUPR0VtgRegisterModule(void *hMod, struct VTGOBJHDR *pVtgHdr)
+SUPR0DECL(int) SUPR0TracerRegisterModule(void *hMod, struct VTGOBJHDR *pVtgHdr)
 {
     NOREF(hMod); NOREF(pVtgHdr);

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

@@ -193 +193 @@
  *          - None.
  */
-#define SUPDRV_IOC_VERSION                              0x00190001
+#define SUPDRV_IOC_VERSION                              0x00190002
 
 /** SUP_IOCTL_COOKIE. */
@@ -325 +325 @@
  *
  * @returns 0 on success.
- * @returns Appropriate error code on failure. 
+ * @returns Appropriate error code on failure.
  * @param   hMod        Image handle for use in APIs.
  */
@@ -334 +334 @@
 /**
  * Module termination callback function.
- * This is called once right before the module is being unloaded. 
- *  
+ * This is called once right before the module is being unloaded.
+ *
  * @param   hMod        Image handle for use in APIs.
  */

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

@@ -268 +268 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00190000
-                                   ? 0x00190001
+                                   ? 0x00190002
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -107 +107 @@
 #ifdef VBOX_WITH_DTRACE_R0
     /*
-     * The first thing to do is register the static tracepoints. 
-     * (Deregistration is automatic.) 
-     */
-    int rc2 = SUPR0VtgRegisterModule(hMod, &g_VTGObjHeader);
+     * The first thing to do is register the static tracepoints.
+     * (Deregistration is automatic.)
+     */
+    int rc2 = SUPR0TracerRegisterModule(hMod, &g_VTGObjHeader);
     if (RT_FAILURE(rc2))
         return rc2;
@@ -194 +194 @@
 /**
  * Terminate the module.
- * This is called when we're finally unloaded. 
- *  
+ * This is called when we're finally unloaded.
+ *
  * @param   hMod        Image handle for use in APIs.
  */

trunk/src/bldprogs/VBoxTpG.cpp

@@ -160 +160 @@
 static unsigned             g_cAssemblerOptions         = 0;
 static const char          *g_apszAssemblerOptions[32];
-static const char          *g_pszProbeFnName            = "SUPR0VtgFireProbe";
+static const char          *g_pszProbeFnName            = "SUPR0TracerFireProbe";
 static bool                 g_fProbeFnImported          = true;
 /** @} */