Changeset 41374 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

May 21, 2012 6:04:03 PM (13 years ago)

Author:

vboxsync

Message:

wddm/3d/crogl: backdoor logging

File:

• trunk/src/VBox/GuestHost/OpenGL/util/error.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/error.c

@@ -27 +27 @@
 #include <VBox/log.h>
 #endif
+
+#if defined(WINDOWS)
+# define CR_DEBUG_TO_CONSOLE_ENABLE
+#endif
+
+#if defined(WINDOWS) && defined(IN_GUEST)
+# ifndef CR_DEBUG_TO_BACKDOOR_ENABLE
+#  error "CR_DEBUG_TO_BACKDOOR_ENABLE is expected!"
+# endif
+#else
+# ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
+#  error "CR_DEBUG_TO_BACKDOOR_ENABLE is NOT expected!"
+# endif
+#endif
+
+
+#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
+# include <VBoxDispMpLogger.h>
+# include <iprt/err.h>
+#endif
+
 
 static char my_hostname[256];
@@ -291 +312 @@
     static int first_time = 1;
     static int silent = 0;
+#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
+    static int logBackdoor = 0;
+#endif
 
     if (first_time)
     {
         const char *fname = crGetenv( "CR_DEBUG_FILE" );
-        char str[1024];
-
-#if defined(Linux) && defined(IN_GUEST) && defined(DEBUG_leo)
-        if (!fname)
+        const char *fnamePrefix = crGetenv( "CR_DEBUG_FILE_PREFIX" );
+        char str[2048];
+#ifdef CR_DEBUG_TO_CONSOLE_ENABLE
+        int logToConsole = 0;
+#endif
+#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
+        if (crGetenv( "CR_DEBUG_TO_BACKDOOR" ))
+        {
+            int rc = VBoxDispMpLoggerInit();
+            if (RT_SUCCESS(rc))
+                logBackdoor = 1;
+        }
+#endif
+
+        if (!fname && fnamePrefix)
         {
             char pname[1024];
-            crGetProcName(pname, 1024);
-            sprintf(str, "/home/leo/crlog_%s.txt", pname);
-            fname = &str[0];
-        }
-#endif
+            if (strlen(fnamePrefix) < sizeof (str) - sizeof (pname) - 20)
+            {
+                crGetProcName(pname, 1024);
+                sprintf(str, "%s_%s_%d.txt", fnamePrefix, pname,
+#ifdef RT_OS_WINDOWS
+                        GetCurrentProcessId()
+#else
+                        crGetPID()
+#endif
+                        );
+                fname = &str[0];
+            }
+        }
 
         first_time = 0;
         if (fname)
         {
-            char debugFile[1000], *p;
+            char debugFile[2048], *p;
             crStrcpy(debugFile, fname);
             p = crStrstr(debugFile, "%p");
@@ -327 +370 @@
         else
         {
-#if defined(WINDOWS) && defined(IN_GUEST) && (defined(DEBUG_leo) || defined(DEBUG_ll158262) || defined(DEBUG_misha))
-            crRedirectIOToConsole();
+#ifdef CR_DEBUG_TO_CONSOLE_ENABLE
+            if (crGetenv( "CR_DEBUG_TO_CONSOLE" ))
+            {
+                crRedirectIOToConsole();
+                logToConsole = 1;
+            }
 #endif
             output = stderr;
         }
+
 #if !defined(DEBUG)/* || defined(DEBUG_misha)*/
         /* Release mode: only emit crDebug messages if CR_DEBUG
          * or CR_DEBUG_FILE is set.
          */
-        if (!fname && !crGetenv("CR_DEBUG"))
+        if (!fname && !crGetenv("CR_DEBUG")
+#ifdef CR_DEBUG_TO_CONSOLE_ENABLE
+                    && !logToConsole
+#endif
+#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
+                    && !logBackdoor
+#endif
+                )
             silent = 1;
 #endif
@@ -380 +435 @@
     else
     {
-        offset = sprintf( txt, "[0x%x] OpenGL Debug: ", crThreadID());
-    }
-#else
-    offset = sprintf( txt, "[0x%lx] OpenGL Debug: ", crThreadID());
+        offset = sprintf( txt, "[0x%x.0x%x] OpenGL Debug: ", GetCurrentProcessId(), crThreadID());
+    }
+#else
+    offset = sprintf( txt, "[0x%lx.0x%lx] OpenGL Debug: ", crGetPID(), crThreadID());
 #endif
     va_start( args, format );
     vsprintf( txt + offset, format, args );
+#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
+    if (logBackdoor)
+    {
+        VBoxDispMpLoggerLog(txt);
+    }
+#endif
 #if defined(IN_GUEST)
     outputChromiumMessage( output, txt );
 #else
-# if defined(DEBUG) && (defined(DEBUG_leo) || defined(DEBUG_ll158262))
-    outputChromiumMessage( output, txt );
+    if (!output
+# ifndef DEBUG_misha
+            || output==stderr
 # endif
-#ifndef DEBUG_misha
-    if (output==stderr)
-#endif
+            )
     {
         LogRel(("%s\n", txt));
     }
-#ifndef DEBUG_misha
     else
-#endif
-    {
+    {
+# ifndef DEBUG_misha
+        LogRel(("%s\n", txt));
+# endif
         outputChromiumMessage(output, txt);
     }