2009-02-06 Miguel De Icaza <miguel@novell.com>

	* Disable parallel marking on OSX as it hangs during collections
	in the bootstrap stage of Mono.

	As we find more platforms that hang, we should disable it there as
	well.

svn path=/trunk/mono/; revision=126002

diff --git a/ChangeLog b/ChangeLog
index 83f7ede24d2120baaea9dbf8b2981ccf872b4f11..8c063d9fc6ca954fff3019529d12c9cc0eb1d476 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-06  Miguel De Icaza  <miguel@novell.com>
+
+       * Disable parallel marking on OSX as it hangs during collections
+       in the bootstrap stage of Mono.
+
+       As we find more platforms that hang, we should disable it there as
+       well. 
+
 2009-02-03  Miguel de Icaza  <miguel@novell.com>
 
        * configure.in (PLATFORM_NO_SYMLINKS): New define that replaces

diff --git a/configure.in b/configure.in
index b4c5bf9fbc610af2b02bf5e26e01b2c64433f7b9..18baf52aadb3b5885c84b71e70907a39bfc16284 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -64,6 +64,7 @@ need_link_unlink=no
 AC_MSG_CHECKING([host platform characteristics])
 libgc_threads=no
 has_dtrace=no
+parallel_mark=yes
 case "$host" in
        *-*-mingw*|*-*-cygwin*)
                platform_win32=yes
@@ -183,6 +184,7 @@ case "$host" in
                use_sigposix=yes
                ;;
        *-*-darwin*)
+               parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
                platform_win32=no
                platform_darwin=yes
                CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
@@ -650,7 +652,7 @@ AC_TRY_COMPILE([], [
    AC_MSG_RESULT(no)
 ])
 
-AC_ARG_ENABLE(parallel-mark, [  --enable-parallel-mark     Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=yes)
+AC_ARG_ENABLE(parallel-mark, [  --enable-parallel-mark     Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=$parallel_mark)
 if test x$enable_parallel_mark = xyes; then
        libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
 fi