Changeset 53524 in vbox for trunk/src/VBox

Timestamp:

Dec 12, 2014 3:09:27 PM (10 years ago)

Author:

vboxsync

Message:

crDebug,crInfo,crWarning: Let the logger and stream output functions format the messages when they need to and into their own static buffers, don't waste time/heap on formating anything unless it's going somewhere. Fixed missing crGetenv proto (windows).

File:

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

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

@@ -25 +25 @@
 #ifdef RT_OS_WINDOWS
 # include <windows.h>
+# include "cr_environment.h"
 #endif
 
@@ -32 +33 @@
 static void logMessageV(const char *pszPrefix, const char *pszFormat, va_list va)
 {
-    char *pszMessage;
-
-    RTStrAPrintfV(&pszMessage, pszFormat, va);
-    if (pszMessage != NULL)
-    {
-        LogRel(("%s%s\n", pszPrefix, pszMessage));
+    va_list vaCopy;
+    va_copy(vaCopy, va);
+    LogRel(("%s%N\n", pszPrefix, pszFormat, &vaCopy));
+    va_end(vaCopy);
+
 #ifdef IN_GUEST
-        RTStrmPrintf(g_pStdErr, "%s%s\n", pszPrefix, pszMessage);
-#endif
-        RTStrFree(pszMessage);
-    }
+    va_copy(vaCopy, va); /* paranoia */
+    RTStrmPrintf(g_pStdErr, "%s%N\n", pszPrefix, pszFormat, &vaCopy);
+    va_end(vaCopy);
+#endif
 }
 
@@ -54 +54 @@
 }
 
-static void logDebugV(const char *pszPrefix, const char *pszFormat, va_list va)
-{
-    char *pszMessage;
-
-    RTStrAPrintfV(&pszMessage, pszFormat, va);
-    if (pszMessage != NULL)
-    {
-#if defined(DEBUG_vgalitsy) || defined(DEBUG_galitsyn)
-        LogRel(("%s%s\n", pszPrefix, pszMessage));
-#else
-        Log(("%s%s\n", pszPrefix, pszMessage));
-#endif
-        RTStrFree(pszMessage);
-    }
-}
-
 DECLEXPORT(void) crError(const char *pszFormat, ... )
 {
     va_list va;
 #ifdef WINDOWS
-    DWORD err;
-#endif
-
-#ifdef WINDOWS
-    if ((err = GetLastError()) != 0 && crGetenv("CR_WINDOWS_ERRORS") != NULL )
-    {
-        char *pszWindowsMessage;
+    DWORD dwLastErr;
+#endif
+
+#ifdef WINDOWS
+    /* Log last error on windows. */
+    dwLastErr = GetLastError();
+    if (dwLastErr != 0 && crGetenv("CR_WINDOWS_ERRORS") != NULL)
+    {
+        LPTSTR pszWindowsMessage;
 
         SetLastError(0);
-        FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                FORMAT_MESSAGE_FROM_SYSTEM |
-                FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, err,
-                MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ),
-                (LPTSTR) &pszWindowsMessage, 0, NULL );
+        FormatMessageA(  FORMAT_MESSAGE_ALLOCATE_BUFFER
+                       | FORMAT_MESSAGE_FROM_SYSTEM
+                       | FORMAT_MESSAGE_MAX_WIDTH_MASK,
+                       NULL, dwLastErr,
+                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                       (LPTSTR)&pszWindowsMessage, 0, NULL);
         if (pszWindowsMessage)
         {
-            logMessage("OpenGL, Windows error: \n", "%s", pszWindowsMessage);
+            logMessage("OpenGL, Windows error: ", "%u\n%s", dwLastErr, pszWindowsMessage);
             LocalFree(pszWindowsMessage);
         }
         else
-            logMessage("OpenGL, Windows error: \n", "%ld", (long) err);
-    }
-#endif
+            logMessage("OpenGL, Windows error: ", "%u", dwLastErr);
+    }
+#endif
+
+    /* The message. */
     va_start(va, pszFormat);
     logMessageV("OpenGL Error: ", pszFormat, va);
     va_end(va);
+
+    /* Dump core or activate the debugger in debug builds. */
     AssertFailed();
+
 #ifdef IN_GUEST
     /* Give things a chance to close down. */
@@ -131 +123 @@
 
     va_start(va, pszFormat);
-    logDebugV("OpenGL Debug: ", pszFormat, va);
+#if defined(DEBUG_vgalitsy) || defined(DEBUG_galitsyn)
+    LogRel(("OpenGL Debug: %N\n", pszFormat, &va));
+#else
+    Log(("OpenGL Debug: %N\n", pszFormat, &va));
+#endif
     va_end(va);
 }