vinzenz/servicepoint-tanks
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix concurrent map service access

Browse source
This commit is contained in:
Vinzenz Schroeter 2024-05-07 20:41:21 +02:00
parent 053bfb0d92
commit 6d8bf89f73
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tanks-backend/TanksServer/GameLogic/MapService.cs
View file

@ -1,3 +1,4 @@
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.IO; using System.IO;
using DisplayCommands; using DisplayCommands;
@ -13,8 +14,8 @@ internal sealed class MapService
public const ushort PixelsPerRow = TilesPerRow * TileSize; public const ushort PixelsPerRow = TilesPerRow * TileSize;
public const ushort PixelsPerColumn = TilesPerColumn * TileSize; public const ushort PixelsPerColumn = TilesPerColumn * TileSize;
private readonly Dictionary<string, MapPrototype> _mapPrototypes = new(); private readonly ConcurrentDictionary<string, MapPrototype> _mapPrototypes = new();
private readonly Dictionary<string, PixelGrid> _mapPreviews = new(); private readonly ConcurrentDictionary<string, PixelGrid> _mapPreviews = new();
public IEnumerable<string> MapNames => _mapPrototypes.Keys; public IEnumerable<string> MapNames => _mapPrototypes.Keys;
@ -52,7 +53,8 @@ internal sealed class MapService
{ {
var name = MapNameFromFilePath(file); var name = MapNameFromFilePath(file);
var prototype = new SpriteMapPrototype(name, Sprite.FromImageFile(file)); var prototype = new SpriteMapPrototype(name, Sprite.FromImageFile(file));
_mapPrototypes.Add(name, prototype); var added = _mapPrototypes.TryAdd(name, prototype);
Debug.Assert(added);
} }
private void LoadMapString(string file) private void LoadMapString(string file)
@ -60,7 +62,7 @@ internal sealed class MapService
var name = MapNameFromFilePath(file); var name = MapNameFromFilePath(file);
var map = File.ReadAllText(file).ReplaceLineEndings(string.Empty).Trim(); var map = File.ReadAllText(file).ReplaceLineEndings(string.Empty).Trim();
var prototype = new TextMapPrototype(name, map); var prototype = new TextMapPrototype(name, map);
_mapPrototypes.Add(name, prototype); _mapPrototypes.TryAdd(name, prototype);
} }
private static string MapNameFromFilePath(string filePath) => Path.GetFileName(filePath).ToUpperInvariant(); private static string MapNameFromFilePath(string filePath) => Path.GetFileName(filePath).ToUpperInvariant();