Changeset 104976 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 20, 2024 10:17:44 AM (7 months ago)

Author:

vboxsync

Message:

Devices/Trace: Support streaming the tracelog over the network, bugref:10701

Location:

trunk/src/VBox/Devices/Trace

Files:

• DrvIfsTrace.cpp (modified) (2 diffs)
• DrvIfsTraceInternal.h (modified) (1 diff)

trunk/src/VBox/Devices/Trace/DrvIfsTrace.cpp

@@ -92 +92 @@
         pThis->hTraceLog = NIL_RTTRACELOGWR;
     }
-
-    if (pThis->pszTraceFilePath)
-    {
-        PDMDrvHlpMMHeapFree(pDrvIns, pThis->pszTraceFilePath);
-        pThis->pszTraceFilePath = NULL;
-    }
 }
 
@@ -126 +120 @@
      * Validate and read config.
      */
-    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "TraceFilePath|", "");
-
-    int rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "TraceFilePath", &pThis->pszTraceFilePath);
-    AssertLogRelRCReturn(rc, rc);
-
-    /* Try to create a file based trace log. */
-    rc = RTTraceLogWrCreateFile(&pThis->hTraceLog, RTBldCfgVersion(), pThis->pszTraceFilePath);
-    AssertLogRelRCReturn(rc, rc);
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "TraceFilePath|TraceLocation", "");
+
+    char *pszLocation = NULL;
+    int rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "TraceFilePath", &pszLocation);
+    if (RT_SUCCESS(rc))
+    {
+        /* Try to create a file based trace log. */
+        rc = RTTraceLogWrCreateFile(&pThis->hTraceLog, RTBldCfgVersion(), pszLocation);
+        PDMDrvHlpMMHeapFree(pDrvIns, pszLocation);
+
+        AssertLogRelRCReturn(rc, rc);
+    }
+    else if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+    {
+        /* Try to connect to an external server. */
+        rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "TraceLocation", &pszLocation);
+        if (RT_FAILURE(rc))
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                       N_("Configuration error: querying \"TraceLocation\" resulted in %Rrc"), rc);
+
+        char *pszPort = strchr(pszLocation, ':');
+        if (!pszPort)
+            return PDMDrvHlpVMSetError(pDrvIns, VERR_NOT_FOUND, RT_SRC_POS,
+                                       N_("IfTrace#%d: The location misses the port to connect to"),
+                                       pDrvIns->iInstance);
+
+        *pszPort = '\0'; /* Overwrite temporarily to avoid copying the hostname into a temporary buffer. */
+        uint32_t uPort = 0;
+        rc = RTStrToUInt32Ex(pszPort + 1, NULL, 10, &uPort);
+        if (RT_FAILURE(rc))
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                       N_("IfTrace#%d: The port part of the location is not a numerical value"),
+                                       pDrvIns->iInstance);
+
+        rc = RTTraceLogWrCreateTcpClient(&pThis->hTraceLog, RTBldCfgVersion(), pszLocation, uPort);
+        *pszPort = ':'; /* Restore delimiter before checking the status. */
+        if (RT_FAILURE(rc))
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                       N_("IfTrace#%d: Failed to connect to socket %s"),
+                                       pDrvIns->iInstance, pszLocation);
+
+        PDMDrvHlpMMHeapFree(pDrvIns, pszLocation);
+    }
+
 
     /*

trunk/src/VBox/Devices/Trace/DrvIfsTraceInternal.h

@@ -69 +69 @@
     /** The trace log writer handle. */
     RTTRACELOGWR         hTraceLog;
-    /** Path of the trace log file. */
-    char                 *pszTraceFilePath;
 
 } DRVIFTRACE;