Changeset 39868 in vbox for trunk/src/VBox

Timestamp:

Jan 25, 2012 6:58:43 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: don't do GetHostName on Windows guests in crDebug to avoid possible deadlocks

File:

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

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

@@ -42 +42 @@
 {
     char *temp;
+    /* on windows guests we're typically get called in a context of VBoxOGL!DllMain ( which calls VBoxOGLcrutil!crNetInit ),
+     * which may lead to deadlocks..
+     * Avoid it as it is needed for debugging purposes only */
+#if !defined(IN_GUEST) || !defined(RT_OS_WINDOWS)
     if ( crGetHostname( my_hostname, sizeof( my_hostname ) ) )
+#endif
     {
         crStrcpy( my_hostname, "????" );
@@ -100 +105 @@
     fflush( output );
 
-#if defined(DEBUG) && defined(WINDOWS) && !defined(DEBUG_misha)
+#if defined(DEBUG) && defined(WINDOWS) /* && (!defined(DEBUG_misha) || !defined(IN_GUEST) ) */
     OutputDebugString(str);
     OutputDebugString("\n");
@@ -197 +202 @@
 #ifdef WINDOWS
     }
-#if !defined(DEBUG_leo) && !defined(DEBUG_ll158262) && !(defined(DEBUG_misha) && defined(IN_GUEST))
+#if !defined(DEBUG_leo) && !defined(DEBUG_ll158262) && !defined(DEBUG_misha)
     if (crGetenv( "CR_DEBUG_ON_ERROR" ) != NULL)
 #endif
@@ -241 +246 @@
         va_end( args );
 
-#if defined(WINDOWS) && defined(DEBUG) && !defined(IN_GUEST) && !defined(DEBUG_misha)
+#if defined(WINDOWS) && defined(DEBUG) && !defined(IN_GUEST)
         DebugBreak();
 #endif
@@ -322 +327 @@
             output = stderr;
         }
-#if !defined(DEBUG) || defined(DEBUG_misha)
+#if !defined(DEBUG)/* || defined(DEBUG_misha)*/
         /* Release mode: only emit crDebug messages if CR_DEBUG
          * or CR_DEBUG_FILE is set.
@@ -383 +388 @@
     outputChromiumMessage( output, txt );
 # endif
+#ifndef DEBUG_misha
     if (output==stderr)
+#endif
     {
         LogRel(("%s\n", txt));
     }
+#ifndef DEBUG_misha
     else
+#endif
     {
         outputChromiumMessage(output, txt);