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

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

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)