Fix rare deadlock / stream corruption that could occur

Ninjastorm380 · Mar 8, 2022 · dc03d7a · dc03d7a
1 parent 3220385
commit dc03d7a
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 11 deletions.
diff --git a/Maelstrom/Source/Socket/Methods.vb b/Maelstrom/Source/Socket/Methods.vb
@@ -327,9 +327,7 @@ Public Partial Class Socket
         If Manager.Contains(Index) = False Then _
             Throw New ArgumentException("Parameter 'Index' referrs to a non-existent stream!")
         SyncLock ReadLock
-            If Manager.Value(Index).Length >= 16
-                Return True
-            Else
+            If Manager.Value(Index).Length < 16
                 If NetSocket.Available = 0 then Return False
                 If WaitForData(16) = False Then Return False
                 Read(SeekDataHeader, 0, 16)
@@ -345,14 +343,18 @@ Public Partial Class Socket
                     Manager.Value(SeekIsMuxed).Write(SeekPaddedData, SeekPaddedLength)
                 End If
                 Return (Index = SeekIsMuxed) And Manager.Contains(SeekIsMuxed)
+            Else
+                Manager.Value(Index).Read(SeekDataHeader, 16, 0)
+                UnpackInt32(SeekDataHeader, SeekPaddedLength, 0)
+                If Manager.Value(Index).Length < 16 + SeekPaddedLength Then Return False Else Return True 
             End If
         End SyncLock
     End Function
 
     Private Function WaitForData(Amount as Int32) as Boolean
         Dim WaitCounter = 0
-        Const WaitLimit As Integer = 1 * 1000
-        Dim WaitGovernor as new Governor(1000)
+        Const WaitLimit As Integer = 1 * 30
+        Dim WaitGovernor as new Governor(30)
         Do While True 
             Dim Available as Int32 = NetSocket.Available
             If WaitCounter = 0 Then

diff --git a/Maelstrom/bin/Release/netstandard2.0/Maelstrom.dll b/Maelstrom/bin/Release/netstandard2.0/Maelstrom.dll
diff --git a/Maelstrom/obj/Release/netstandard2.0/Maelstrom.dll b/Maelstrom/obj/Release/netstandard2.0/Maelstrom.dll
diff --git a/Maelstrom/obj/Release/netstandard2.0/Maelstrom.vbprojAssemblyReference.cache b/Maelstrom/obj/Release/netstandard2.0/Maelstrom.vbprojAssemblyReference.cache
diff --git a/Maelstrom/obj/rider.project.restore.info b/Maelstrom/obj/rider.project.restore.info
@@ -1 +1 @@
-16462729035394077
+16462738984788879
diff --git a/MaelstromTests/TestClient.vb b/MaelstromTests/TestClient.vb
@@ -16,9 +16,24 @@ Friend Class TestClient : Inherits ClientBase
     Protected Overrides Sub OnConnectionMain(Socket As Socket)
         Dim Governor as new Governor(10)
         for x= 0 to P.Length -1 
-            P(x)= {1,1,1,1}
+            P(x)= {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}
         Next
-        for x = 0 to 7
+        for x = 0 to 199
             CreateAsyncInstance(Socket,x)
         Next
 

diff --git a/MaelstromTests/TestServer.vb b/MaelstromTests/TestServer.vb
@@ -12,7 +12,7 @@ Friend Class TestServer : Inherits ServerBase
 
     Protected Overrides Sub OnConnectionMain(Socket As Socket)
         Dim Governor as new Governor(10)
-        for x = 0 to 7
+        for x = 0 to 199
             CreateAsyncInstance(Socket,x)
         Next
         Do While Socket.Connected = True And Online = True
@@ -27,7 +27,22 @@ Friend Class TestServer : Inherits ServerBase
     Protected Overrides Sub OnServerOnline()
 
         for x= 0 to P.Length -1 
-            P(x)= {1,1,1,1}
+            P(x)= {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+                   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}
         Next
         Console.WriteLine("DEBUG - SERVER: server is now online")
     End Sub

diff --git a/MaelstromTests/bin/Release/netcoreapp3.1/Maelstrom.dll b/MaelstromTests/bin/Release/netcoreapp3.1/Maelstrom.dll
diff --git a/MaelstromTests/bin/Release/netcoreapp3.1/MaelstromTests.dll b/MaelstromTests/bin/Release/netcoreapp3.1/MaelstromTests.dll
diff --git a/MaelstromTests/bin/Release/netcoreapp3.1/MaelstromTests.pdb b/MaelstromTests/bin/Release/netcoreapp3.1/MaelstromTests.pdb
diff --git a/MaelstromTests/obj/Release/netcoreapp3.1/MaelstromTests.dll b/MaelstromTests/obj/Release/netcoreapp3.1/MaelstromTests.dll
diff --git a/MaelstromTests/obj/Release/netcoreapp3.1/MaelstromTests.pdb b/MaelstromTests/obj/Release/netcoreapp3.1/MaelstromTests.pdb
diff --git a/MaelstromTests/obj/Release/netcoreapp3.1/MaelstromTests.vbprojAssemblyReference.cache b/MaelstromTests/obj/Release/netcoreapp3.1/MaelstromTests.vbprojAssemblyReference.cache
diff --git a/MaelstromTests/obj/rider.project.restore.info b/MaelstromTests/obj/rider.project.restore.info
@@ -1 +1 @@
-16462729035394077
+16462738984788879