Changeset 20821 in vbox for trunk

Timestamp:

Jun 23, 2009 12:42:19 PM (16 years ago)

Author:

vboxsync

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

48960

Message:

IPRT: alignment check hacking.

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/alignmentchecks.h (added)
• r3/init.cpp (modified) (4 diffs)
• r3/posix/env-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/init.cpp

@@ -59 +59 @@
 # include <iprt/file.h>
 # include <VBox/sup.h>
-# include <stdlib.h>
-#endif
-
+#endif
+#include <stdlib.h>
+
+#include "internal/alignmentchecks.h"
 #include "internal/path.h"
 #include "internal/process.h"
@@ -112 +113 @@
 RTPROCPRIORITY g_enmProcessPriority = RTPROCPRIORITY_DEFAULT;
 
+#ifdef DEBUG
+/**
+ * Whether alignment checks are enabled.
+ * This is set if the environment variable IPRT_ALIGNMENT_CHECKS is 1.
+ */
+RTDATADECL(bool) g_fRTAlignmentChecks = false;
+#endif
+
+
 
 #ifndef RT_OS_WINDOWS
@@ -195 +205 @@
     const char *pszDisableHostCache = getenv("VBOX_DISABLE_HOST_DISK_CACHE");
     if (    pszDisableHostCache != NULL
-        &&  strlen(pszDisableHostCache) > 0
+        &&  *pszDisableHostCache
         &&  strcmp(pszDisableHostCache, "0") != 0)
     {
@@ -263 +273 @@
 #endif
 
+#if defined(DEBUG)
+    /*
+     * Enable alignment checks.
+     */
+    const char *pszAlignmentChecks = getenv("IPRT_ALIGNMENT_CHECKS");
+    g_fRTAlignmentChecks = pszAlignmentChecks != NULL
+                        && pszAlignmentChecks[0] == '1'
+                        && pszAlignmentChecks[1] == '\0';
+    if (g_fRTAlignmentChecks)
+        IPRT_ALIGNMENT_CHECKS_ENABLE();
+#endif
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/Runtime/r3/posix/env-posix.cpp

@@ -41 +41 @@
 #include <iprt/alloca.h>
 #include <iprt/assert.h>
+#if defined(DEBUG) && defined(RT_OS_LINUX)
+# include <iprt/asm.h>
+#endif
 
 #include <stdlib.h>
 #include <errno.h>
 
+#include "internal/alignmentchecks.h"
+
 
 RTDECL(bool) RTEnvExist(const char *pszVar)
 {
-    return getenv(pszVar) != NULL;
+    return RTEnvGet(pszVar) != NULL;
 }
 
@@ -54 +59 @@
 RTDECL(const char *) RTEnvGet(const char *pszVar)
 {
-    return getenv(pszVar);
+    IPRT_ALIGNMENT_CHECKS_DISABLE(); /* glibc causes trouble */
+    const char *pszValue = getenv(pszVar);
+    IPRT_ALIGNMENT_CHECKS_ENABLE();
+    return pszValue;
 }
 
@@ -86 +94 @@
         return 0;
     return RTErrConvertFromErrno(errno);
-    
+
 #else
     if (!setenv(pszVar, pszValue, 1))
         return VINF_SUCCESS;
     return RTErrConvertFromErrno(errno);
-#endif 
+#endif
 }