diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2019-06-06 14:13:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 14:13:07 +0300 |
| commit | 41e6fb746da8b651884c91dedaeb60acebe20fab (patch) | |
| tree | d0b7692a0fab57eda6be00b8f82a94acaf9dab93 /main/build | |
| parent | fc1198ac16e20589cb09792b5436cc65d417191a (diff) | |
[Mac] Remove hardcoded thread suspending mode (#7800)
The underlying mono thread suspending bugs seem to be fixed.
Let mono choose the new default.
Fixes VSTS #706310 - Re-enable hybrid suspend
Diffstat (limited to 'main/build')
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 2 | ||||
| -rw-r--r-- | main/build/MacOSX/monostub.mm | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index 37d22f0e65..e662ab92d5 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -12,7 +12,7 @@ EXTERNAL=../../external MONOSTUB_STATIC_LINK=$(EXTERNAL)/Xamarin.Mac.registrar.full.a if !RELEASE_BUILDS -HYBRID_SUSPEND_ABORT=-DHYBRID_SUSPEND_ABORT +HYBRID_SUSPEND_ABORT_DEBUG=-DHYBRID_SUSPEND_ABORT_DEBUG endif #SDK_PATH=$(shell xcrun --sdk macosx10.8 --show-sdk-path) diff --git a/main/build/MacOSX/monostub.mm b/main/build/MacOSX/monostub.mm index d6bd254556..600a161d2e 100644 --- a/main/build/MacOSX/monostub.mm +++ b/main/build/MacOSX/monostub.mm @@ -277,13 +277,11 @@ main (int argc, char **argv) // prevents the code from running correctly, so unset it here. // See https://devdiv.visualstudio.com/DevDiv/_workitems/edit/896438 unsetenv ("MONO_REGISTRY_PATH"); -#if HYBRID_SUSPEND_ABORT + +#if HYBRID_SUSPEND_ABORT_DEBUG setenv ("MONO_SLEEP_ABORT_LIMIT", "5000", 0); #endif - // To be removed: https://github.com/mono/monodevelop/issues/6326 - setenv ("MONO_THREADS_SUSPEND", "preemptive", 0); - setenv ("MONO_GC_PARAMS", "major=marksweep-conc,nursery-size=8m", 0); void *libmono = dlopen ("libmonosgen-2.0.dylib", RTLD_LAZY); |