Changeset 39650 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 16, 2011 11:27:51 PM (13 years ago)

Author:

vboxsync

Message:

DBGF,Main,VBoxManage: added target logger prefixes (release:/debug:). Implemented logger modifier methods in IMachineDebugger. Exposed these methods in VBoxManage debugvm.

File:

• trunk/src/VBox/VMM/VMMR3/DBGFLog.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFLog.cpp

@@ -26 +26 @@
 #include <VBox/err.h>
 #include <iprt/assert.h>
+#include <iprt/string.h>
 
 
@@ -37 +38 @@
 
 /**
+ * Checkes for logger prefixes and selects the right logger.
+ *
+ * @returns Target logger.
+ * @param   ppsz                Pointer to the string pointer.
+ */
+static PRTLOGGER dbgfR3LogResolvedLogger(const char **ppsz)
+{
+    PRTLOGGER   pLogger;
+    const char *psz = *ppsz;
+    if (!strncmp(psz, "release:", sizeof("release:") - 1))
+    {
+        *ppsz += sizeof("release:") - 1;
+        pLogger = RTLogRelDefaultInstance();
+    }
+    else
+    {
+        if (!strncmp(psz, "debug:", sizeof("debug:") - 1))
+            *ppsz += sizeof("debug:") - 1;
+        pLogger = RTLogDefaultInstance();
+    }
+    return pLogger;
+}
+
+
+/**
  * Changes the logger group settings.
  *
@@ -42 +68 @@
  * @param   pVM                 The VM handle.
  * @param   pszGroupSettings    The group settings string. (VBOX_LOG)
+ *                              By prefixing the string with \"release:\" the
+ *                              changes will be applied to the release log
+ *                              instead of the debug log.  The prefix \"debug:\"
+ *                              is also recognized.
  */
 VMMR3DECL(int) DBGFR3LogModifyGroups(PVM pVM, const char *pszGroupSettings)
@@ -61 +91 @@
 static DECLCALLBACK(int) dbgfR3LogModifyGroups(PVM pVM, const char *pszGroupSettings)
 {
-    int rc = RTLogGroupSettings(NULL, pszGroupSettings);
+    PRTLOGGER pLogger = dbgfR3LogResolvedLogger(&pszGroupSettings);
+    if (!pLogger)
+        return VINF_SUCCESS;
+
+    int rc = RTLogGroupSettings(pLogger, pszGroupSettings);
     if (RT_SUCCESS(rc))
         rc = VMMR3UpdateLoggers(pVM);
@@ -74 +108 @@
  * @param   pVM                 The VM handle.
  * @param   pszFlagSettings     The group settings string. (VBOX_LOG_FLAGS)
+ *                              By prefixing the string with \"release:\" the
+ *                              changes will be applied to the release log
+ *                              instead of the debug log.  The prefix \"debug:\"
+ *                              is also recognized.
  */
 VMMR3DECL(int) DBGFR3LogModifyFlags(PVM pVM, const char *pszFlagSettings)
@@ -93 +131 @@
 static DECLCALLBACK(int) dbgfR3LogModifyFlags(PVM pVM, const char *pszFlagSettings)
 {
-    int rc = RTLogFlags(NULL, pszFlagSettings);
+    PRTLOGGER pLogger = dbgfR3LogResolvedLogger(&pszFlagSettings);
+    if (!pLogger)
+        return VINF_SUCCESS;
+
+    int rc = RTLogFlags(pLogger, pszFlagSettings);
     if (RT_SUCCESS(rc))
         rc = VMMR3UpdateLoggers(pVM);
@@ -106 +148 @@
  * @param   pVM                 The VM handle.
  * @param   pszDestSettings     The destination settings string. (VBOX_LOG_DEST)
+ *                              By prefixing the string with \"release:\" the
+ *                              changes will be applied to the release log
+ *                              instead of the debug log.  The prefix \"debug:\"
+ *                              is also recognized.
  */
 VMMR3DECL(int) DBGFR3LogModifyDestinations(PVM pVM, const char *pszDestSettings)
@@ -125 +171 @@
 static DECLCALLBACK(int) dbgfR3LogModifyDestinations(PVM pVM, const char *pszDestSettings)
 {
+    PRTLOGGER pLogger = dbgfR3LogResolvedLogger(&pszDestSettings);
+    if (!pLogger)
+        return VINF_SUCCESS;
+
     int rc = RTLogDestinations(NULL, pszDestSettings);
     if (RT_SUCCESS(rc))