## Changes * Improves type hashing by introducing xxHash3 (64bit) * Removes individual `tdb` files in favor of a single `SerializedTypes.db` file. This file is only used to identify a type that is being deserialized, which doesn't exist. * Adds duplicate type alias detection * Adds `AssemblyHandler.FindTypeByHash` View changed files whitespaces: https://github.com/modernuo/ModernUO/pull/1172/files?diff=split&w=1 ## SerializedTypes.db The serialized types file is used to get back the original name of a type in case it no longer exists in code. This can easily be necessary if a class is renamed in code and no `TypeAlias` is provided. ### Format byte[4] - version byte[4] - count --array-- byte[8] - xxHash byte[1] - flag, 0 - null, 1 - not null byte[n] - Full class name in UTF8 ### Example <img width="472" alt="SerializedTypes_Example" src="https://user-images.githubusercontent.com/3953314/195255429-31d24293-6bd1-419e-811b-07874dd0f78d.png"> ## Benchmarks Serialized 500 Type fields. The 8192bytes comes from the _ConcurrentQueue_ that would later be used for SerializedTypes. Note that the queue is never cleared, so it's size grew considerably. ```cs | Method | Mean | Error | StdDev | Allocated | |--------------------- |---------:|---------:|---------:|----------:| | BenchmarkXXHash | 18.44 us | 0.278 us | 0.260 us | 8192 B | | BenchmarkTypeStrings | 25.09 us | 0.292 us | 0.259 us | - | ``` TODO: * Add support in the Serialization Generator for `ReadType()` and `Write(Type)` * Remove `SetTypeRef` from Serialization Generator
181 lines
6.1 KiB
C#
181 lines
6.1 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2022 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: BinaryFileReader.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Runtime.CompilerServices;
|
|
using System.Text;
|
|
using Server.Buffers;
|
|
using Server.Collections;
|
|
using Server.Logging;
|
|
using Server.Text;
|
|
|
|
namespace Server;
|
|
|
|
public class BinaryFileReader : IGenericReader, IDisposable
|
|
{
|
|
private static readonly ILogger logger = LogFactory.GetLogger(typeof(BinaryFileReader));
|
|
|
|
private Dictionary<ulong, string> _typesDb;
|
|
private BinaryReader _reader;
|
|
private Encoding _encoding;
|
|
|
|
public BinaryFileReader(BinaryReader br, Dictionary<ulong, string> typesDb = null, Encoding encoding = null)
|
|
{
|
|
_reader = br;
|
|
_encoding = encoding ?? TextEncoding.UTF8;
|
|
_typesDb = typesDb;
|
|
}
|
|
|
|
public BinaryFileReader(Stream stream, Dictionary<ulong, string> typesDb = null, Encoding encoding = null)
|
|
: this(new BinaryReader(stream), typesDb, encoding)
|
|
{
|
|
}
|
|
|
|
public long Position => _reader.BaseStream.Position;
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public void Close() => _reader.Close();
|
|
|
|
public DateTime LastSerialized { get; init; }
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public string ReadString(bool intern = false) => ReadBool() ? ReadStringRaw(intern) : null;
|
|
|
|
public string ReadStringRaw(bool intern = false)
|
|
{
|
|
var length = ((IGenericReader)this).ReadEncodedInt();
|
|
if (length <= 0)
|
|
{
|
|
return "".Intern();
|
|
}
|
|
|
|
byte[] buffer = STArrayPool<byte>.Shared.Rent(length);
|
|
var str = TextEncoding.GetString(buffer.AsSpan(0, length), _encoding);
|
|
STArrayPool<byte>.Shared.Return(buffer);
|
|
return intern ? str.Intern() : str;
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public long ReadLong() => _reader.ReadInt64();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public ulong ReadULong() => _reader.ReadUInt64();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public int ReadInt() => _reader.ReadInt32();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public uint ReadUInt() => _reader.ReadUInt32();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public short ReadShort() => _reader.ReadInt16();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public ushort ReadUShort() => _reader.ReadUInt16();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public double ReadDouble() => _reader.ReadDouble();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public float ReadFloat() => _reader.ReadSingle();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public byte ReadByte() => _reader.ReadByte();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public sbyte ReadSByte() => _reader.ReadSByte();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public bool ReadBool() => _reader.ReadBoolean();
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public Serial ReadSerial() => (Serial)_reader.ReadUInt32();
|
|
|
|
public Type ReadType() =>
|
|
ReadByte() switch
|
|
{
|
|
0 => null,
|
|
1 => AssemblyHandler.FindTypeByFullName(ReadStringRaw()), // Backward compatibility
|
|
2 => ReadTypeByHash()
|
|
};
|
|
|
|
public Type ReadTypeByHash()
|
|
{
|
|
var hash = ReadULong();
|
|
var t = AssemblyHandler.FindTypeByHash(hash);
|
|
|
|
if (t != null)
|
|
{
|
|
return t;
|
|
}
|
|
|
|
if (_typesDb == null)
|
|
{
|
|
logger.Error(
|
|
new Exception($"The file SerializedTypes.db was not loaded. Type hash '{hash}' could not be found."),
|
|
"Invalid {Hash} at position {Position}",
|
|
hash,
|
|
Position
|
|
);
|
|
|
|
return null;
|
|
}
|
|
|
|
if (!_typesDb.TryGetValue(hash, out var typeName))
|
|
{
|
|
logger.Error(
|
|
new Exception($"Type hash '{hash}' is not present in the serialized types database."),
|
|
"Invalid type hash {Hash} at position {Position}",
|
|
hash,
|
|
Position
|
|
);
|
|
|
|
return null;
|
|
}
|
|
|
|
t = AssemblyHandler.FindTypeByFullName(typeName, false);
|
|
|
|
if (t == null)
|
|
{
|
|
logger.Error(
|
|
new Exception($"Type '{typeName}' was not found."),
|
|
"Type {Type} was not found.",
|
|
typeName
|
|
);
|
|
}
|
|
|
|
return t;
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public int Read(Span<byte> buffer) => _reader.Read(buffer);
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public BitArray ReadBitArray()
|
|
{
|
|
var length = ((IGenericReader)this).ReadEncodedInt();
|
|
|
|
// BinaryReader doesn't expose a Span slice of the buffer, so we use a custom ctor
|
|
return new BitArray(_reader, length);
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public long Seek(long offset, SeekOrigin origin) => _reader.BaseStream.Seek(offset, origin);
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public void Dispose() => Close();
|
|
}
|