Changeset 96448 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Aug 23, 2022 10:35:23 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153292

Message:

IPRT/nocrt: A few tricks to avoid dragging in log.cpp into static binaries, unless there is an explicit log creation or debug logging in the app (or IPRT for the latter). bugref:10261

File:

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

trunk/src/VBox/Runtime/common/misc/assert.cpp

@@ -186 +186 @@
 
 #else  /* !IN_RING0 */
-# if !defined(IN_RING3) && !defined(LOG_NO_COM)
-#  if 0 /* Enable this iff you have a COM port and really want this debug info. */
-        RTLogComPrintf("\n!!Assertion Failed!!\n"
-                       "Expression: %s\n"
-                       "Location  : %s(%d) %s\n",
-                       pszExpr, pszFile, uLine, pszFunction);
-#  endif
-# endif
-
-        PRTLOGGER pLog = RTLogRelGetDefaultInstance();
-        if (pLog)
-        {
-            RTLogRelPrintf("\n!!Assertion Failed!!\n"
-                           "Expression: %s\n"
-                           "Location  : %s(%d) %s\n",
-                           pszExpr, pszFile, uLine, pszFunction);
+
+
+# if defined(IN_RING3) && (defined(IN_RT_STATIC) || defined(IPRT_NO_CRT)) /* ugly */
+        if (g_pfnRTLogAssert)
+            g_pfnRTLogAssert(
+# else
+        RTLogAssert(
+# endif
+                             "\n!!Assertion Failed!!\n"
+                             "Expression: %s\n"
+                             "Location  : %s(%d) %s\n"
 # ifdef IPRT_WITH_ASSERT_STACK
-            RTLogRelPrintf("Stack     :\n%s\n", szStack);
-# endif
-# ifndef IN_RC /* flushing is done automatically in RC */
-            RTLogFlush(pLog);
-# endif
-        }
-
-# ifndef LOG_ENABLED
-        if (!pLog)
-# endif
-        {
-            pLog = RTLogDefaultInstance();
-            if (pLog)
-            {
-                RTLogPrintf("\n!!Assertion Failed!!\n"
-                            "Expression: %s\n"
-                            "Location  : %s(%d) %s\n",
-                            pszExpr, pszFile, uLine, pszFunction);
+                             "Stack     :\n%s\n"
+# endif
+                             , pszExpr, pszFile, uLine, pszFunction
 # ifdef IPRT_WITH_ASSERT_STACK
-                RTLogPrintf("Stack     :\n%s\n", szStack);
-# endif
-# ifndef IN_RC /* flushing is done automatically in RC */
-                RTLogFlush(pLog);
-# endif
-            }
-        }
+                             , szStack
+# endif
+                             );
 
 # ifdef IN_RING3
@@ -323 +299 @@
 
 #else  /* !IN_RING0 */
-# if !defined(IN_RING3) && !defined(LOG_NO_COM)
-#  if 0 /* Enable this iff you have a COM port and really want this debug info. */
-        va_copy(vaCopy, va);
-        RTLogComPrintfV(pszFormat, vaCopy);
-        va_end(vaCopy);
-#  endif
-# endif
-
-        PRTLOGGER pLog = RTLogRelGetDefaultInstance();
-        if (pLog)
+
+# if defined(IN_RING3) && (defined(IN_RT_STATIC) || defined(IPRT_NO_CRT))
+        if (g_pfnRTLogAssert)
+# endif
         {
             va_copy(vaCopy, va);
-            RTLogRelPrintfV(pszFormat, vaCopy);
+# if defined(IN_RING3) && (defined(IN_RT_STATIC) || defined(IPRT_NO_CRT))
+            g_pfnRTLogAssertV(pszFormat, vaCopy);
+# else
+            RTLogAssertV(pszFormat, vaCopy);
+# endif
             va_end(vaCopy);
-# ifndef IN_RC /* flushing is done automatically in RC */
-            RTLogFlush(pLog);
-# endif
-        }
-
-        pLog = RTLogDefaultInstance();
-        if (pLog)
-        {
-            va_copy(vaCopy, va);
-            RTLogPrintfV(pszFormat, vaCopy);
-            va_end(vaCopy);
-# ifndef IN_RC /* flushing is done automatically in RC */
-            RTLogFlush(pLog);
-#endif
         }