Changeset 64

Timestamp:

Jan 15, 2016, 12:16:56 AM (9 years ago)

Author:

dmik

Message:

Runtime: Implement RTLogWriteDebugger on OS/2.

This commit also makes use of KernPrintf instead of the small internal buffer of VBoxDrv.sys
when it is available.

Author: @valerius.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/os2/SUPDrv-os2.cpp (modified) (5 diffs)
• Runtime/Makefile.kmk (modified) (2 diffs)
• Runtime/r0drv/os2/RTLogWriteDebugger-r0drv-os2.c (added)
• Runtime/r0drv/os2/os2imports.imp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp ¶

@@ -75 +75 @@
 extern uint16_t             g_cchInitText;
 extern uint16_t             g_cchInitTextMax;
+/* Defined in RTLogWriteDebugger-r0drv-os2.cpp */
+extern int                  (*g_pfnR0Printf)(const char *pszFormat, ...);
+/* KEE */
+extern uint32_t             KernKEEVersion;
 RT_C_DECLS_END
 
@@ -99 +103 @@
     {
         Log(("VBoxDrvInit: pszArgs=%s\n", pszArgs));
+
+        /*
+         * Initialize the pointer to our logging function.
+         */
+        if (!g_pfnR0Printf)
+            g_pfnR0Printf = SUPR0Printf;
 
         /*
@@ -503 +513 @@
 }
 
+/**
+ * Callback for writing to the log buffer via KernPrinf.
+ *
+ * @returns number of bytes written.
+ * @param   pvArg       Unused.
+ * @param   pachChars   Pointer to an array of utf-8 characters.
+ * @param   cbChars     Number of bytes in the character array pointed to by pachChars.
+ */
+static DECLCALLBACK(size_t) VBoxDrvLogOutput2(void *pvArg, const char *pachChars, size_t cbChars)
+{
+    /* RTLogWriteDebugger will write using KernPrintf when it's available */
+    RTLogWriteDebugger(pachChars, cbChars);
+    return cbChars;
+}
 
 SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...)
 {
+    PFNRTSTROUTPUT pfnLogFunc = VBoxDrvLogOutput;
     va_list va;
 
@@ -513 +538 @@
     va_end(va);
 #endif
+    /*
+     * NOTE: Only use RTLogWriteDebugger when KernPrintf is available as otherwise it
+     * will call SUPR0Printf back creating an infinite recursion. We prefer KernPrinf
+     * as it provides a much bigger buffer (7 MB) instead of VBoxDrv's own 16 KB.
+     */
+    if ((uint32_t)&KernKEEVersion > 0x00010002)
+        pfnLogFunc = VBoxDrvLogOutput2;
 
     va_start(va, pszFormat);
-    int cch = RTLogFormatV(VBoxDrvLogOutput, NULL, pszFormat, va);
+    int cch = RTLogFormatV(pfnLogFunc, NULL, pszFormat, va);
     va_end(va);
 
@@ -526 +558 @@
     return 0;
 }
-

trunk/src/VBox/Runtime/Makefile.kmk ¶

@@ -2190 +2190 @@
         common/misc/thread.cpp \
         generic/RTAssertShouldPanic-generic.cpp \
-        generic/RTLogWriteDebugger-generic.cpp \
         generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/RTMpCpuId-generic.cpp \
@@ -2223 +2222 @@
         r0drv/os2/os2imports.imp \
         r0drv/os2/process-r0drv-os2.cpp \
+        r0drv/os2/RTLogWriteDebugger-r0drv-os2.c \
         r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm \
         r0drv/os2/RTR0Os2DHQueryDOSVar.asm \

trunk/src/VBox/Runtime/r0drv/os2/os2imports.imp ¶

@@ -16 +16 @@
 ; KEE
 ;
+KernPrintf              KEE       3 ?
 KernAllocSpinLock       KEE       10 ?
 KernFreeSpinLock        KEE       11 ?