Changeset 6407 in vbox

Timestamp:

Jan 21, 2008 1:08:07 PM (17 years ago)

Author:

vboxsync

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

27365

Message:

Default to RTLOGDEST_USER instead of RTLOGDEST_FILE when LOG_TO_BACKDOOR is specified. Also skip the headers log header.

File:

• trunk/src/VBox/Runtime/VBox/log-vbox.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -185 +185 @@
         return g_pLogger;
 
-    /* If we are doing backdoor logging then we do not want to
-       create an additional log file inside the guest. */
-#ifdef LOG_TO_BACKDOOR
-    return g_pLogger = NULL;
-#endif
 #ifdef IN_RING3
     /*
@@ -289 +284 @@
     PRTLOGGER pLogger;
 #ifdef IN_RING3
+# ifndef LOG_TO_BACKDOOR
     char szExecName[RTPATH_MAX];
     if (!RTProcGetExecutableName(szExecName, sizeof(szExecName)))
@@ -295 +291 @@
     RTTIME Time;
     RTTimeExplode(&Time, RTTimeNow(&TimeSpec));
-    int rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", ELEMENTS(g_apszGroups), &g_apszGroups[0], RTLOGDEST_FILE,
+    int rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0], RTLOGDEST_FILE,
                          "./%04d-%02d-%02d-%02d-%02d-%02d.%03d-%s-%d.log",
                          Time.i32Year, Time.u8Month, Time.u8MonthDay, Time.u8Hour, Time.u8Minute, Time.u8Second, Time.u32Nanosecond / 10000000,
@@ -310 +306 @@
 
         /* executable and arguments - tricky and all platform specific. */
-# if defined(RT_OS_WINDOWS)
+#  if defined(RT_OS_WINDOWS)
         RTLogLoggerEx(pLogger, 0, ~0U, "Commandline: %ls\n", GetCommandLineW());
 
-# elif defined(RT_OS_SOLARIS)
+#  elif defined(RT_OS_SOLARIS)
         psinfo_t psi;
         char szArgFileBuf[80];
@@ -322 +318 @@
             if (fread(&psi, sizeof(psi), 1, pFile) == 1)
             {
-#  if 0     /* 100% safe:*/
+#   if 0     /* 100% safe:*/
                 RTLogLoggerEx(pLogger, 0, ~0U, "Args: %s\n", psi.pr_psargs);
-#  else     /* probably safe: */
+#   else     /* probably safe: */
                 const char * const *argv = (const char * const *)psi.pr_argv;
                 for (int iArg = 0; iArg < psi.pr_argc; iArg++)
                     RTLogLoggerEx(pLogger, 0, ~0U, "Arg[%d]: %s\n", iArg, argv[iArg]);
-#  endif
+#   endif
 
             }
@@ -334 +330 @@
         }
 
-# elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
-#  ifdef RT_OS_LINUX
+#  elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
+#   ifdef RT_OS_LINUX
         FILE *pFile = fopen("/proc/self/cmdline", "r");
-#  else /* RT_OS_FREEBSD: */
+#   else /* RT_OS_FREEBSD: */
         FILE *pFile = fopen("/proc/curproc/cmdline", "r");
-#  endif
+#   endif
         if (pFile)
         {
@@ -366 +362 @@
         }
 
-# elif defined(RT_OS_L4) || defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
+#  elif defined(RT_OS_L4) || defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
         /* commandline? */
+#  else
+#   error needs porting.
+#  endif
+    }
+
+# else  /* LOG_TO_BACKDOOR */
+    /* The user destination is backdoor logging. */
+    int rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG",
+                         RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
+                         RTLOGDEST_USER, "VBox.log");
+# endif /* LOG_TO_BACKDOOR */
+
+#else /* IN_RING0 */
+    int rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
+# ifdef LOG_TO_BACKDOOR
+                         RTLOGDEST_USER,
 # else
-#  error needs porting.
-#endif
-    }
-
-
-#else /* IN_RING0 */
-    int rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", ELEMENTS(g_apszGroups), &g_apszGroups[0],
-                         RTLOGDEST_FILE, "VBox-ring0.log");
+                         RTLOGDEST_FILE,
+# endif
+                         "VBox-ring0.log");
     if (RT_SUCCESS(rc))
     {