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

Fix for RunUO Crash if Performance tab on Admin gump is open within first 100seconds of server running.

Browse source 
Completion of the DynamicSaveStrategy.  Background saves are now safe; triggered only by the autoSave or command [BackgroundSave ([BGSave)
This commit is contained in:
asayre 2010-12-20 03:34:25 +00:00
parent 0afa707b24
commit 67af95cf0b
12 changed files with 169 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Server/Persistence/DualSaveStrategy.cs
View file

@ -37,18 +37,24 @@ namespace Server {
public DualSaveStrategy() {
}
public override void Save( SaveMetrics metrics ) {
public override void Save( SaveMetrics metrics, bool permitBackgroundWrite )
{
this.PermitBackgroundWrite = permitBackgroundWrite;
Thread saveThread = new Thread( delegate() {
SaveItems( metrics );
SaveItems(metrics);
} );
saveThread.Name = "Item Save Subset";
saveThread.Start();
SaveMobiles( metrics );
SaveGuilds( metrics );
SaveMobiles(metrics);
SaveGuilds(metrics);
saveThread.Join();
if (UseSequentialWriters)
World.NotifyDiskWriteComplete();
}
}
}

24
Server/Persistence/DynamicSaveStrategy.cs
View file

@ -59,7 +59,7 @@ namespace Server
_guildThreadWriters = new BlockingCollection<QueuedMemoryWriter>();
}
public override void Save(SaveMetrics metrics)
public override void Save(SaveMetrics metrics, bool permitBackgroundWrite)
{
this._metrics = metrics;
@ -73,13 +73,21 @@ namespace Server
SaveTypeDatabases();
if (permitBackgroundWrite)
{
//This option makes it finish the writing to disk in the background, continuing even after Save() returns.
Task.Factory.ContinueWhenAll(saveTasks, _ =>
{
CloseFiles();
Task.WaitAll(saveTasks); //Waits for the completion of all of the tasks(committing to disk)
CloseFiles();
//This option makes it finish the writing to disk in the background, continuing even after Save() returns. VERY DANGEROUS.
//TODO: Make this less dangerous, by notifying rest of the server that this can and does happen
//Task.Factory.ContinueWhenAll(saveTasks, _ => CloseFiles());
World.NotifyDiskWriteComplete();
});
}
else
{
Task.WaitAll(saveTasks); //Waits for the completion of all of the tasks(committing to disk)
CloseFiles();
}
}
private Task StartCommitTask(BlockingCollection<QueuedMemoryWriter> threadWriter, SequentialFileWriter data, SequentialFileWriter index)
@ -264,8 +272,6 @@ namespace Server
_guildData.Close();
_guildIndex.Close();
Console.WriteLine("Closing files");
}
private void WriteCount(SequentialFileWriter indexFile, int count)

5
Server/Persistence/ParallelSaveStrategy.cs
View file

@ -60,7 +60,8 @@ namespace Server {
private bool finished;
public override void Save( SaveMetrics metrics ) {
public override void Save(SaveMetrics metrics, bool permitBackgroundWrite)
{
this.metrics = metrics;
OpenFiles();
@ -163,6 +164,8 @@ namespace Server {
guildData.Close();
guildIndex.Close();
World.NotifyDiskWriteComplete();
}
private void OnSerialized( ConsumableEntry entry ) {

91
Server/Persistence/QueuedMemoryWriter.cs
View file

@ -25,7 +25,6 @@ using System.Text;
namespace Server
{
public sealed class QueuedMemoryWriter : BinaryFileWriter
{
private struct IndexInfo
@ -36,11 +35,11 @@ namespace Server
}
private MemoryStream _memStream;
private Queue<IndexInfo> _indexQueue = new Queue<IndexInfo>(); //TODO: Pick a more optimal starting size
private List<IndexInfo> _orderedIndexInfo = new List<IndexInfo>();
protected override int BufferSize
{
get { return 4096; }
get { return 512; }
}
public QueuedMemoryWriter()
@ -58,66 +57,70 @@ namespace Server
info.typeCode = serializable.TypeReference; //For guilds, this will automagically be zero.
info.serial = serializable.SerialIdentity;
_indexQueue.Enqueue(info);
_orderedIndexInfo.Add(info);
}
public void CommitTo(SequentialFileWriter dataFile, SequentialFileWriter indexFile)
{
this.Flush();
byte[] memBuffer = _memStream.GetBuffer();
int memLength = (int)_memStream.Position;
long actualPosition = dataFile.Position;
dataFile.Write(memBuffer, 0, memLength); //The buffer contains the data from many items.
//Console.WriteLine("Writing {0} bytes starting at {1}", memLength, actualPosition);
byte[] indexBuffer = new byte[20];
//int indexWritten = _indexQueue.Count * indexBuffer.Length;
//int totalWritten = memLength + indexWritten
while (_indexQueue.Count > 0)
if (memLength > 0)
{
IndexInfo info = _indexQueue.Dequeue();
byte[] memBuffer = _memStream.GetBuffer();
int typeCode = info.typeCode;
int serial = info.serial;
int length = info.size;
long actualPosition = dataFile.Position;
dataFile.Write(memBuffer, 0, memLength); //The buffer contains the data from many items.
//Console.WriteLine("Writing {0} bytes starting at {1}, with {2} things", memLength, actualPosition, _orderedIndexInfo.Count);
byte[] indexBuffer = new byte[20];
//int indexWritten = _orderedIndexInfo.Count * indexBuffer.Length;
//int totalWritten = memLength + indexWritten
for (int i = 0; i < _orderedIndexInfo.Count; i++)
{
IndexInfo info = _orderedIndexInfo[i];
int typeCode = info.typeCode;
int serial = info.serial;
int length = info.size;
indexBuffer[0] = (byte)(info.typeCode);
indexBuffer[1] = (byte)(info.typeCode >> 8);
indexBuffer[2] = (byte)(info.typeCode >> 16);
indexBuffer[3] = (byte)(info.typeCode >> 24);
indexBuffer[0] = (byte)(info.typeCode);
indexBuffer[1] = (byte)(info.typeCode >> 8);
indexBuffer[2] = (byte)(info.typeCode >> 16);
indexBuffer[3] = (byte)(info.typeCode >> 24);
indexBuffer[4] = (byte)(info.serial);
indexBuffer[5] = (byte)(info.serial >> 8);
indexBuffer[6] = (byte)(info.serial >> 16);
indexBuffer[7] = (byte)(info.serial >> 24);
indexBuffer[4] = (byte)(info.serial);
indexBuffer[5] = (byte)(info.serial >> 8);
indexBuffer[6] = (byte)(info.serial >> 16);
indexBuffer[7] = (byte)(info.serial >> 24);
indexBuffer[8] = (byte)(actualPosition);
indexBuffer[9] = (byte)(actualPosition >> 8);
indexBuffer[10] = (byte)(actualPosition >> 16);
indexBuffer[11] = (byte)(actualPosition >> 24);
indexBuffer[12] = (byte)(actualPosition >> 32);
indexBuffer[13] = (byte)(actualPosition >> 40);
indexBuffer[14] = (byte)(actualPosition >> 48);
indexBuffer[15] = (byte)(actualPosition >> 56);
indexBuffer[8] = (byte)(actualPosition);
indexBuffer[9] = (byte)(actualPosition >> 8);
indexBuffer[10] = (byte)(actualPosition >> 16);
indexBuffer[11] = (byte)(actualPosition >> 24);
indexBuffer[12] = (byte)(actualPosition >> 32);
indexBuffer[13] = (byte)(actualPosition >> 40);
indexBuffer[14] = (byte)(actualPosition >> 48);
indexBuffer[15] = (byte)(actualPosition >> 56);
indexBuffer[16] = (byte)(info.size);
indexBuffer[17] = (byte)(info.size >> 8);
indexBuffer[18] = (byte)(info.size >> 16);
indexBuffer[19] = (byte)(info.size >> 24);
indexBuffer[16] = (byte)(info.size);
indexBuffer[17] = (byte)(info.size >> 8);
indexBuffer[18] = (byte)(info.size >> 16);
indexBuffer[19] = (byte)(info.size >> 24);
indexFile.Write(indexBuffer, 0, indexBuffer.Length);
indexFile.Write(indexBuffer, 0, indexBuffer.Length);
actualPosition += info.size;
actualPosition += info.size;
}
}
this.Close(); //We're donezo with this writer.
this.Close(); //We're done with this writer.
}
}
}

2
Server/Persistence/SaveStrategy.cs
View file

@ -51,7 +51,7 @@ namespace Server
}
public abstract string Name { get; }
public abstract void Save(SaveMetrics metrics);
public abstract void Save(SaveMetrics metrics, bool permitBackgroundWrite);
public abstract void ProcessDecay();
}

37
Server/Persistence/StandardSaveStrategy.cs
View file

@ -35,25 +35,38 @@ namespace Server {
}
private Queue<Item> _decayQueue;
private bool _permitBackgroundWrite;
public StandardSaveStrategy() {
_decayQueue = new Queue<Item>();
}
public override void Save( SaveMetrics metrics ) {
SaveMobiles( metrics );
SaveItems( metrics );
SaveGuilds( metrics );
protected bool PermitBackgroundWrite { get { return _permitBackgroundWrite; } set { _permitBackgroundWrite = value; } }
protected bool UseSequentialWriters { get { return (World.SaveType == World.SaveOption.Normal || !_permitBackgroundWrite); } }
public override void Save(SaveMetrics metrics, bool permitBackgroundWrite)
{
_permitBackgroundWrite = permitBackgroundWrite;
SaveMobiles(metrics);
SaveItems(metrics);
SaveGuilds(metrics);
if (UseSequentialWriters)
World.NotifyDiskWriteComplete();
}
protected void SaveMobiles( SaveMetrics metrics ) {
protected void SaveMobiles(SaveMetrics metrics)
{
Dictionary<Serial, Mobile> mobiles = World.Mobiles;
GenericWriter idx;
GenericWriter tdb;
GenericWriter bin;
if ( World.SaveType == World.SaveOption.Normal ) {
if (UseSequentialWriters)
{
idx = new BinaryFileWriter( World.MobileIndexPath, false );
tdb = new BinaryFileWriter( World.MobileTypesPath, false );
bin = new BinaryFileWriter( World.MobileDataPath, true );
@ -92,7 +105,8 @@ namespace Server {
bin.Close();
}
protected void SaveItems( SaveMetrics metrics ) {
protected void SaveItems(SaveMetrics metrics)
{
Dictionary<Serial, Item> items = World.Items;
List<Item> decaying = new List<Item>();
@ -100,7 +114,8 @@ namespace Server {
GenericWriter tdb;
GenericWriter bin;
if ( World.SaveType == World.SaveOption.Normal ) {
if (UseSequentialWriters)
{
idx = new BinaryFileWriter( World.ItemIndexPath, false );
tdb = new BinaryFileWriter( World.ItemTypesPath, false );
bin = new BinaryFileWriter( World.ItemDataPath, true );
@ -142,11 +157,13 @@ namespace Server {
bin.Close();
}
protected void SaveGuilds( SaveMetrics metrics ) {
protected void SaveGuilds(SaveMetrics metrics)
{
GenericWriter idx;
GenericWriter bin;
if ( World.SaveType == World.SaveOption.Normal ) {
if (UseSequentialWriters)
{
idx = new BinaryFileWriter( World.GuildIndexPath, false );
bin = new BinaryFileWriter( World.GuildDataPath, true );
} else {