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

Timestamp:

Jul 7, 2011 1:25:03 PM (14 years ago)

Author:

vboxsync

Message:

Fix logging from R0

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -1060 +1060 @@
 RT_EXPORT_SYMBOL(RTLogSetCustomPrefixCallbackForR0);
 
+RTDECL(void) RTLogFlushR0(PRTLOGGER pLogger, PRTLOGGER pLoggerR0)
+{
+    /*
+     * Resolve defaults.
+     */
+    if (!pLogger)
+    {
+        pLogger = RTLogDefaultInstance();
+        if (!pLogger)
+        {
+            /* flushing to "/dev/null". */
+            if (pLoggerR0->offScratch)
+                    pLoggerR0->offScratch = 0;
+            return;
+        }
+    }
+
+    /*
+     * Any thing to flush?
+     */
+    if (    pLoggerR0->offScratch
+        ||  pLogger->offScratch)
+    {
+        /*
+         * Acquire logger semaphores.
+         */
+        int rc = rtlogLock(pLogger);
+        if (RT_FAILURE(rc))
+            return;
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Write whatever the GC instance contains to the HC one, and then
+             * flush the HC instance.
+             */
+            if (pLoggerR0->offScratch)
+            {
+                rtLogOutput(pLogger, pLoggerR0->achScratch, pLoggerR0->offScratch);
+                rtLogOutput(pLogger, NULL, 0);
+                pLoggerR0->offScratch = 0;
+            }
+        }
+        rtlogUnlock(pLogger);
+    }
+}
+RT_EXPORT_SYMBOL(RTLogFlushR0);
+
 # endif /* IN_RING3 */
 
@@ -1089 +1136 @@
                 {
                     pSrcLogger->offScratch = 0;
-                    rtlogLock(pSrcLogger);
+                    rtlogUnlock(pSrcLogger);
                 }
             }