Add Semaphore to address #23

.github/workflows/build.yml

@@ -1,9 +1,10 @@
 name: .NET Build & Test
 
 on:
-  - push
-  - pull_request
-  - workflow_call
+  push:
+  pull_request:
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   build:
@@ -20,7 +21,7 @@ jobs:
       with:
         dotnet-version: 6.0.x
 
-    - uses: dotnet/nbgv@main
+    - uses: dotnet/nbgv@v0.4.1
       id: nbgv
 
     - name: Restore dependencies

Nodsoft.WowsReplaysUnpack.Console/Program.cs

@@ -13,6 +13,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
+using System.Threading.Tasks;
 
 string samplePath = Path.Join(Directory.GetCurrentDirectory(), "../../../..", "Replay-Samples");
 FileStream _GetReplayFile(string name) => File.OpenRead(Path.Join(samplePath, name));
@@ -49,6 +50,30 @@
 //	Console.WriteLine($"[{GetGroupString(msg)}] {msg.EntityId} : {msg.MessageContent}");
 //}
 
+const int CYCLE = 20;
+async Task<UnpackedReplay[]> syncTasks(bool sync)
+{
+	List<UnpackedReplay> unpackedReplays = new List<UnpackedReplay>();
+	if (sync)
+	{
+		for (int i = 0; i < CYCLE; i++)
+		{
+			replayUnpacker.GetUnpacker().Unpack(_GetReplayFile("good.wowsreplay"));
+		}
+	}
+	else
+	{	
+		Parallel.ForEach(Enumerable.Range(0, CYCLE), (i) =>
+		{
+			unpackedReplays.Add(replayUnpacker.GetUnpacker().Unpack(_GetReplayFile("good.wowsreplay")));
+		});
+	}
+	return unpackedReplays.ToArray();
+}
+
+DateTime start = DateTime.Now;
+await syncTasks(false);
+Console.WriteLine(DateTime.Now - start);
 
 var goodReplay = replayUnpacker.GetUnpacker().Unpack(_GetReplayFile("good.wowsreplay"));
 var alphaReplay = replayUnpacker.GetUnpacker().Unpack(_GetReplayFile("press_account_alpha.wowsreplay"));
@@ -79,14 +104,14 @@
 
 public class BattleLogic
 {
 	public Statee State { get; set; }
 	public class Statee
 	{
 		[DataMember(Name = "missions")]
 		public Missions _missions { get; set; }
 		public class Missions
 		{
 			public List<TeamsScore> teamsScore { get; set; }
 			public class TeamsScore
 			{
 				public ushort score { get; set; }
@@ -96,10 +121,10 @@
 }
 public static class ext
 {
 	public static FixedDictionary GetAsDict(this Dictionary<string, object?> dict, string key) => dict[key] as FixedDictionary;
 	public static FixedList GetAsArr(this Dictionary<string, object?> dict, string key) => dict[key] as FixedList;
 	public static FixedDictionary GetAsDict(this FixedList list, int index) => list[index] as FixedDictionary;
 	public static T GetAsValue<T>(this FixedDictionary dict, string key) => (T)dict[key];
 }
 
 //static string GetGroupString(ReplayMessage msg) => msg.MessageGroup switch

Nodsoft.WowsReplaysUnpack.Tests/ReplayParsingExecutionTests.cs

@@ -5,10 +5,6 @@
 using Xunit;
 
 
-/*
- * FIXME: Test parallelization is disabled due to a file loading issue.
- */
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
 namespace Nodsoft.WowsReplaysUnpack.Tests;
 
 /// <summary>

Nodsoft.WowsReplaysUnpack/Services/ReplayUnpackerService.cs

@@ -8,6 +8,7 @@
 using System.IO.Compression;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
 
 namespace Nodsoft.WowsReplaysUnpack.Services;
 
@@ -21,6 +22,7 @@ public sealed class ReplayUnpackerService<TController> : ReplayUnpackerService,
 	private readonly JsonSerializerOptions _jsonSerializerOptions = new() { PropertyNameCaseInsensitive = true };
 	private readonly IReplayDataParser _replayDataParser;
 	private readonly IReplayController _replayController;
+	private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1);
 
 	public ReplayUnpackerService(IReplayDataParser replayDataParser, TController replayController)
 	{
@@ -69,12 +71,13 @@ Seek to offset 4 in the replay file (skipping the magic number)
 		See http://wiki.vbaddict.net/pages/File_Replays for more details.
 		*/
 		options ??= new();
-
+		_semaphore.Wait();
 		BinaryReader binaryReader = new(stream);
 
 		byte[] signature = binaryReader.ReadBytes(4);
 		int jsonBlockCount = binaryReader.ReadInt32();
 
+		_semaphore.Release();
 		// Verify replay signature
 		if (!signature.SequenceEqual(ReplaySignature))
 		{
@@ -84,11 +87,13 @@ Seek to offset 4 in the replay file (skipping the magic number)
 		// The first block is the arena info
 		// Read it and create the unpacked replay model
 		UnpackedReplay replay = _replayController.CreateUnpackedReplay(ReadJsonBlock<ArenaInfo>(binaryReader));
+		_semaphore.Wait();
 		ReadExtraJsonBlocks(replay, binaryReader, jsonBlockCount);
 
 		MemoryStream decryptedStream = new();
 		Decrypt(binaryReader, decryptedStream);
 
+		_semaphore.Release();
 		// Initial stream and reader not used anymore
 		binaryReader.Dispose();
 
@@ -99,11 +104,12 @@ Seek to offset 4 in the replay file (skipping the magic number)
 		decryptedStream.Dispose();
 
 
+		_semaphore.Wait();
 		foreach (NetworkPacketBase networkPacket in _replayDataParser.ParseNetworkPackets(replayDataStream, options))
 		{
 			_replayController.HandleNetworkPacket(networkPacket, options);
 		}
-
+		_semaphore.Release();
 		return replay;
 	}