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

Jump to bottom

Async wait in delivery loop to avoid thread pool starvation #121

Merged
merged 1 commit into from
Dec 8, 2022
Merged

Async wait in delivery loop to avoid thread pool starvation #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 23 additions & 14 deletions src/AddUp.FakeRabbitMQ/FakeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks;
using RabbitMQ.Client;
using RabbitMQ.Client.Events;
Expand All @@ -14,7 +15,11 @@ internal sealed class FakeModel : IModel
{
private readonly ConcurrentDictionary<ulong, RabbitMessage> workingMessages = new ConcurrentDictionary<ulong, RabbitMessage>();
private readonly ConcurrentDictionary<string, IBasicConsumer> consumers = new ConcurrentDictionary<string, IBasicConsumer>();
private readonly BlockingCollection<Action> deliveries = new BlockingCollection<Action>();
private readonly Channel<Action> deliveries = Channel.CreateUnbounded<Action>(new UnboundedChannelOptions
{
SingleReader = true,
SingleWriter = false,
});
private readonly RabbitServer server;
private readonly Task deliveriesTask;
private long lastDeliveryTag;
Expand Down Expand Up @@ -122,9 +127,9 @@ void notifyConsumerOfMessage(RabbitMessage message)
_ = consumers.AddOrUpdate(consumerTag, consumer, updateFunction);

foreach (var message in queueInstance.Messages)
deliveries.Add(() => notifyConsumerOfMessage(message));
_ = deliveries.Writer.TryWrite(() => notifyConsumerOfMessage(message));
queueInstance.MessagePublished += (sender, message) =>
deliveries.Add(() => notifyConsumerOfMessage(message));
_ = deliveries.Writer.TryWrite(() => notifyConsumerOfMessage(message));

if (consumer is IAsyncBasicConsumer asyncBasicConsumer)
asyncBasicConsumer.HandleBasicConsumeOk(consumerTag).GetAwaiter().GetResult();
Expand Down Expand Up @@ -257,7 +262,7 @@ private void Close(ushort replyCode, string replyText, bool abort)
try
{
CloseReason = reason;
deliveries.CompleteAdding();
deliveries.Writer.TryComplete();
deliveriesTask.Wait();
ModelShutdown?.Invoke(this, reason);
}
Expand All @@ -282,7 +287,6 @@ public void ConfirmSelect()
public void Dispose()
{
if (IsOpen) Abort();
deliveries.Dispose();
}

public void ExchangeBind(string destination, string source, string routingKey, IDictionary<string, object> arguments)
Expand Down Expand Up @@ -471,20 +475,25 @@ public bool WaitForConfirms(TimeSpan timeout, out bool timedOut)
/// semantics as running delivery callbacks synchronously can cause deadlocks in
/// code under test.
/// </summary>
private void HandleDeliveries()
private async Task HandleDeliveries()
{
try
{
foreach (var delivery in deliveries.GetConsumingEnumerable())
try
{
delivery();
}
catch (Exception ex)
while (await deliveries.Reader.WaitToReadAsync().ConfigureAwait(false))
{
while (deliveries.Reader.TryRead(out var delivery))
{
var callbackArgs = CallbackExceptionEventArgs.Build(ex, "");
CallbackException(this, callbackArgs);
try
{
delivery();
}
catch (Exception ex)
{
var callbackArgs = CallbackExceptionEventArgs.Build(ex, "");
CallbackException(this, callbackArgs);
}
}
}
}
catch
{
Expand Down