warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes serializing strings and uses memory mapped files for loading (#1133)

Browse source
This commit is contained in:
Kamron Batman 2022-08-16 08:59:00 -07:00 • committed by GitHub
parent bc746dbf14
commit 2ae762904f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 363 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/Server/World/EntityPersistence.cs
View file

@ -16,6 +16,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.MemoryMappedFiles;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
@ -177,12 +178,13 @@ namespace Server
string dataPath = Path.Combine(path, indexType, $"{indexType}.bin");
if (!File.Exists(dataPath))
if (!File.Exists(dataPath) || new FileInfo(dataPath).Length == 0)
{
return;
}
using FileStream bin = new FileStream(dataPath, FileMode.Open, FileAccess.Read, FileShare.Read);
using var mmf = MemoryMappedFile.CreateFromFile(dataPath, FileMode.Open);
using var stream = mmf.CreateViewStream();
BufferReader br = null;
var deleteAllFailures = false;
@ -192,7 +194,7 @@ namespace Server
T t = entry.Entity;
var position = entry.Position;
bin.Seek(position, SeekOrigin.Begin);
stream.Seek(position, SeekOrigin.Begin);
// Skip this entry
if (t == null)
@ -216,7 +218,7 @@ namespace Server
br.Reset(buffer, out _);
}
bin.Read(buffer.AsSpan());
stream.Read(buffer.AsSpan());
string error;
try