Changeset 40759 in vbox

Timestamp:

Apr 3, 2012 7:57:32 PM (13 years ago)

Author:

vboxsync

Message:

Some more tracer code.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (2 diffs)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrv-tracer.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDrvInternal.h (modified) (1 diff)

trunk/include/VBox/sup.h

@@ -1280 +1280 @@
 
 struct VTGOBJHDR;
+struct VTGPROBELOC;
 
 /**
@@ -1331 +1332 @@
     uint32_t                    u32Version;
 
-    DECLR0CALLBACKMEMBER(int,   pfnTodo1, (PCSUPDRVTRACERREG pThis));
-    DECLR0CALLBACKMEMBER(int,   pfnTodo2, (PCSUPDRVTRACERREG pThis));
-    DECLR0CALLBACKMEMBER(int,   pfnTodo3, (PCSUPDRVTRACERREG pThis));
-    DECLR0CALLBACKMEMBER(int,   pfnTodo4, (PCSUPDRVTRACERREG pThis));
-    DECLR0CALLBACKMEMBER(int,   pfnTodo5, (PCSUPDRVTRACERREG pThis));
+    /**
+     * Fire off a probe.
+     *
+     * @param   pVtgProbeLoc            The probe location record.
+     * @param   uArg0                   The first raw probe argument.
+     * @param   uArg1                   The second raw probe argument.
+     * @param   uArg2                   The third raw probe argument.
+     * @param   uArg3                   The fourth raw probe argument.
+     * @param   uArg4                   The fifth raw probe argument.
+     *
+     * @remarks SUPR0VtgFireProbe will do a tail jump thru this member, so no extra
+     *          stack frames will be added.
+     * @remarks This does not take a 'this' pointer argument because it doesn't map
+     *          well onto VTG or DTrace.
+     *
+     */
+    DECLR0CALLBACKMEMBER(void, pfnFireProbe, (struct VTGPROBELOC *pVtgProbeLoc, uintptr_t uArg0, uintptr_t uArg1, uintptr_t uArg2,
+                                              uintptr_t uArg3, uintptr_t uArg4));
+
+    /**
+     * Opens up the tracer.
+     *
+     * @returns VBox status code.
+     * @param   pThis           Pointer to the registration record.
+     * @param   pSession        The session doing the opening.
+     * @param   uCookie         A cookie (magic) unique to the tracer, so it can
+     *                          fend off incompatible clients.
+     * @param   uArg            Tracer specific argument.
+     * @param   puSessionData   Pointer to the session data variable.  This must be
+     *                          set to a non-zero value on success.
+     */
+    DECLR0CALLBACKMEMBER(int,   pfnOpenTracer, (PCSUPDRVTRACERREG pThis, PSUPDRVSESSION pSession, uint32_t uCookie, uintptr_t uArg,
+                                                uintptr_t *puSessionData));
+
+    /**
+     * I/O control style tracer communication method.
+     *
+     *
+     * @returns VBox status code.
+     * @param   pThis           Pointer to the registration record.
+     * @param   pSession        The session.
+     * @param   uSessionData    The session data value.
+     * @param   uCmd            The tracer specific command.
+     * @param   uArg            The tracer command specific argument.
+     * @param   piRetVal        The tracer specific return value.
+     */
+    DECLR0CALLBACKMEMBER(int,   pfnIoctl, (PCSUPDRVTRACERREG pThis, PSUPDRVSESSION pSession, uintptr_t uSessionData,
+                                           uintptr_t uCmd, uintptr_t uArg, int32_t *piRetVal));
+
+    /**
+     * Cleans up data the tracer has associated with a session.
+     *
+     * @param   pThis           Pointer to the registration record.
+     * @param   pSession        The session handle.
+     * @param   uSessionData    The data assoicated with the session.
+     */
+    DECLR0CALLBACKMEMBER(void,  pfnCloseTrace, (PCSUPDRVTRACERREG pThis, PSUPDRVSESSION pSession, uintptr_t uSessionData));
 
     /**

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -310 +310 @@
 #
 if1of ($(KBUILD_TARGET), darwin linux solaris)
- # Leopard (x86) and Snow Leopard (x86/amd64)
- SYSMODS += VBoxDrv
+ ifdef VBOX_WITH_VBOXDRV
+  SYSMODS += VBoxDrv
+ endif
  VBoxDrv_TEMPLATE         = VBOXR0DRV
  VBoxDrv_NAME.freebsd     = vboxdrv

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

@@ -875 +875 @@
 
 /**
+ * Called when a session is being cleaned up.
+ *
+ * @param   pDevExt             The device extension structure.
+ * @param   pSession            The session that is being torn down.
+ */
+void VBOXCALL supdrvTracerCleanupSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession)
+{
+    /*
+     * If ring-0 session, make sure it has deregistered VTG objects and the tracer.
+     */
+    if (pSession->R0Process == NIL_RTR0PROCESS)
+    {
+        SUPDRVTPPROVIDER *pNextProv;
+        SUPDRVTPPROVIDER *pProv;
+
+        RTSemFastMutexRequest(pDevExt->mtxTracer);
+        RTListForEachSafe(&pDevExt->TracerProviderList, pProv, pProvNext, SUPDRVTPPROVIDER, ListEntry)
+        {
+            if (pProv->pSession == pSession)
+            {
+                RTListNodeRemove(&pProv->ListEntry);
+                supdrvTracerDeregisterVtgObj(pDevExt, pProv);
+            }
+        }
+        RTSemFastMutexRelease(pDevExt->mtxTracer);
+
+        (void)SUPR0TracerDeregister(pSession);
+    }
+
+    /*
+     * Clean up instance data the trace may have associated with the session.
+     */
+    if (pSession->uTracerData)
+    {
+        RTSemFastMutexRequest(pDevExt->mtxTracer);
+        if (   pSession->uTracerData
+            && pDevExt->pTracerOps)
+            pSession->pTracerOps->pfnCloseTrace(pSession->pTracerOps, pSession, pSession->uTracerData);
+        pSession->uTracerData = 0;
+        RTSemFastMutexRelease(pDevExt->mtxTracer);
+    }
+}
+
+
+/**
  * Early module initialization hook.
  *
@@ -891 +936 @@
         /** @todo  */
         pDevExt->TracerHlp.uEndVersion = SUPDRVTRACERHLP_VERSION;
-
         RTListInit(&pDevExt->TracerProviderList);
         RTListInit(&pDevExt->TracerProviderZombieList);
+
         rc = supdrvTracerRegisterVtgObj(pDevExt, &g_VTGObjHeader, _1M, NULL /*pImage*/, NULL /*pSession*/, "vboxdrv");
         if (RT_SUCCESS(rc))

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

@@ -436 +436 @@
      * This is NIL_RTR0PROCESS for kernel sessions and valid for user ones. */
     RTR0PROCESS                     R0Process;
+#ifdef VBOX_WITH_SUPDRV_GENERIC_TRACER
+    /** Per session tracer specfic data. */
+    uintptr_t                       uTracerData;
+#endif
 #ifndef SUPDRV_AGNOSTIC
 # if defined(RT_OS_DARWIN)