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

Timestamp:

Dec 21, 2009 11:06:08 AM (15 years ago)

Author:

vboxsync

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

56209

Message:

iprt/assert.h: Added RTAssertMsg2Add[Weak][V] for dumping the lock deadlock chain and stacks. Added the missing internal/assert.h file to the linux and freebsd kernel source trees.

Location:

trunk/src/VBox/Runtime/common/misc

Files:

• RTAssertMsg2Add.cpp (copied) (copied from trunk/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp ) (2 diffs)
• RTAssertMsg2AddWeak.cpp (copied) (copied from trunk/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp ) (2 diffs)
• RTAssertMsg2AddWeakV.cpp (copied) (copied from trunk/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp ) (2 diffs)
• assert.cpp (modified) (4 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTAssertMsg2.
+ * IPRT - RTAssertMsg2Add.
  */
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -39 +39 @@
 
 
-RTDECL(void) RTAssertMsg2(const char *pszFormat, ...)
+RTDECL(void) RTAssertMsg2Add(const char *pszFormat, ...)
 {
     va_list va;
     va_start(va, pszFormat);
-    RTAssertMsg2V(pszFormat, va);
+    RTAssertMsg2AddV(pszFormat, va);
     va_end(va);
 }
-RT_EXPORT_SYMBOL(RTAssertMsg2);
+RT_EXPORT_SYMBOL(RTAssertMsg2Add);
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTAssertMsg2Weak.
+ * IPRT - RTAssertMsg2AddWeak.
  */
 
@@ -39 +39 @@
 
 
-RTDECL(void) RTAssertMsg2Weak(const char *pszFormat, ...)
+RTDECL(void) RTAssertMsg2AddWeak(const char *pszFormat, ...)
 {
     va_list va;
     va_start(va, pszFormat);
-    RTAssertMsg2WeakV(pszFormat, va);
+    RTAssertMsg2AddWeakV(pszFormat, va);
     va_end(va);
 }
-RT_EXPORT_SYMBOL(RTAssertMsg2Weak);
+RT_EXPORT_SYMBOL(RTAssertMsg2AddWeak);
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTAssertMsg2WeakV.
+ * IPRT - RTAssertMsg2AddWeakV.
  */
 
@@ -37 +37 @@
 
 
-RTDECL(void) RTAssertMsg2WeakV(const char *pszFormat, va_list va)
+RTDECL(void) RTAssertMsg2AddWeakV(const char *pszFormat, va_list va)
 {
-    RTAssertMsg2V(pszFormat, va);
+    RTAssertMsg2AddV(pszFormat, va);
 }
-RT_EXPORT_SYMBOL(RTAssertMsg2WeakV);
+RT_EXPORT_SYMBOL(RTAssertMsg2AddWeakV);
 

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

@@ -53 +53 @@
 RT_EXPORT_SYMBOL(g_szRTAssertMsg1);
 /** The last assert message, 2nd part. */
-RTDATADECL(char)                    g_szRTAssertMsg2[2048];
+RTDATADECL(char)                    g_szRTAssertMsg2[4096];
 RT_EXPORT_SYMBOL(g_szRTAssertMsg2);
+/** The length of the g_szRTAssertMsg2 content.
+ * @remarks Race.  */
+static uint32_t volatile            g_cchRTAssertMsg2;
 /** The last assert message, expression. */
 RTDATADECL(const char * volatile)   g_pszRTAssertExpr;
@@ -188 +191 @@
 
 
-RTDECL(void) RTAssertMsg2V(const char *pszFormat, va_list va)
+/**
+ * Worker for RTAssertMsg2V and RTAssertMsg2AddV
+ *
+ * @param   fInitial            True if it's RTAssertMsg2V, otherwise false.
+ * @param   pszFormat           The message format string.
+ * @param   va                  The format arguments.
+ */
+static void rtAssertMsg2Worker(bool fInitial, const char *pszFormat, va_list va)
 {
     va_list vaCopy;
+    size_t  cch;
 
     /*
      * The global first.
      */
-    va_copy(vaCopy, va);
-    RTStrPrintfV(g_szRTAssertMsg2, sizeof(g_szRTAssertMsg2), pszFormat, vaCopy);
-    va_end(vaCopy);
+    if (fInitial)
+    {
+        va_copy(vaCopy, va);
+        cch = RTStrPrintfV(g_szRTAssertMsg2, sizeof(g_szRTAssertMsg2), pszFormat, vaCopy);
+        ASMAtomicWriteU32(&g_cchRTAssertMsg2, (uint32_t)cch);
+        va_end(vaCopy);
+    }
+    else
+    {
+        cch = ASMAtomicReadU32(&g_cchRTAssertMsg2);
+        if (cch < sizeof(g_szRTAssertMsg2) - 4)
+        {
+            va_copy(vaCopy, va);
+            cch += RTStrPrintfV(&g_szRTAssertMsg2[cch], sizeof(g_szRTAssertMsg2) - cch, pszFormat, vaCopy);
+            ASMAtomicWriteU32(&g_cchRTAssertMsg2, (uint32_t)cch);
+            va_end(vaCopy);
+        }
+    }
 
     /*
@@ -211 +237 @@
 # endif
         /** @todo fully integrate this with the logger... play safe a bit for now.  */
-        rtR0AssertNativeMsg2V(pszFormat, va);
+        rtR0AssertNativeMsg2V(fInitial, pszFormat, va);
 
 #else  /* !IN_RING0 */
@@ -255 +281 @@
 
 }
+
+
+RTDECL(void) RTAssertMsg2V(const char *pszFormat, va_list va)
+{
+    rtAssertMsg2Worker(true /*fInitial*/, pszFormat, va);
+}
 RT_EXPORT_SYMBOL(RTAssertMsg2V);
 
+
+RTDECL(void) RTAssertMsg2AddV(const char *pszFormat, va_list va)
+{
+    rtAssertMsg2Worker(false /*fInitial*/, pszFormat, va);
+}
+RT_EXPORT_SYMBOL(RTAssertMsg2AddV);
+