Changeset 10608 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 14, 2008 4:21:07 PM (17 years ago)

Author:

vboxsync

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

33307

Message:

Made the STDOUT destination for the ring-0 logger on Darwin printf to the kernel log (dmesg).

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (7 diffs)
• VBox/log-vbox.cpp (modified) (2 diffs)
• r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp (copied) (copied from trunk/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp ) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -910 +910 @@
         common/table/avlpv.cpp \
         generic/RTLogWriteStdErr-stub-generic.cpp \
-        generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/RTLogWriteUser-generic.cpp \
         generic/uuid-generic.cpp \
@@ -923 +922 @@
         common/err/RTErrConvertToErrno.cpp \
         generic/RTAssertDoBreakpoint-generic.cpp \
+        generic/RTLogWriteStdOut-stub-generic.cpp \
         r0drv/linux/alloc-r0drv-linux.c \
         r0drv/linux/initterm-r0drv-linux.c \
@@ -952 +952 @@
         common/string/strpbrk.cpp \
         generic/RTAssertDoBreakpoint-generic.cpp \
+        generic/RTLogWriteStdOut-stub-generic.cpp \
         nt/RTErrConvertFromNtStatus.cpp \
         r0drv/memobj-r0drv.cpp \
@@ -1005 +1006 @@
         r0drv/darwin/process-r0drv-darwin.cpp \
         r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp \
+        r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp \
         r0drv/darwin/semaphore-r0drv-darwin.cpp \
         r0drv/darwin/spinlock-r0drv-darwin.cpp \
@@ -1029 +1031 @@
         common/misc/thread.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
+        generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/RTMpCpuId-generic.cpp \
         generic/RTMpCpuIdFromSetIndex-generic.cpp \
@@ -1076 +1079 @@
         generic/RTAssertDoBreakpoint-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
+        generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/RTMpCpuId-generic.cpp \
         generic/RTMpCpuIdFromSetIndex-generic.cpp \
@@ -1109 +1113 @@
         common/string/memchr.asm \
         generic/RTAssertDoBreakpoint-generic.cpp \
+        generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         r0drv/memobj-r0drv.cpp \

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

@@ -393 +393 @@
         /*
          * This is where you set your ring-0 logging preferences.
+         *
+         * On platforms which don't differ between debugger and kernel
+         * log printing, STDOUT is gonna be a stub and the DEBUGGER
+         * destination is the one doing all the work. On platforms
+         * that do differ (like Darwin), STDOUT is the kernel log.
          */
-# if 0//defined(DEBUG_bird) && !defined(IN_GUEST)
+# if 0 /*defined(DEBUG_bird) && !defined(IN_GUEST)*/
         RTLogGroupSettings(pLogger, "all=~0 -default.l6.l5.l4.l3");
         RTLogFlags(pLogger, "enabled unbuffered pid tid");
-        pLogger->fDestFlags |= RTLOGDEST_DEBUGGER;
+        pLogger->fDestFlags |= RTLOGDEST_DEBUGGER | RTLOGDEST_STDOUT;
 # endif
 # if defined(DEBUG_sandervl) && !defined(IN_GUEST)
@@ -412 +417 @@
         RTLogGroupSettings(pLogger, "all=~0 -default.l6.l5.l4.l3");
         RTLogFlags(pLogger, "enabled unbuffered tid");
-        pLogger->fDestFlags |= RTLOGDEST_DEBUGGER;
+        pLogger->fDestFlags |= RTLOGDEST_DEBUGGER | RTLOGDEST_STDOUT;
 # endif
     }

trunk/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Log To Debugger, Ring-0 Driver, Darwin.
+ * IPRT - Log To StdOut, Ring-0 Driver, Darwin.
  */
 
@@ -38 +38 @@
 
 
-RTDECL(void) RTLogWriteDebugger(const char *pch, size_t cb)
+RTDECL(void) RTLogWriteStdOut(const char *pch, size_t cb)
 {
-    kprintf("%.*s", cb, pch);
+    printf("%.*s", cb, pch);
     return;
 }