Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: BrighterTaskScheduler Queue Task When Complete #3450

Merged
merged 2 commits into from
Dec 31, 2024
Merged

fix: BrighterTaskScheduler Queue Task When Complete #3450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8330d4c
fix: add immediate execution back
iancooper Dec 31, 2024
617f505
fix: use a new thread if the context has closed
iancooper Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Paramore.Brighter/Tasks/BrighterSynchronizationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ public override void Post(SendOrPostCallback callback, object? state)

//just execute inline
// current thread already owns the context, so just execute inline to prevent deadlocks
//if (BrighterSynchronizationHelper.Current == SynchronizationHelper)
//SynchronizationHelper.ExecuteImmediately(contextCallback, state);
//else
if (BrighterSynchronizationHelper.Current == SynchronizationHelper)
SynchronizationHelper.ExecuteImmediately(contextCallback, state);
else
base.Post(callback, state);

}
Expand Down
18 changes: 15 additions & 3 deletions tests/Paramore.Brighter.Core.Tests/Tasks/BrighterSynchronizationContextsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@
#endregion

using System;
using System.Runtime.CompilerServices;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Getting worse: Code Duplication
introduced similar code in: Run_AsyncTaskWithResultAndConfigurateAwait_BlockingCode_Still_Ends

Suppress

using System.Threading;
using System.Threading.Tasks;
using FluentAssertions;
using Paramore.Brighter.ServiceActivator;
using Paramore.Brighter.Tasks;
using Xunit;

namespace Paramore.Brighter.Core.Tests.SynchronizationContext;
namespace Paramore.Brighter.Core.Tests.Tasks;

public class BrighterSynchronizationContextsTests
{
Expand Down Expand Up @@ -123,6 +121,20 @@ public void Run_AsyncTaskWithResult_BlockingCode_Still_Ends()
resumed.Should().BeTrue();
result.Should().Be(17);
}

[Fact]
public void Run_AsyncTaskWithResultAndConfigurateAwait_BlockingCode_Still_Ends()
{
bool resumed = false;
var result = BrighterSynchronizationHelper.Run(async () =>
{
await Task.Delay(50).ConfigureAwait(false);
resumed = true;
return 17;
});
resumed.Should().BeTrue();
result.Should().Be(17);
}

[Fact]
public void Run_AsyncTaskWithResult_ContainsMultipleAsyncTasks_Still_Ends()
Expand Down
Loading