mirror of
https://github.com/dotnet/MQTTnet.git
synced 2026-10-19 02:53:06 +08:00
Refactor latest changes
This commit is contained in:
@@ -17,18 +17,18 @@ namespace MQTTnet.TestApp.NetFramework
|
||||
{
|
||||
public static async Task RunAsync()
|
||||
{
|
||||
var server = Task.Run(() => RunServerAsync());
|
||||
var client = Task.Run(() => RunClientAsync(2000, TimeSpan.FromMilliseconds(10)));
|
||||
var server = Task.Factory.StartNew(RunServerAsync, TaskCreationOptions.LongRunning);
|
||||
var client = Task.Factory.StartNew(() => RunClientAsync(2000, TimeSpan.FromMilliseconds(10)), TaskCreationOptions.LongRunning);
|
||||
|
||||
await Task.WhenAll(server, client).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private static Task RunClientsAsync(int msgChunkSize, TimeSpan interval)
|
||||
{
|
||||
return Task.WhenAll(Enumerable.Range(0, 3).Select((i) => Task.Run(() => RunClientAsync(msgChunkSize, interval))));
|
||||
return Task.WhenAll(Enumerable.Range(0, 3).Select(i => Task.Run(() => RunClientAsync(msgChunkSize, interval))));
|
||||
}
|
||||
|
||||
private static async Task RunClientAsync( int msgChunkSize, TimeSpan interval )
|
||||
private static async Task RunClientAsync(int msgChunkSize, TimeSpan interval)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -83,7 +83,7 @@ namespace MQTTnet.TestApp.NetFramework
|
||||
|
||||
Console.WriteLine("### WAITING FOR APPLICATION MESSAGES ###");
|
||||
|
||||
var testMessageCount = 1000;
|
||||
var testMessageCount = 10000;
|
||||
var message = CreateMessage();
|
||||
var stopwatch = Stopwatch.StartNew();
|
||||
for (var i = 0; i < testMessageCount; i++)
|
||||
@@ -92,8 +92,8 @@ namespace MQTTnet.TestApp.NetFramework
|
||||
}
|
||||
|
||||
stopwatch.Stop();
|
||||
Console.WriteLine($"Sent 1000 messages within {stopwatch.ElapsedMilliseconds} ms ({stopwatch.ElapsedMilliseconds / (float)testMessageCount} ms / message).");
|
||||
|
||||
Console.WriteLine($"Sent 10.000 messages within {stopwatch.ElapsedMilliseconds} ms ({stopwatch.ElapsedMilliseconds / (float)testMessageCount} ms / message).");
|
||||
|
||||
stopwatch.Restart();
|
||||
var sentMessagesCount = 0;
|
||||
while (stopwatch.ElapsedMilliseconds < 1000)
|
||||
@@ -109,32 +109,32 @@ namespace MQTTnet.TestApp.NetFramework
|
||||
|
||||
while (true)
|
||||
{
|
||||
var msgs = Enumerable.Range( 0, msgChunkSize )
|
||||
.Select( i => CreateMessage() )
|
||||
var msgs = Enumerable.Range(0, msgChunkSize)
|
||||
.Select(i => CreateMessage())
|
||||
.ToList();
|
||||
|
||||
if (false)
|
||||
{
|
||||
//send concurrent (test for raceconditions)
|
||||
var sendTasks = msgs
|
||||
.Select( msg => PublishSingleMessage( client, msg, ref msgCount ) )
|
||||
.Select(msg => PublishSingleMessage(client, msg, ref msgCount))
|
||||
.ToList();
|
||||
|
||||
await Task.WhenAll( sendTasks );
|
||||
await Task.WhenAll(sendTasks);
|
||||
}
|
||||
else
|
||||
{
|
||||
await client.PublishAsync( msgs );
|
||||
await client.PublishAsync(msgs);
|
||||
msgCount += msgs.Count;
|
||||
//send multiple
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
var now = DateTime.Now;
|
||||
if (last < now - TimeSpan.FromSeconds(1))
|
||||
{
|
||||
Console.WriteLine( $"sending {msgCount} inteded {msgChunkSize / interval.TotalSeconds}" );
|
||||
Console.WriteLine($"sending {msgCount} inteded {msgChunkSize / interval.TotalSeconds}");
|
||||
msgCount = 0;
|
||||
last = now;
|
||||
}
|
||||
@@ -152,19 +152,19 @@ namespace MQTTnet.TestApp.NetFramework
|
||||
{
|
||||
return new MqttApplicationMessage(
|
||||
"A/B/C",
|
||||
Encoding.UTF8.GetBytes( "Hello World" ),
|
||||
Encoding.UTF8.GetBytes("Hello World"),
|
||||
MqttQualityOfServiceLevel.AtMostOnce,
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
private static Task PublishSingleMessage( IMqttClient client, MqttApplicationMessage applicationMessage, ref int count )
|
||||
private static Task PublishSingleMessage(IMqttClient client, MqttApplicationMessage applicationMessage, ref int count)
|
||||
{
|
||||
Interlocked.Increment( ref count );
|
||||
return Task.Run( () =>
|
||||
{
|
||||
return client.PublishAsync( applicationMessage );
|
||||
} );
|
||||
Interlocked.Increment(ref count);
|
||||
return Task.Run(() =>
|
||||
{
|
||||
return client.PublishAsync(applicationMessage);
|
||||
});
|
||||
}
|
||||
|
||||
private static void RunServerAsync()
|
||||
@@ -187,19 +187,18 @@ namespace MQTTnet.TestApp.NetFramework
|
||||
},
|
||||
DefaultCommunicationTimeout = TimeSpan.FromMinutes(10)
|
||||
};
|
||||
|
||||
|
||||
var mqttServer = new MqttServerFactory().CreateMqttServer(options);
|
||||
var last = DateTime.Now;
|
||||
var msgs = 0;
|
||||
mqttServer.ApplicationMessageReceived += (sender, args) =>
|
||||
var stopwatch = Stopwatch.StartNew();
|
||||
mqttServer.ApplicationMessageReceived += (sender, args) =>
|
||||
{
|
||||
msgs++;
|
||||
var now = DateTime.Now;
|
||||
if (last < now - TimeSpan.FromSeconds(1))
|
||||
if (stopwatch.ElapsedMilliseconds > 1000)
|
||||
{
|
||||
Console.WriteLine($"received {msgs}");
|
||||
msgs = 0;
|
||||
last = now;
|
||||
stopwatch.Restart();
|
||||
}
|
||||
};
|
||||
mqttServer.Start();
|
||||
|
||||
Reference in New Issue
Block a user