epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize ComputeHash by removing Concat() and ToArray() calls

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-04-23 03:48:49 +03:00
parent 2d8cd8299f
commit 9dc2b3cd76
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Game/Map/Map.cs
View File

@@ -431,13 +431,20 @@ namespace OpenRA
string ComputeHash() string ComputeHash()
{ {
// UID is calculated by taking an SHA1 of the yaml and binary data // UID is calculated by taking an SHA1 of the yaml and binary data
// Read the relevant data into a buffer
var data = Container.GetContent("map.yaml").ReadAllBytes() using (var ms = new MemoryStream())
.Concat(Container.GetContent("map.bin").ReadAllBytes()).ToArray(); {
// Read the relevant data into the buffer
using (var s = Container.GetContent("map.yaml"))
s.CopyTo(ms);
using (var s = Container.GetContent("map.bin"))
s.CopyTo(ms);
// Take the SHA1 // Take the SHA1
ms.Seek(0, SeekOrigin.Begin);
using (var csp = SHA1.Create()) using (var csp = SHA1.Create())
return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray()); return new string(csp.ComputeHash(ms).SelectMany(a => a.ToString("x2")).ToArray());
}
} }
public void MakeDefaultPlayers() public void MakeDefaultPlayers()