Navigation

← Previous Changeset
Next Changeset →

Changeset 14500

Timestamp:

11/24/08 03:22:08 (2 months 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 AssertMsg?1/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.

Files:

trunk/include/iprt/assert.h (modified) (4 diffs)
trunk/src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
trunk/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp (added)
trunk/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp (added)
trunk/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp (added)
trunk/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp (modified) (2 diffs)
trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/include/iprt/assert.h

r13931	r14500
33	33	#include <iprt/cdefs.h>
34	34	#include <iprt/types.h>
	35	#include <iprt/stdarg.h>
35	36
36	37	/** @defgroup grp_rt_assert Assert - Assertions
…	…
86	87	* @param pszFile Location file name.
87	88	* @param pszFunction Location function name.
88		* @remark This API exists in HC Ring-3 and GC.
	89	*/
	90	RTDECL(void) RTAssertMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction);
	91	/**
	92	* Weak version of RTAssertMsg1
	93	*
	94	* @copydoc RTAssertMsg1
	95	* @todo rename to AssertMsg1Weak
89	96	*/
90	97	RTDECL(void) AssertMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction);
…	…
92	99	/**
93	100	* The 2nd (optional) part of an assert message.
	101	*
	102	* @param pszFormat Printf like format string.
	103	* @param va Arguments to that string.
	104	*/
	105	RTDECL(void) RTAssertMsg2V(const char *pszFormat, va_list va);
	106
	107	/**
	108	* The 2nd (optional) part of an assert message.
	109	*
94	110	* @param pszFormat Printf like format string.
95	111	* @param ... Arguments to that string.
96		* @remark This API exists in HC Ring-3 and GC.
	112	*/
	113	RTDECL(void) RTAssertMsg2(const char *pszFormat, ...);
	114	/** Weak version of RTAssertMsg2
	115	* @copydoc RTAssertMsg2
	116	* @todo rename to AssertMsg2Weak
97	117	*/
98	118	RTDECL(void) AssertMsg2(const char *pszFormat, ...);
…	…
294	314	* @remarks This macro does not depend on RT_STRICT.
295	315	*/
296		#if ~~(defined(IN_RING0) && !defined(IN_RING0_AGNOSTIC)~~) \
	316	#if defined(IN_RING0) \
297	317	&& (defined(RT_OS_DARWIN) \|\| defined(RT_OS_SOLARIS))
298	318	# define RTAssertDoPanic() RTR0AssertPanicSystem()

trunk/src/VBox/Runtime/Makefile.kmk

r14468	r14500
879	879	common/misc/sanity-c.c \
880	880	common/misc/sanity-cpp.cpp \
	881	common/misc/RTAssertMsg2.cpp \
881	882	common/string/strformat.cpp \
882	883	common/string/strformatrt.cpp \
…	…
960	961	RuntimeR0Drv_SOURCES = \
961	962	common/alloc/alloc.cpp \
	963	common/misc/RTAssertMsg2.cpp \
962	964	common/checksum/crc32.cpp \
963	965	common/checksum/crc64.cpp \
…	…
1072	1074	RuntimeR0Drv_SOURCES.darwin = \
1073	1075	common/err/RTErrConvertFromErrno.cpp \
	1076	common/misc/RTAssertMsg1Weak.cpp \
	1077	common/misc/RTAssertMsg2Weak.cpp \
1074	1078	common/misc/thread.cpp \
1075	1079	common/string/memchr.asm \

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

r13314	r14500
59	59
60	60
61		RTDECL(void) AssertMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction)
	61	RTDECL(void) RTAssertMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction)
62	62	{
63	63	#ifdef IN_GUEST_R0
…	…
85	85
86	86
87		RTDECL(void) ~~AssertMsg2(const char *pszFormat, ...~~)
	87	RTDECL(void) RTAssertMsg2V(const char *pszFormat, va_list va)
88	88	{
89		va_list va;
	89	va_list vaCopy;
90	90	char szMsg[256];
91	91
92	92	#ifdef IN_GUEST_R0
93		va_~~start(va, pszFormat~~);
94		RTLogBackdoorPrintfV(pszFormat, va);
95		va_end(va);
	93	va_copy(vaCopy, va);
	94	RTLogBackdoorPrintfV(pszFormat, vaCopy);
	95	va_end(vaCopy);
96	96	#endif
97	97
98		va_~~start(va, pszFormat~~);
99		RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, va);
	98	va_copy(vaCopy, va);
	99	RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, vaCopy);
100	100	szMsg[sizeof(szMsg) - 1] = '\0';
101		va_end(va);
	101	va_end(vaCopy);
102	102	printf("%s", szMsg);
103	103
104		va_~~start(va, pszFormat~~);
105		RTStrPrintfV(g_szRTAssertMsg2, sizeof(g_szRTAssertMsg2), pszFormat, va);
106		va_end(va);
	104	va_copy(vaCopy, va);
	105	RTStrPrintfV(g_szRTAssertMsg2, sizeof(g_szRTAssertMsg2), pszFormat, vaCopy);
	106	va_end(vaCopy);
107	107	}
108	108

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

r14499	r14500
1178	1178	DECLEXPORT(void) RTCALL AssertMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction)
1179	1179	{
1180		#if~~ndef DEBUG_sandervl~~
	1180	#if !defined(DEBUG_sandervl) && !defined(RT_OS_DARWIN)
1181	1181	SUPR0Printf("\n!!R0-Assertion Failed!!\n"
1182	1182	"Expression: %s\n"
…	…
1196	1196	"Location : %s(%d) %s\n",
1197	1197	pszExpr, pszFile, uLine, pszFunction);
	1198	#ifdef RT_OS_DARWIN
	1199	RTAssertMsg1(pszExpr, uLine, pszFile, pszFunction);
	1200	#endif
1198	1201	}
1199	1202
…	…
1207	1210	for (size_t i = 0; i < cbChars; i++)
1208	1211	{
1209		#if~~ndef DEBUG_sandervl~~
	1212	#if !defined(DEBUG_sandervl) && !defined(RT_OS_DARWIN)
1210	1213	SUPR0Printf("%c", pachChars[i]);
1211	1214	#endif
…	…
1219	1222	DECLEXPORT(void) RTCALL AssertMsg2(const char *pszFormat, ...)
1220	1223	{
	1224	va_list va;
	1225
1221	1226	PRTLOGGER pLog = RTLogDefaultInstance(); /** @todo we want this for release as well! */
1222	1227	if (pLog)
1223	1228	{
1224		~~va_list va;~~
1225	1229	va_start(va, pszFormat);
1226	1230	RTLogFormatV(rtLogOutput, pLog, pszFormat, va);
…	…
1235	1239	}
1236	1240	}
1237		}
1238
	1241
	1242	#ifdef RT_OS_DARWIN
	1243	va_start(va, pszFormat);
	1244	RTAssertMsg2V(pszFormat, va);
	1245	va_end(va);
	1246	#endif
	1247	}
	1248