Changeset 14500 in vbox for trunk/src/VBox

Timestamp:

Nov 24, 2008 2:22:08 AM (16 years ago)

Author:

vboxsync

Message:

IPRT/SUPDrv/VMM: Made RTR0AssertPanicSystem available to VMMR0.r0 on darwin & solaris (only platforms implemting it currently). Created RTAssertMsg1, RTAssertMsg2 and RTAssertMsg2V (darwin only atm) in addition to AssertMsg1/2 and delcared the latter two as weak and overridable by users, while the former are strong and exposed by SUPDrv. This way we can get the full assertion text in the 'Problem Report for Mac OS X Kernel' thing. Will propagte the changes to the other platforms and rings later.

Location:

trunk/src/VBox

Files:

• Runtime/Makefile.kmk (modified) (3 diffs)
• Runtime/common/misc/RTAssertMsg1Weak.cpp (added)
• Runtime/common/misc/RTAssertMsg2.cpp (added)
• Runtime/common/misc/RTAssertMsg2Weak.cpp (added)
• Runtime/r0drv/darwin/assert-r0drv-darwin.cpp (modified) (2 diffs)
• VMM/VMMR0/VMMR0.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -879 +879 @@
         common/misc/sanity-c.c \
         common/misc/sanity-cpp.cpp \
+        common/misc/RTAssertMsg2.cpp \
         common/string/strformat.cpp \
         common/string/strformatrt.cpp \
@@ -960 +961 @@
 RuntimeR0Drv_SOURCES    = \
         common/alloc/alloc.cpp \
+        common/misc/RTAssertMsg2.cpp \
         common/checksum/crc32.cpp \
         common/checksum/crc64.cpp \
@@ -1072 +1074 @@
 RuntimeR0Drv_SOURCES.darwin = \
         common/err/RTErrConvertFromErrno.cpp \
+        common/misc/RTAssertMsg1Weak.cpp \
+        common/misc/RTAssertMsg2Weak.cpp \
         common/misc/thread.cpp \
         common/string/memchr.asm \

trunk/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp

@@ -59 +59 @@
 
 
-RTDECL(void) AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
+RTDECL(void) RTAssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
 {
 #ifdef IN_GUEST_R0
@@ -85 +85 @@
 
 
-RTDECL(void) AssertMsg2(const char *pszFormat, ...)
+RTDECL(void) RTAssertMsg2V(const char *pszFormat, va_list va)
 {
-    va_list va;
+    va_list vaCopy;
     char    szMsg[256];
 
 #ifdef IN_GUEST_R0
-    va_start(va, pszFormat);
-    RTLogBackdoorPrintfV(pszFormat, va);
-    va_end(va);
+    va_copy(vaCopy, va);
+    RTLogBackdoorPrintfV(pszFormat, vaCopy);
+    va_end(vaCopy);
 #endif
 
-    va_start(va, pszFormat);
-    RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, va);
+    va_copy(vaCopy, va);
+    RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, vaCopy);
     szMsg[sizeof(szMsg) - 1] = '\0';
-    va_end(va);
+    va_end(vaCopy);
     printf("%s", szMsg);
 
-    va_start(va, pszFormat);
-    RTStrPrintfV(g_szRTAssertMsg2, sizeof(g_szRTAssertMsg2), pszFormat, va);
-    va_end(va);
+    va_copy(vaCopy, va);
+    RTStrPrintfV(g_szRTAssertMsg2, sizeof(g_szRTAssertMsg2), pszFormat, vaCopy);
+    va_end(vaCopy);
 }
 

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -1178 +1178 @@
 DECLEXPORT(void) RTCALL AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
 {
-#ifndef DEBUG_sandervl
+#if !defined(DEBUG_sandervl) && !defined(RT_OS_DARWIN)
     SUPR0Printf("\n!!R0-Assertion Failed!!\n"
                 "Expression: %s\n"
@@ -1196 +1196 @@
                     "Location  : %s(%d) %s\n",
                     pszExpr, pszFile, uLine, pszFunction);
+#ifdef RT_OS_DARWIN
+    RTAssertMsg1(pszExpr, uLine, pszFile, pszFunction);
+#endif
 }
 
@@ -1207 +1210 @@
     for (size_t i = 0; i < cbChars; i++)
     {
-#ifndef DEBUG_sandervl
+#if !defined(DEBUG_sandervl) && !defined(RT_OS_DARWIN)
         SUPR0Printf("%c", pachChars[i]);
 #endif
@@ -1219 +1222 @@
 DECLEXPORT(void) RTCALL AssertMsg2(const char *pszFormat, ...)
 {
+    va_list va;
+
     PRTLOGGER pLog = RTLogDefaultInstance(); /** @todo we want this for release as well! */
     if (pLog)
     {
-        va_list va;
         va_start(va, pszFormat);
         RTLogFormatV(rtLogOutput, pLog, pszFormat, va);
@@ -1235 +1239 @@
         }
     }
-}
-
+
+#ifdef RT_OS_DARWIN
+    va_start(va, pszFormat);
+    RTAssertMsg2V(pszFormat, va);
+    va_end(va);
+#endif
+}
+