c2143584bc
- [X] Fixes an issue in BufferWriter where if SeekOrigin.End is used, it will yield the wrong index. - [X] Changes BinaryFileWriter to dispose pattern - [X] Removes World.SaveBuffers. They were dangerous and should be done in-line while the world is loading, even if it is slower - [X] Fixes BufferReader Seek too - [X] Changes BufferWriter to use uninitialized arrays to speed up resizing - [X] Changes World loading so it doesn't buffer the whole file, even if it makes things slower. It lowers allocations/fragmentation over all which is good. - [X] Changes World Loading to use uninitialized arrays and directly saves them to the SaveBuffer which eliminates having to open/load the files _again_ which is dangerous. Also looping through items while the world is running is dangerous since async references can and will cause exceptions. Bumps release version
74 lines
2.3 KiB
C#
74 lines
2.3 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2020 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: BufferedFileWriter.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.IO;
|
|
|
|
namespace Server
|
|
{
|
|
public class BinaryFileWriter : BufferWriter, IDisposable
|
|
{
|
|
private readonly Stream _file;
|
|
private long _position;
|
|
|
|
public BinaryFileWriter(string filename, bool prefixStr) :
|
|
this(new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None), prefixStr)
|
|
{}
|
|
|
|
public BinaryFileWriter(Stream stream, bool prefixStr) : base(prefixStr)
|
|
{
|
|
_file = stream;
|
|
_position = _file.Position;
|
|
}
|
|
|
|
public override long Position => _position + Index;
|
|
|
|
|
|
protected override int BufferSize => 81920;
|
|
|
|
public override void Flush()
|
|
{
|
|
if (Index > 0)
|
|
{
|
|
_position += Index;
|
|
|
|
_file.Write(Buffer, 0, (int)Index);
|
|
Index = 0;
|
|
}
|
|
}
|
|
|
|
public override void Close()
|
|
{
|
|
if (Index > 0)
|
|
{
|
|
Flush();
|
|
}
|
|
|
|
_file.Close();
|
|
}
|
|
|
|
public override long Seek(long offset, SeekOrigin origin)
|
|
{
|
|
Flush();
|
|
|
|
return _position = _file.Seek(offset, origin);
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Close();
|
|
}
|
|
}
|
|
}
|