diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/App.config b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/App.config
index daa7e57..ca2b4e5 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/App.config
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/App.config
@@ -1,16 +1,17 @@
-
+
-
-
-
-
+
+
+
+
+
-
+
-
\ No newline at end of file
+
diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/MassTransitTestClient.csproj b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/MassTransitTestClient.csproj
index 8e27d27..91e006b 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/MassTransitTestClient.csproj
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/MassTransitTestClient.csproj
@@ -9,8 +9,9 @@
Properties
MassTransitTestClient
MassTransitTestClient
- v4.5
+ v4.5.2
512
+
AnyCPU
@@ -32,24 +33,28 @@
4
-
- ..\packages\MassTransit.3.1.2\lib\net45\MassTransit.dll
+
+ ..\packages\GreenPipes.1.0.9\lib\net452\GreenPipes.dll
True
-
- ..\packages\MassTransit.RabbitMQ.3.1.2\lib\net45\MassTransit.RabbitMqTransport.dll
+
+ ..\packages\MassTransit.3.5.4\lib\net452\MassTransit.dll
True
-
- ..\packages\NewId.2.1.3\lib\net45\NewId.dll
+
+ ..\packages\MassTransit.RabbitMQ.3.5.4\lib\net452\MassTransit.RabbitMqTransport.dll
True
-
- ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\NewId.3.0.0\lib\net452\NewId.dll
True
-
- ..\packages\RabbitMQ.Client.3.6.0\lib\net45\RabbitMQ.Client.dll
+
+ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
+ True
+
+
+ ..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll
True
diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/Program.cs b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/Program.cs
index 0100c1f..6a75827 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/Program.cs
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/Program.cs
@@ -13,9 +13,13 @@ private static void Main(string[] args)
{
var taskCount = int.Parse(ConfigurationManager.AppSettings["NoOfThreads"]);
+ var prefetchCount = ushort.Parse(ConfigurationManager.AppSettings["PrefetchCount"] ?? "50");
+
+ var publisherConfirmation = bool.Parse(ConfigurationManager.AppSettings["PublisherConfirmation"] ?? "true");
+
var busControl = Bus.Factory.CreateUsingRabbitMq(cfg =>
{
- cfg.PrefetchCount = 50;
+ cfg.PrefetchCount = prefetchCount;
cfg.Durable = false;
cfg.AutoDelete = true;
@@ -23,6 +27,8 @@ private static void Main(string[] args)
{
h.Username(ConfigurationManager.AppSettings["Username"]);
h.Password(ConfigurationManager.AppSettings["Password"]);
+
+ h.PublisherConfirmation = publisherConfirmation;
});
});
@@ -32,15 +38,20 @@ private static void Main(string[] args)
var serviceUri =
new Uri(ConfigurationManager.AppSettings["ServerUri"] +
(!expectReply
- ? "masstransit_message_service"
+ ? "masstransit_message_service?durable=false&autodelete=true"
: "masstransit_message_service_rpc?durable=false&autodelete=true"));
var iterationsPerTask = int.Parse(ConfigurationManager.AppSettings["MessagesPerThread"]);
+ ISendEndpoint endpoint = null;
IRequestClient client = null;
if (expectReply)
{
client = busControl.CreateRequestClient(serviceUri, timeout);
}
+ else
+ {
+ endpoint = busControl.GetSendEndpoint(serviceUri).Result;
+ }
var tasks = new Task[taskCount];
for (var t = 0; t < taskCount; t++)
@@ -53,11 +64,11 @@ private static void Main(string[] args)
msg = new Message {Body = BodyGenerator.GetNext()};
if (expectReply)
{
- var res = client.Request(msg).Result;
+ client.Request(msg).Wait();
}
else
{
- busControl.Publish(msg).Wait();
+ endpoint.Send(msg).Wait();
}
}
}, TaskCreationOptions.LongRunning);
diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/packages.config b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/packages.config
index 5cf99a1..12630e7 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/packages.config
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/packages.config
@@ -1,8 +1,9 @@
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestCommon/MassTransitTestCommon.csproj b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestCommon/MassTransitTestCommon.csproj
index 37f61db..d93dfcc 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestCommon/MassTransitTestCommon.csproj
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestCommon/MassTransitTestCommon.csproj
@@ -9,8 +9,9 @@
Properties
MassTransitTestCommon
MassTransitTestCommon
- v4.5
+ v4.5.2
512
+
true
diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/App.config b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/App.config
index eb43d5f..41e4933 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/App.config
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/App.config
@@ -1,13 +1,15 @@
-
+
-
+
+
+
-
+
-
\ No newline at end of file
+
diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/MassTransitTestServer.csproj b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/MassTransitTestServer.csproj
index 2927f25..7da5ef5 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/MassTransitTestServer.csproj
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/MassTransitTestServer.csproj
@@ -9,8 +9,9 @@
Properties
MassTransitTestServer
MassTransitTestServer
- v4.5
+ v4.5.2
512
+
AnyCPU
@@ -32,24 +33,28 @@
4
-
- ..\packages\MassTransit.3.1.2\lib\net45\MassTransit.dll
+
+ ..\packages\GreenPipes.1.0.9\lib\net452\GreenPipes.dll
True
-
- ..\packages\MassTransit.RabbitMQ.3.1.2\lib\net45\MassTransit.RabbitMqTransport.dll
+
+ ..\packages\MassTransit.3.5.4\lib\net452\MassTransit.dll
True
-
- ..\packages\NewId.2.1.3\lib\net45\NewId.dll
+
+ ..\packages\MassTransit.RabbitMQ.3.5.4\lib\net452\MassTransit.RabbitMqTransport.dll
True
-
- ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\NewId.3.0.0\lib\net452\NewId.dll
True
-
- ..\packages\RabbitMQ.Client.3.6.0\lib\net45\RabbitMQ.Client.dll
+
+ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
+ True
+
+
+ ..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll
True
diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/Program.cs b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/Program.cs
index fa6f94e..4ef3391 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/Program.cs
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/Program.cs
@@ -1,34 +1,36 @@
-using MassTransit;
-using MassTransitTestCommon;
-using System;
-using System.Configuration;
-using System.Threading.Tasks;
-
-namespace MassTransitTestServer
+namespace MassTransitTestServer
{
+ using System;
+ using System.Configuration;
+ using System.Threading.Tasks;
+ using MassTransit;
+ using MassTransitTestCommon;
+
+
class Program
{
static void Main(string[] args)
- {
+ {
var busControl = Bus.Factory.CreateUsingRabbitMq(cfg =>
- {
- var host = cfg.Host(new Uri(ConfigurationManager.AppSettings["ServerUri"]), h =>
- {
- h.Username(ConfigurationManager.AppSettings["Username"]);
- h.Password(ConfigurationManager.AppSettings["Password"]);
- });
-
- var reply = bool.Parse(ConfigurationManager.AppSettings["Reply"] ?? "false");
-
- var queueName = !reply ? "masstransit_message_service" : "masstransit_message_service_rpc";
- cfg.ReceiveEndpoint(host, queueName, e =>
- {
- e.AutoDelete = true;
- e.Durable = false;
- e.PrefetchCount = 50;
- e.Consumer();
- });
- });
+ {
+ var host = cfg.Host(new Uri(ConfigurationManager.AppSettings["ServerUri"]), h =>
+ {
+ h.Username(ConfigurationManager.AppSettings["Username"]);
+ h.Password(ConfigurationManager.AppSettings["Password"]);
+ });
+
+ var reply = bool.Parse(ConfigurationManager.AppSettings["Reply"] ?? "false");
+ var prefetchCount = ushort.Parse(ConfigurationManager.AppSettings["PrefetchCount"] ?? "50");
+
+ var queueName = !reply ? "masstransit_message_service" : "masstransit_message_service_rpc";
+ cfg.ReceiveEndpoint(host, queueName, e =>
+ {
+ e.AutoDelete = true;
+ e.Durable = false;
+ e.PrefetchCount = prefetchCount;
+ e.Consumer();
+ });
+ });
busControl.Start();
@@ -40,14 +42,12 @@ static void Main(string[] args)
public class MessageConsumer : IConsumer
{
- private static bool reply = bool.Parse(ConfigurationManager.AppSettings["Reply"] ?? "false");
-
public async Task Consume(ConsumeContext context)
{
- if (reply)
+ if (context.ResponseAddress != null)
{
- await context.RespondAsync(new Message { Body = BodyGenerator.GetNext() });
+ context.Respond(new Message {Body = BodyGenerator.GetNext()});
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/packages.config b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/packages.config
index 5cf99a1..12630e7 100644
--- a/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/packages.config
+++ b/src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/packages.config
@@ -1,8 +1,9 @@
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Benchmarks/RabbitMQ/NServiceBus/NServiceBusTestClient/NServiceBusTestClient/App.config b/src/Benchmarks/RabbitMQ/NServiceBus/NServiceBusTestClient/NServiceBusTestClient/App.config
index fe15435..bbe1c74 100644
--- a/src/Benchmarks/RabbitMQ/NServiceBus/NServiceBusTestClient/NServiceBusTestClient/App.config
+++ b/src/Benchmarks/RabbitMQ/NServiceBus/NServiceBusTestClient/NServiceBusTestClient/App.config
@@ -7,16 +7,16 @@
-
+
-
+
-
-
+
+
-
+