Changeset 37233 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 27, 2011 1:31:57 PM (14 years ago)

Author:

vboxsync

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

71955

Message:

IRPT: Adding RTErrVarsSave/Restore/++ to preserve errno, h_error/WSAGetLastError and GetLastError accross assertions.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (10 diffs)
• VBox/RTAssertShouldPanic-vbox.cpp (modified) (3 diffs)
• common/misc/assert.cpp (modified) (5 diffs)
• generic/errvars-generic.cpp (added)
• include/internal/magics.h (modified) (1 diff)
• r3/posix/errvars-posix.cpp (added)
• r3/win/errvars-win.cpp (added)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -546 +546 @@
         r3/win/alloc-win.cpp \
         r3/win/dir-win.cpp \
+        r3/win/errvars-win.cpp \
         r3/win/fileio-win.cpp \
         r3/win/fs-win.cpp \
@@ -611 +612 @@
         r3/posix/dir-posix.cpp \
         r3/posix/env-posix.cpp \
+        r3/posix/errvars-posix.cpp \
         r3/posix/fileio-posix.cpp \
         r3/posix/fileio2-posix.cpp \
@@ -702 +704 @@
         r3/posix/dir-posix.cpp \
         r3/posix/env-posix.cpp \
+        r3/posix/errvars-posix.cpp \
         r3/posix/fileio-posix.cpp \
         r3/posix/fileio2-posix.cpp \
@@ -760 +763 @@
         r3/posix/dir-posix.cpp \
         r3/posix/env-posix.cpp \
+        r3/posix/errvars-posix.cpp \
         r3/posix/fileio-posix.cpp \
         r3/posix/fileio2-posix.cpp \
@@ -818 +822 @@
         r3/posix/dir-posix.cpp \
         r3/posix/env-posix.cpp \
+        r3/posix/errvars-posix.cpp \
         r3/posix/fileio-posix.cpp \
         r3/posix/fileio2-posix.cpp \
@@ -874 +879 @@
         r3/posix/dir-posix.cpp \
         r3/posix/env-posix.cpp \
+        r3/posix/errvars-posix.cpp \
         r3/posix/fileio-posix.cpp \
         r3/posix/fileio2-posix.cpp \
@@ -932 +938 @@
 
 RuntimeR3L4_SOURCES = \
+        generic/errvars-generic.cpp \
         generic/fs-stubs-generic.cpp \
         generic/pathhost-generic.cpp \
@@ -1134 +1141 @@
         generic/pathhost-generic.cpp \
         generic/RTAssertShouldPanic-generic.cpp \
+        generic/errvars-generic.cpp \
         r3/alloc.cpp \
         r3/alloc-ef.cpp \
@@ -1630 +1638 @@
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
+        generic/errvars-generic.cpp \
         generic/uuid-generic.cpp \
         r0drv/alloc-r0drv.cpp \
@@ -1950 +1959 @@
         gc/initterm-gc.cpp \
         generic/RTAssertShouldPanic-generic.cpp \
+        generic/errvars-generic.cpp \
         \
         $(RuntimeNoCrt_SOURCES)

trunk/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp

@@ -31 +31 @@
 #include <iprt/assert.h>
 #include <iprt/env.h>
+#include <iprt/err.h>
 #include <iprt/string.h>
 
@@ -52 +53 @@
 
 
-RTDECL(bool) RTAssertShouldPanic(void)
+/**
+ * Worker that we can wrap with error variable saving and restoring.
+ */
+static bool rtAssertShouldPanicWorker(void)
 {
-    /*
-     * Check if panicing is excluded by the the RTAssert settings first.
-     */
-    if (!RTAssertMayPanic())
-        return false;
-
     /*
      * Check for the VBOX_ASSERT variable.
@@ -143 +141 @@
 }
 
+
+RTDECL(bool) RTAssertShouldPanic(void)
+{
+    /*
+     * Check if panicing is excluded by the the RTAssert settings first.
+     */
+    if (!RTAssertMayPanic())
+        return false;
+
+    /*
+     * Preserve error state variables.
+     */
+    RTERRVARS SavedErrVars;
+    RTErrVarsSave(&SavedErrVars);
+
+    bool fRc = rtAssertShouldPanicWorker();
+
+    RTErrVarsRestore(&SavedErrVars);
+    return fRc;
+}
+

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

@@ -33 +33 @@
 
 #include <iprt/asm.h>
+#include <iprt/err.h>
 #include <iprt/log.h>
 #include <iprt/string.h>
@@ -122 +123 @@
     if (!RTAssertAreQuiet())
     {
+        RTERRVARS SavedErrVars;
+        RTErrVarsSave(&SavedErrVars);
+
 #ifdef IN_RING0
 # ifdef IN_GUEST_R0
@@ -182 +186 @@
 # endif
 #endif /* !IN_RING0 */
+
+        RTErrVarsRestore(&SavedErrVars);
     }
 }
@@ -226 +232 @@
     if (!RTAssertAreQuiet())
     {
+        RTERRVARS SavedErrVars;
+        RTErrVarsSave(&SavedErrVars);
+
 #ifdef IN_RING0
 # ifdef IN_GUEST_R0
@@ -274 +283 @@
 # endif
 #endif /* !IN_RING0 */
+
+        RTErrVarsRestore(&SavedErrVars);
     }
-
 }
 

trunk/src/VBox/Runtime/include/internal/magics.h

@@ -59 +59 @@
 /** The value of RTENVINTERNAL::u32Magic. (Rumiko Takahashi) */
 #define RTENV_MAGIC                     UINT32_C(0x19571010)
+/** The value of RTERRVARS::ai32Vars[0]. (Ryuichi Sakamoto) */
+#define RTERRVARS_MAGIC                 UINT32_C(0x19520117)
 /** Magic number for RTHANDLETABLEINT::u32Magic. (Hitomi Kanehara) */
 #define RTHANDLETABLE_MAGIC             UINT32_C(0x19830808)