Fixed additional potential places where incrementing values could fai…

…l in concurrent situations.
Dtronix · Sep 17, 2023 · e6a8040 · e6a8040
1 parent fc930c4
commit e6a8040
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/NexNet.IntegrationTests/NexusServerTests_NexusInvocations.cs b/src/NexNet.IntegrationTests/NexusServerTests_NexusInvocations.cs
@@ -161,7 +161,7 @@ public async Task NexusInvokesOnAll(Type type)
             connectedNexus.OnConnectedEvent = async nexus =>
             {
                 // Second connection
-                if (++connectedCount == 2)
+                if (Interlocked.Increment(ref connectedCount) == 2)
                 {
                     await nexus.Context.Clients.All.ClientTask();
                 }
@@ -199,7 +199,7 @@ public async Task NexusInvokesOnGroup(Type type)
             {
                 nexus.Context.Groups.Add("group");
                 // Second connection
-                if (++connectedCount == 2)
+                if (Interlocked.Increment(ref connectedCount) == 2)
                 {
                     await nexus.Context.Clients.Group("group").ClientTask();
                 }
@@ -234,7 +234,7 @@ public async Task NexusInvokesOnGroups(Type type)
         {
             connectedNexus.OnConnectedEvent = async nexus =>
             {
-                if (++connectedCount == 1) {
+                if (Interlocked.Increment(ref connectedCount) == 1) {
                     nexus.Context.Groups.Add("group");
                 }
                 // Second connection
@@ -276,7 +276,7 @@ public async Task NexusInvokesOnOthers(Type type)
             connectedNexus.OnConnectedEvent = async nexus =>
             {
                 // Second connection
-                if (++connectedCount == 2)
+                if (Interlocked.Increment(ref connectedCount) == 2)
                 {
                     await nexus.Context.Clients.Others.ClientTask();
                     await Task.Delay(10);
@@ -288,8 +288,8 @@ public async Task NexusInvokesOnOthers(Type type)
         var (client1, clientNexus1) = CreateClient(CreateClientConfig(type));
         var (client2, clientNexus2) = CreateClient(CreateClientConfig(type));
 #pragma warning disable CS1998
-        clientNexus1.ClientTaskEvent = async _ => invocationCount++;
-        clientNexus2.ClientTaskEvent = async _ => invocationCount++;
+        clientNexus1.ClientTaskEvent = async _ => Interlocked.Increment(ref invocationCount);
+        clientNexus2.ClientTaskEvent = async _ => Interlocked.Increment(ref invocationCount);
 #pragma warning restore CS1998
         await server.StartAsync().Timeout(1);
 
@@ -316,7 +316,7 @@ public async Task NexusInvokesOnClient(Type type)
             connectedNexus.OnConnectedEvent = async nexus =>
             {
                 // Second connection
-                if (++connectedCount == 2)
+                if (Interlocked.Increment(ref connectedCount) == 2)
                 {
                     await nexus.Context.Clients.Client(nexus.Context.Id).ClientTask();
                     await Task.Delay(10);
@@ -328,8 +328,8 @@ public async Task NexusInvokesOnClient(Type type)
         var (client1, clientNexus1) = CreateClient(CreateClientConfig(type));
         var (client2, clientNexus2) = CreateClient(CreateClientConfig(type));
 #pragma warning disable CS1998
-        clientNexus1.ClientTaskEvent = async _ => invocationCount++;
-        clientNexus2.ClientTaskEvent = async _ => invocationCount++;
+        clientNexus1.ClientTaskEvent = async _ => Interlocked.Increment(ref invocationCount);
+        clientNexus2.ClientTaskEvent = async _ => Interlocked.Increment(ref invocationCount);
 #pragma warning restore CS1998
         await server.StartAsync().Timeout(1);
 
@@ -356,7 +356,7 @@ public async Task NexusInvokesOnClients(Type type)
             connectedNexus.OnConnectedEvent = async nexus =>
             {
                 // Second connection
-                if (++connectedCount == 2)
+                if (Interlocked.Increment(ref connectedCount) == 2)
                 {
                     // ReSharper disable once AccessToModifiedClosure
                     var clientIds = server!.GetContext().Clients.GetIds().ToArray();

diff --git a/src/NexNet.IntegrationTests/Pipes/NexusDuplexPipeWriterTests.cs b/src/NexNet.IntegrationTests/Pipes/NexusDuplexPipeWriterTests.cs
@@ -89,7 +89,7 @@ public async Task WriterChunks()
 
         messenger.OnSendCustomHeaderWithBody = (type, header, body, token) =>
         {
-            if (++invocations == 2)
+            if (Interlocked.Increment(ref invocations) == 2)
                 tcs.SetResult();
 
             return default;

diff --git a/src/NexNet.IntegrationTests/Pipes/NexusServerTests_NexusDuplexPipe.cs b/src/NexNet.IntegrationTests/Pipes/NexusServerTests_NexusDuplexPipe.cs
@@ -59,7 +59,7 @@ public async Task Server_PipeReaderReceivesDataMultipleTimesWithLargeData(Type t
             var result = await pipe.Input.ReadAsync().Timeout(1);
             pipe.Input.AdvanceTo(result.Buffer.End);
 
-            if (++count == iterations)
+            if (Interlocked.Increment(ref count) == iterations)
                 tcs.SetResult();
         };