default to "preemptive" on wasm

It isn't really preemptive, it just turns off safepoint code in the AOT compiler. This is fine for single threaded.
dotnet · Jan 15, 2021 · 48f8e55 · 48f8e55
1 parent fe00669
commit 48f8e55
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt
@@ -546,6 +546,8 @@ elseif(GC_SUSPEND STREQUAL "default")
     set(ENABLE_COOP_SUSPEND 1)
   elseif(TARGET_SYSTEM_NAME STREQUAL "Windows")
     # use preemptive
+  elseif(TARGET_SYSTEM_NAME STREQUAL "Emscripten")
+    # use preemptive
   else()
     set(ENABLE_HYBRID_SUSPEND 1)
   endif()

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
@@ -51,6 +51,8 @@
   <!-- default thread suspend for specific platforms -->
   <PropertyGroup>
     <MonoThreadSuspend Condition="'$(TargetswatchOS)' == 'true' and '$(MonoThreadSuspend)' == ''">coop</MonoThreadSuspend>
+    <!-- wasm isn't really preemptive, but we don't want safepoints -->
+    <MonoThreadSuspend Condition="'$(TargetsBrowser)' == 'true' and '$(MonoThreadSuspend)' == ''">preemptive</MonoThreadSuspend>
     <!-- all other platforms -->
     <MonoThreadSuspend Condition="'$(MonoThreadSuspend)' == ''">hybrid</MonoThreadSuspend>
   </PropertyGroup>