Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -22,180 +22,191 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using Server.Guilds;
|
||||
|
||||
namespace Server {
|
||||
public class StandardSaveStrategy : SaveStrategy {
|
||||
public enum SaveOption
|
||||
{
|
||||
Normal,
|
||||
Threaded
|
||||
}
|
||||
namespace Server
|
||||
{
|
||||
public class StandardSaveStrategy : SaveStrategy
|
||||
{
|
||||
public enum SaveOption
|
||||
{
|
||||
Normal,
|
||||
Threaded
|
||||
}
|
||||
|
||||
public static SaveOption SaveType = SaveOption.Normal;
|
||||
public static SaveOption SaveType = SaveOption.Normal;
|
||||
|
||||
public override string Name => "Standard";
|
||||
private Queue<Item> _decayQueue;
|
||||
|
||||
private Queue<Item> _decayQueue;
|
||||
public StandardSaveStrategy()
|
||||
{
|
||||
_decayQueue = new Queue<Item>();
|
||||
}
|
||||
|
||||
public StandardSaveStrategy() {
|
||||
_decayQueue = new Queue<Item>();
|
||||
}
|
||||
public override string Name => "Standard";
|
||||
|
||||
protected bool PermitBackgroundWrite { get; set; }
|
||||
protected bool PermitBackgroundWrite{ get; set; }
|
||||
|
||||
protected bool UseSequentialWriters => (SaveType == SaveOption.Normal || !PermitBackgroundWrite);
|
||||
protected bool UseSequentialWriters => SaveType == SaveOption.Normal || !PermitBackgroundWrite;
|
||||
|
||||
public override void Save(SaveMetrics metrics, bool permitBackgroundWrite)
|
||||
{
|
||||
PermitBackgroundWrite = permitBackgroundWrite;
|
||||
public override void Save(SaveMetrics metrics, bool permitBackgroundWrite)
|
||||
{
|
||||
PermitBackgroundWrite = permitBackgroundWrite;
|
||||
|
||||
SaveMobiles(metrics);
|
||||
SaveItems(metrics);
|
||||
SaveGuilds(metrics);
|
||||
SaveMobiles(metrics);
|
||||
SaveItems(metrics);
|
||||
SaveGuilds(metrics);
|
||||
|
||||
if (permitBackgroundWrite && UseSequentialWriters) //If we're permitted to write in the background, but we don't anyways, then notify.
|
||||
World.NotifyDiskWriteComplete();
|
||||
}
|
||||
if (permitBackgroundWrite && UseSequentialWriters
|
||||
) //If we're permitted to write in the background, but we don't anyways, then notify.
|
||||
World.NotifyDiskWriteComplete();
|
||||
}
|
||||
|
||||
protected void SaveMobiles(SaveMetrics metrics)
|
||||
{
|
||||
Dictionary<Serial, Mobile> mobiles = World.Mobiles;
|
||||
protected void SaveMobiles(SaveMetrics metrics)
|
||||
{
|
||||
Dictionary<Serial, Mobile> mobiles = World.Mobiles;
|
||||
|
||||
GenericWriter idx;
|
||||
GenericWriter tdb;
|
||||
GenericWriter bin;
|
||||
GenericWriter idx;
|
||||
GenericWriter tdb;
|
||||
GenericWriter bin;
|
||||
|
||||
if (UseSequentialWriters)
|
||||
{
|
||||
idx = new BinaryFileWriter( World.MobileIndexPath, false );
|
||||
tdb = new BinaryFileWriter( World.MobileTypesPath, false );
|
||||
bin = new BinaryFileWriter( World.MobileDataPath, true );
|
||||
} else {
|
||||
idx = new AsyncWriter( World.MobileIndexPath, false );
|
||||
tdb = new AsyncWriter( World.MobileTypesPath, false );
|
||||
bin = new AsyncWriter( World.MobileDataPath, true );
|
||||
}
|
||||
if (UseSequentialWriters)
|
||||
{
|
||||
idx = new BinaryFileWriter(World.MobileIndexPath, false);
|
||||
tdb = new BinaryFileWriter(World.MobileTypesPath, false);
|
||||
bin = new BinaryFileWriter(World.MobileDataPath, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
idx = new AsyncWriter(World.MobileIndexPath, false);
|
||||
tdb = new AsyncWriter(World.MobileTypesPath, false);
|
||||
bin = new AsyncWriter(World.MobileDataPath, true);
|
||||
}
|
||||
|
||||
idx.Write( ( int ) mobiles.Count );
|
||||
foreach ( Mobile m in mobiles.Values ) {
|
||||
long start = bin.Position;
|
||||
idx.Write(mobiles.Count);
|
||||
foreach (Mobile m in mobiles.Values)
|
||||
{
|
||||
long start = bin.Position;
|
||||
|
||||
idx.Write( ( int ) m.m_TypeRef );
|
||||
idx.Write( ( int ) m.Serial );
|
||||
idx.Write( ( long ) start );
|
||||
idx.Write(m.m_TypeRef);
|
||||
idx.Write(m.Serial);
|
||||
idx.Write(start);
|
||||
|
||||
m.Serialize( bin );
|
||||
m.Serialize(bin);
|
||||
|
||||
metrics?.OnMobileSaved( ( int ) ( bin.Position - start ) );
|
||||
metrics?.OnMobileSaved((int)(bin.Position - start));
|
||||
|
||||
idx.Write( ( int ) ( bin.Position - start ) );
|
||||
idx.Write((int)(bin.Position - start));
|
||||
|
||||
m.FreeCache();
|
||||
}
|
||||
m.FreeCache();
|
||||
}
|
||||
|
||||
tdb.Write( ( int ) World.m_MobileTypes.Count );
|
||||
tdb.Write(World.m_MobileTypes.Count);
|
||||
|
||||
for ( int i = 0; i < World.m_MobileTypes.Count; ++i )
|
||||
tdb.Write( World.m_MobileTypes[i].FullName );
|
||||
for (int i = 0; i < World.m_MobileTypes.Count; ++i)
|
||||
tdb.Write(World.m_MobileTypes[i].FullName);
|
||||
|
||||
idx.Close();
|
||||
tdb.Close();
|
||||
bin.Close();
|
||||
}
|
||||
idx.Close();
|
||||
tdb.Close();
|
||||
bin.Close();
|
||||
}
|
||||
|
||||
protected void SaveItems(SaveMetrics metrics)
|
||||
{
|
||||
Dictionary<Serial, Item> items = World.Items;
|
||||
protected void SaveItems(SaveMetrics metrics)
|
||||
{
|
||||
Dictionary<Serial, Item> items = World.Items;
|
||||
|
||||
GenericWriter idx;
|
||||
GenericWriter tdb;
|
||||
GenericWriter bin;
|
||||
GenericWriter idx;
|
||||
GenericWriter tdb;
|
||||
GenericWriter bin;
|
||||
|
||||
if (UseSequentialWriters)
|
||||
{
|
||||
idx = new BinaryFileWriter( World.ItemIndexPath, false );
|
||||
tdb = new BinaryFileWriter( World.ItemTypesPath, false );
|
||||
bin = new BinaryFileWriter( World.ItemDataPath, true );
|
||||
} else {
|
||||
idx = new AsyncWriter( World.ItemIndexPath, false );
|
||||
tdb = new AsyncWriter( World.ItemTypesPath, false );
|
||||
bin = new AsyncWriter( World.ItemDataPath, true );
|
||||
}
|
||||
if (UseSequentialWriters)
|
||||
{
|
||||
idx = new BinaryFileWriter(World.ItemIndexPath, false);
|
||||
tdb = new BinaryFileWriter(World.ItemTypesPath, false);
|
||||
bin = new BinaryFileWriter(World.ItemDataPath, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
idx = new AsyncWriter(World.ItemIndexPath, false);
|
||||
tdb = new AsyncWriter(World.ItemTypesPath, false);
|
||||
bin = new AsyncWriter(World.ItemDataPath, true);
|
||||
}
|
||||
|
||||
idx.Write( ( int ) items.Count );
|
||||
idx.Write(items.Count);
|
||||
|
||||
DateTime n = DateTime.UtcNow;
|
||||
DateTime n = DateTime.UtcNow;
|
||||
|
||||
foreach ( Item item in items.Values ) {
|
||||
if (item.Decays && item.Parent == null && item.Map != Map.Internal && (item.LastMoved + item.DecayTime) <= n)
|
||||
{
|
||||
_decayQueue.Enqueue( item );
|
||||
}
|
||||
foreach (Item item in items.Values)
|
||||
{
|
||||
if (item.Decays && item.Parent == null && item.Map != Map.Internal && item.LastMoved + item.DecayTime <= n)
|
||||
_decayQueue.Enqueue(item);
|
||||
|
||||
long start = bin.Position;
|
||||
long start = bin.Position;
|
||||
|
||||
idx.Write( ( int ) item.m_TypeRef );
|
||||
idx.Write( ( int ) item.Serial );
|
||||
idx.Write( ( long ) start );
|
||||
idx.Write(item.m_TypeRef);
|
||||
idx.Write(item.Serial);
|
||||
idx.Write(start);
|
||||
|
||||
item.Serialize( bin );
|
||||
item.Serialize(bin);
|
||||
|
||||
metrics?.OnItemSaved( ( int ) ( bin.Position - start ) );
|
||||
metrics?.OnItemSaved((int)(bin.Position - start));
|
||||
|
||||
idx.Write( ( int ) ( bin.Position - start ) );
|
||||
idx.Write((int)(bin.Position - start));
|
||||
|
||||
item.FreeCache();
|
||||
}
|
||||
item.FreeCache();
|
||||
}
|
||||
|
||||
tdb.Write( ( int ) World.m_ItemTypes.Count );
|
||||
for ( int i = 0; i < World.m_ItemTypes.Count; ++i )
|
||||
tdb.Write( World.m_ItemTypes[i].FullName );
|
||||
tdb.Write(World.m_ItemTypes.Count);
|
||||
for (int i = 0; i < World.m_ItemTypes.Count; ++i)
|
||||
tdb.Write(World.m_ItemTypes[i].FullName);
|
||||
|
||||
idx.Close();
|
||||
tdb.Close();
|
||||
bin.Close();
|
||||
}
|
||||
idx.Close();
|
||||
tdb.Close();
|
||||
bin.Close();
|
||||
}
|
||||
|
||||
protected void SaveGuilds(SaveMetrics metrics)
|
||||
{
|
||||
GenericWriter idx;
|
||||
GenericWriter bin;
|
||||
protected void SaveGuilds(SaveMetrics metrics)
|
||||
{
|
||||
GenericWriter idx;
|
||||
GenericWriter bin;
|
||||
|
||||
if (UseSequentialWriters)
|
||||
{
|
||||
idx = new BinaryFileWriter( World.GuildIndexPath, false );
|
||||
bin = new BinaryFileWriter( World.GuildDataPath, true );
|
||||
} else {
|
||||
idx = new AsyncWriter( World.GuildIndexPath, false );
|
||||
bin = new AsyncWriter( World.GuildDataPath, true );
|
||||
}
|
||||
if (UseSequentialWriters)
|
||||
{
|
||||
idx = new BinaryFileWriter(World.GuildIndexPath, false);
|
||||
bin = new BinaryFileWriter(World.GuildDataPath, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
idx = new AsyncWriter(World.GuildIndexPath, false);
|
||||
bin = new AsyncWriter(World.GuildDataPath, true);
|
||||
}
|
||||
|
||||
idx.Write( ( int ) BaseGuild.List.Count );
|
||||
foreach ( BaseGuild guild in BaseGuild.List.Values ) {
|
||||
long start = bin.Position;
|
||||
idx.Write(BaseGuild.List.Count);
|
||||
foreach (BaseGuild guild in BaseGuild.List.Values)
|
||||
{
|
||||
long start = bin.Position;
|
||||
|
||||
idx.Write( ( int ) 0 );//guilds have no typeid
|
||||
idx.Write( ( int ) guild.Id );
|
||||
idx.Write( ( long ) start );
|
||||
idx.Write(0); //guilds have no typeid
|
||||
idx.Write(guild.Id);
|
||||
idx.Write(start);
|
||||
|
||||
guild.Serialize( bin );
|
||||
guild.Serialize(bin);
|
||||
|
||||
metrics?.OnGuildSaved( ( int ) ( bin.Position - start ) );
|
||||
metrics?.OnGuildSaved((int)(bin.Position - start));
|
||||
|
||||
idx.Write( ( int ) ( bin.Position - start ) );
|
||||
}
|
||||
idx.Write((int)(bin.Position - start));
|
||||
}
|
||||
|
||||
idx.Close();
|
||||
bin.Close();
|
||||
}
|
||||
idx.Close();
|
||||
bin.Close();
|
||||
}
|
||||
|
||||
public override void ProcessDecay() {
|
||||
while ( _decayQueue.Count > 0 ) {
|
||||
Item item = _decayQueue.Dequeue();
|
||||
public override void ProcessDecay()
|
||||
{
|
||||
while (_decayQueue.Count > 0)
|
||||
{
|
||||
Item item = _decayQueue.Dequeue();
|
||||
|
||||
if ( item.OnDecay() ) {
|
||||
item.Delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (item.OnDecay()) item.Delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue