Revert "[browser][MT] troubleshooting deadlocks 2 (dotnet#104615)"

This reverts commit ed9642e.
matouskozak · Jul 11, 2024 · fa46b9e · fa46b9e
1 parent e777a89
commit fa46b9e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/...ces.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/JavaScriptExports.cs b/...ces.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/JavaScriptExports.cs
@@ -277,7 +277,7 @@ public static void InstallMainSynchronizationContext(JSMarshalerArgument* argume
             }
             catch (Exception ex)
             {
-                Environment.FailFast($"InstallMainSynchronizationContext: Unexpected failure (ManagedThreadId {Environment.CurrentManagedThreadId}): " + ex);
+                arg_exc.ToJS(ex);
             }
         }
 

diff --git a/...ices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSSynchronizationContext.cs b/...ices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSSynchronizationContext.cs
@@ -294,9 +294,9 @@ private void Pump()
                 // otherwise, we could schedule another round
                 AwaitNewData();
             }
-            catch (Exception ex)
+            catch (Exception e)
             {
-                Environment.FailFast($"JSSynchronizationContext.Pump: Unexpected failure (ManagedThreadId {Environment.CurrentManagedThreadId}): " + ex);
+                Environment.FailFast($"JSSynchronizationContext.Pump failed, ManagedThreadId: {Environment.CurrentManagedThreadId}. {Environment.NewLine} {e.StackTrace}");
             }
         }
 

diff --git a/...pServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/WebWorkerTest.cs b/...pServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/WebWorkerTest.cs
@@ -520,7 +520,6 @@ await executor.Execute(async () =>
         }
 
         [Theory, MemberData(nameof(GetTargetThreadsAndBlockingCalls))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/99951")]
         public async Task WaitAssertsOnSyncCallback(Executor executor, NamedCall method)
         {
             using var cts = CreateTestCaseTimeoutSource();
@@ -556,7 +555,6 @@ await WebWorkerTestHelper.CallMeBackSync(() =>
         }
 
         [Theory, MemberData(nameof(GetTargetThreadsAndBlockingCalls))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/99951")]
         public async Task WaitAssertsOnSyncJSExport(Executor executor, NamedCall method)
         {
             using var cts = CreateTestCaseTimeoutSource();
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 catch (Exception ex)
                 {
-                    Environment.FailFast($"InstallMainSynchronizationContext: Unexpected failure (ManagedThreadId {Environment.CurrentManagedThreadId}): " + ex);
+                    arg_exc.ToJS(ex);
                 }
             }
@@ Expand Down @@