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
|
|
@ -24,299 +24,312 @@ using System.Collections.Generic;
|
|||
using System.Threading;
|
||||
using Server.Guilds;
|
||||
|
||||
namespace Server {
|
||||
public sealed class ParallelSaveStrategy : SaveStrategy {
|
||||
public override string Name => "Parallel";
|
||||
namespace Server
|
||||
{
|
||||
public sealed class ParallelSaveStrategy : SaveStrategy
|
||||
{
|
||||
private Queue<Item> _decayQueue;
|
||||
|
||||
private int processorCount;
|
||||
private Consumer[] consumers;
|
||||
private int cycle;
|
||||
|
||||
public ParallelSaveStrategy( int processorCount ) {
|
||||
this.processorCount = processorCount;
|
||||
private bool finished;
|
||||
private SequentialFileWriter guildData, guildIndex;
|
||||
|
||||
_decayQueue = new Queue<Item>();
|
||||
}
|
||||
private SequentialFileWriter itemData, itemIndex;
|
||||
|
||||
private int GetThreadCount() {
|
||||
return processorCount - 1;
|
||||
}
|
||||
private SaveMetrics metrics;
|
||||
private SequentialFileWriter mobileData, mobileIndex;
|
||||
|
||||
private SaveMetrics metrics;
|
||||
private int processorCount;
|
||||
|
||||
private SequentialFileWriter itemData, itemIndex;
|
||||
private SequentialFileWriter mobileData, mobileIndex;
|
||||
private SequentialFileWriter guildData, guildIndex;
|
||||
public ParallelSaveStrategy(int processorCount)
|
||||
{
|
||||
this.processorCount = processorCount;
|
||||
|
||||
private Queue<Item> _decayQueue;
|
||||
_decayQueue = new Queue<Item>();
|
||||
}
|
||||
|
||||
private Consumer[] consumers;
|
||||
private int cycle;
|
||||
public override string Name => "Parallel";
|
||||
|
||||
private bool finished;
|
||||
private int GetThreadCount()
|
||||
{
|
||||
return processorCount - 1;
|
||||
}
|
||||
|
||||
public override void Save(SaveMetrics metrics, bool permitBackgroundWrite)
|
||||
{
|
||||
this.metrics = metrics;
|
||||
public override void Save(SaveMetrics metrics, bool permitBackgroundWrite)
|
||||
{
|
||||
this.metrics = metrics;
|
||||
|
||||
OpenFiles();
|
||||
OpenFiles();
|
||||
|
||||
consumers = new Consumer[GetThreadCount()];
|
||||
consumers = new Consumer[GetThreadCount()];
|
||||
|
||||
for ( int i = 0; i < consumers.Length; ++i ) {
|
||||
consumers[i] = new Consumer( this, 256 );
|
||||
}
|
||||
for (int i = 0; i < consumers.Length; ++i) consumers[i] = new Consumer(this, 256);
|
||||
|
||||
IEnumerable<ISerializable> collection = new Producer();
|
||||
IEnumerable<ISerializable> collection = new Producer();
|
||||
|
||||
foreach ( ISerializable value in collection ) {
|
||||
while ( !Enqueue( value ) ) {
|
||||
if ( !Commit() ) {
|
||||
Thread.Sleep( 0 );
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (ISerializable value in collection)
|
||||
while (!Enqueue(value))
|
||||
if (!Commit())
|
||||
Thread.Sleep(0);
|
||||
|
||||
finished = true;
|
||||
finished = true;
|
||||
|
||||
SaveTypeDatabases();
|
||||
SaveTypeDatabases();
|
||||
|
||||
WaitHandle.WaitAll(
|
||||
Array.ConvertAll<Consumer, WaitHandle>(
|
||||
consumers,
|
||||
delegate( Consumer input ) {
|
||||
return input.completionEvent;
|
||||
}
|
||||
)
|
||||
);
|
||||
WaitHandle.WaitAll(
|
||||
Array.ConvertAll<Consumer, WaitHandle>(
|
||||
consumers,
|
||||
delegate(Consumer input) { return input.completionEvent; }
|
||||
)
|
||||
);
|
||||
|
||||
Commit();
|
||||
Commit();
|
||||
|
||||
CloseFiles();
|
||||
}
|
||||
CloseFiles();
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
private void SaveTypeDatabases() {
|
||||
SaveTypeDatabase( World.ItemTypesPath, World.m_ItemTypes );
|
||||
SaveTypeDatabase( World.MobileTypesPath, World.m_MobileTypes );
|
||||
}
|
||||
private void SaveTypeDatabases()
|
||||
{
|
||||
SaveTypeDatabase(World.ItemTypesPath, World.m_ItemTypes);
|
||||
SaveTypeDatabase(World.MobileTypesPath, World.m_MobileTypes);
|
||||
}
|
||||
|
||||
private void SaveTypeDatabase( string path, List<Type> types ) {
|
||||
BinaryFileWriter bfw = new BinaryFileWriter( path, false );
|
||||
private void SaveTypeDatabase(string path, List<Type> types)
|
||||
{
|
||||
BinaryFileWriter bfw = new BinaryFileWriter(path, false);
|
||||
|
||||
bfw.Write( types.Count );
|
||||
bfw.Write(types.Count);
|
||||
|
||||
foreach ( Type type in types ) {
|
||||
bfw.Write( type.FullName );
|
||||
}
|
||||
foreach (Type type in types) bfw.Write(type.FullName);
|
||||
|
||||
bfw.Flush();
|
||||
bfw.Flush();
|
||||
|
||||
bfw.Close();
|
||||
}
|
||||
bfw.Close();
|
||||
}
|
||||
|
||||
private void OpenFiles() {
|
||||
itemData = new SequentialFileWriter( World.ItemDataPath, metrics );
|
||||
itemIndex = new SequentialFileWriter( World.ItemIndexPath, metrics );
|
||||
private void OpenFiles()
|
||||
{
|
||||
itemData = new SequentialFileWriter(World.ItemDataPath, metrics);
|
||||
itemIndex = new SequentialFileWriter(World.ItemIndexPath, metrics);
|
||||
|
||||
mobileData = new SequentialFileWriter( World.MobileDataPath, metrics );
|
||||
mobileIndex = new SequentialFileWriter( World.MobileIndexPath, metrics );
|
||||
mobileData = new SequentialFileWriter(World.MobileDataPath, metrics);
|
||||
mobileIndex = new SequentialFileWriter(World.MobileIndexPath, metrics);
|
||||
|
||||
guildData = new SequentialFileWriter( World.GuildDataPath, metrics );
|
||||
guildIndex = new SequentialFileWriter( World.GuildIndexPath, metrics );
|
||||
guildData = new SequentialFileWriter(World.GuildDataPath, metrics);
|
||||
guildIndex = new SequentialFileWriter(World.GuildIndexPath, metrics);
|
||||
|
||||
WriteCount( itemIndex, World.Items.Count );
|
||||
WriteCount( mobileIndex, World.Mobiles.Count );
|
||||
WriteCount( guildIndex, BaseGuild.List.Count );
|
||||
}
|
||||
WriteCount(itemIndex, World.Items.Count);
|
||||
WriteCount(mobileIndex, World.Mobiles.Count);
|
||||
WriteCount(guildIndex, BaseGuild.List.Count);
|
||||
}
|
||||
|
||||
private void WriteCount( SequentialFileWriter indexFile, int count ) {
|
||||
byte[] buffer = new byte[4];
|
||||
private void WriteCount(SequentialFileWriter indexFile, int count)
|
||||
{
|
||||
byte[] buffer = new byte[4];
|
||||
|
||||
buffer[0] = ( byte ) ( count );
|
||||
buffer[1] = ( byte ) ( count >> 8 );
|
||||
buffer[2] = ( byte ) ( count >> 16 );
|
||||
buffer[3] = ( byte ) ( count >> 24 );
|
||||
buffer[0] = (byte)count;
|
||||
buffer[1] = (byte)(count >> 8);
|
||||
buffer[2] = (byte)(count >> 16);
|
||||
buffer[3] = (byte)(count >> 24);
|
||||
|
||||
indexFile.Write( buffer, 0, buffer.Length );
|
||||
}
|
||||
indexFile.Write(buffer, 0, buffer.Length);
|
||||
}
|
||||
|
||||
private void CloseFiles() {
|
||||
itemData.Close();
|
||||
itemIndex.Close();
|
||||
private void CloseFiles()
|
||||
{
|
||||
itemData.Close();
|
||||
itemIndex.Close();
|
||||
|
||||
mobileData.Close();
|
||||
mobileIndex.Close();
|
||||
mobileData.Close();
|
||||
mobileIndex.Close();
|
||||
|
||||
guildData.Close();
|
||||
guildIndex.Close();
|
||||
guildData.Close();
|
||||
guildIndex.Close();
|
||||
|
||||
World.NotifyDiskWriteComplete();
|
||||
}
|
||||
World.NotifyDiskWriteComplete();
|
||||
}
|
||||
|
||||
private void OnSerialized( ConsumableEntry entry ) {
|
||||
ISerializable value = entry.value;
|
||||
BinaryMemoryWriter writer = entry.writer;
|
||||
private void OnSerialized(ConsumableEntry entry)
|
||||
{
|
||||
ISerializable value = entry.value;
|
||||
BinaryMemoryWriter writer = entry.writer;
|
||||
|
||||
if ( value is Item item )
|
||||
Save( item, writer );
|
||||
else if ( value is Mobile mob )
|
||||
Save( mob, writer );
|
||||
else if ( value is BaseGuild guild )
|
||||
Save( guild, writer );
|
||||
}
|
||||
if (value is Item item)
|
||||
Save(item, writer);
|
||||
else if (value is Mobile mob)
|
||||
Save(mob, writer);
|
||||
else if (value is BaseGuild guild)
|
||||
Save(guild, writer);
|
||||
}
|
||||
|
||||
private void Save( Item item, BinaryMemoryWriter writer ) {
|
||||
int length = writer.CommitTo( itemData, itemIndex, item.m_TypeRef, item.Serial );
|
||||
private void Save(Item item, BinaryMemoryWriter writer)
|
||||
{
|
||||
int length = writer.CommitTo(itemData, itemIndex, item.m_TypeRef, item.Serial);
|
||||
|
||||
metrics?.OnItemSaved( length );
|
||||
metrics?.OnItemSaved(length);
|
||||
|
||||
if (item.Decays && item.Parent == null && item.Map != Map.Internal && DateTime.UtcNow > (item.LastMoved + item.DecayTime))
|
||||
{
|
||||
_decayQueue.Enqueue( item );
|
||||
}
|
||||
}
|
||||
if (item.Decays && item.Parent == null && item.Map != Map.Internal &&
|
||||
DateTime.UtcNow > item.LastMoved + item.DecayTime) _decayQueue.Enqueue(item);
|
||||
}
|
||||
|
||||
private void Save( Mobile mob, BinaryMemoryWriter writer ) {
|
||||
int length = writer.CommitTo( mobileData, mobileIndex, mob.m_TypeRef, mob.Serial );
|
||||
private void Save(Mobile mob, BinaryMemoryWriter writer)
|
||||
{
|
||||
int length = writer.CommitTo(mobileData, mobileIndex, mob.m_TypeRef, mob.Serial);
|
||||
|
||||
metrics?.OnMobileSaved( length );
|
||||
}
|
||||
metrics?.OnMobileSaved(length);
|
||||
}
|
||||
|
||||
private void Save( BaseGuild guild, BinaryMemoryWriter writer ) {
|
||||
int length = writer.CommitTo( guildData, guildIndex, 0, guild.Id );
|
||||
private void Save(BaseGuild guild, BinaryMemoryWriter writer)
|
||||
{
|
||||
int length = writer.CommitTo(guildData, guildIndex, 0, guild.Id);
|
||||
|
||||
metrics?.OnGuildSaved( length );
|
||||
}
|
||||
metrics?.OnGuildSaved(length);
|
||||
}
|
||||
|
||||
private bool Enqueue( ISerializable value ) {
|
||||
for ( int i = 0; i < consumers.Length; ++i ) {
|
||||
Consumer consumer = consumers[cycle++ % consumers.Length];
|
||||
private bool Enqueue(ISerializable value)
|
||||
{
|
||||
for (int i = 0; i < consumers.Length; ++i)
|
||||
{
|
||||
Consumer consumer = consumers[cycle++ % consumers.Length];
|
||||
|
||||
if ( ( consumer.tail - consumer.head ) < consumer.buffer.Length ) {
|
||||
consumer.buffer[consumer.tail % consumer.buffer.Length].value = value;
|
||||
consumer.tail++;
|
||||
if (consumer.tail - consumer.head < consumer.buffer.Length)
|
||||
{
|
||||
consumer.buffer[consumer.tail % consumer.buffer.Length].value = value;
|
||||
consumer.tail++;
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool Commit() {
|
||||
bool committed = false;
|
||||
private bool Commit()
|
||||
{
|
||||
bool committed = false;
|
||||
|
||||
for (int i = 0; i < consumers.Length; ++i)
|
||||
{
|
||||
Consumer consumer = consumers[i];
|
||||
|
||||
for ( int i = 0; i < consumers.Length; ++i ) {
|
||||
Consumer consumer = consumers[i];
|
||||
while (consumer.head < consumer.done)
|
||||
{
|
||||
OnSerialized(consumer.buffer[consumer.head % consumer.buffer.Length]);
|
||||
consumer.head++;
|
||||
|
||||
while ( consumer.head < consumer.done ) {
|
||||
OnSerialized( consumer.buffer[consumer.head % consumer.buffer.Length] );
|
||||
consumer.head++;
|
||||
committed = true;
|
||||
}
|
||||
}
|
||||
|
||||
return committed;
|
||||
}
|
||||
|
||||
private sealed class Producer : IEnumerable<ISerializable>
|
||||
{
|
||||
private IEnumerable<BaseGuild> guilds;
|
||||
private IEnumerable<Item> items;
|
||||
private IEnumerable<Mobile> mobiles;
|
||||
|
||||
public Producer()
|
||||
{
|
||||
items = World.Items.Values;
|
||||
mobiles = World.Mobiles.Values;
|
||||
guilds = BaseGuild.List.Values;
|
||||
}
|
||||
|
||||
public IEnumerator<ISerializable> GetEnumerator()
|
||||
{
|
||||
foreach (Item item in items) yield return item;
|
||||
|
||||
foreach (Mobile mob in mobiles) yield return mob;
|
||||
|
||||
committed = true;
|
||||
}
|
||||
}
|
||||
foreach (BaseGuild guild in guilds) yield return guild;
|
||||
}
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
private struct ConsumableEntry
|
||||
{
|
||||
public ISerializable value;
|
||||
public BinaryMemoryWriter writer;
|
||||
}
|
||||
|
||||
private sealed class Consumer
|
||||
{
|
||||
public ConsumableEntry[] buffer;
|
||||
|
||||
return committed;
|
||||
}
|
||||
public ManualResetEvent completionEvent;
|
||||
public int head, done, tail;
|
||||
private ParallelSaveStrategy owner;
|
||||
|
||||
private sealed class Producer : IEnumerable<ISerializable> {
|
||||
private IEnumerable<Item> items;
|
||||
private IEnumerable<Mobile> mobiles;
|
||||
private IEnumerable<BaseGuild> guilds;
|
||||
private Thread thread;
|
||||
|
||||
public Producer() {
|
||||
items = World.Items.Values;
|
||||
mobiles = World.Mobiles.Values;
|
||||
guilds = BaseGuild.List.Values;
|
||||
}
|
||||
public Consumer(ParallelSaveStrategy owner, int bufferSize)
|
||||
{
|
||||
this.owner = owner;
|
||||
|
||||
public IEnumerator<ISerializable> GetEnumerator() {
|
||||
foreach ( Item item in items ) {
|
||||
yield return item;
|
||||
}
|
||||
buffer = new ConsumableEntry[bufferSize];
|
||||
|
||||
for (int i = 0; i < buffer.Length; ++i) buffer[i].writer = new BinaryMemoryWriter();
|
||||
|
||||
foreach ( Mobile mob in mobiles ) {
|
||||
yield return mob;
|
||||
}
|
||||
completionEvent = new ManualResetEvent(false);
|
||||
|
||||
thread = new Thread(Processor);
|
||||
|
||||
thread.Name = "Parallel Serialization Thread";
|
||||
|
||||
thread.Start();
|
||||
}
|
||||
|
||||
private void Processor()
|
||||
{
|
||||
try
|
||||
{
|
||||
while (!owner.finished)
|
||||
{
|
||||
Process();
|
||||
Thread.Sleep(0);
|
||||
}
|
||||
|
||||
foreach ( BaseGuild guild in guilds ) {
|
||||
yield return guild;
|
||||
}
|
||||
}
|
||||
Process();
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator() {
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
completionEvent.Set();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine(ex);
|
||||
}
|
||||
}
|
||||
|
||||
private void Process()
|
||||
{
|
||||
ConsumableEntry entry;
|
||||
|
||||
while (done < tail)
|
||||
{
|
||||
entry = buffer[done % buffer.Length];
|
||||
|
||||
entry.value.Serialize(entry.writer);
|
||||
|
||||
private struct ConsumableEntry {
|
||||
public ISerializable value;
|
||||
public BinaryMemoryWriter writer;
|
||||
}
|
||||
|
||||
private sealed class Consumer {
|
||||
private ParallelSaveStrategy owner;
|
||||
|
||||
public ManualResetEvent completionEvent;
|
||||
|
||||
public ConsumableEntry[] buffer;
|
||||
public int head, done, tail;
|
||||
|
||||
private Thread thread;
|
||||
|
||||
public Consumer( ParallelSaveStrategy owner, int bufferSize ) {
|
||||
this.owner = owner;
|
||||
|
||||
buffer = new ConsumableEntry[bufferSize];
|
||||
|
||||
for ( int i = 0; i < buffer.Length; ++i ) {
|
||||
buffer[i].writer = new BinaryMemoryWriter();
|
||||
}
|
||||
|
||||
completionEvent = new ManualResetEvent( false );
|
||||
|
||||
thread = new Thread( Processor );
|
||||
|
||||
thread.Name = "Parallel Serialization Thread";
|
||||
|
||||
thread.Start();
|
||||
}
|
||||
|
||||
private void Processor() {
|
||||
try {
|
||||
while ( !owner.finished ) {
|
||||
Process();
|
||||
Thread.Sleep( 0 );
|
||||
}
|
||||
|
||||
Process();
|
||||
|
||||
completionEvent.Set();
|
||||
} catch ( Exception ex ) {
|
||||
Console.WriteLine( ex );
|
||||
}
|
||||
}
|
||||
|
||||
private void Process() {
|
||||
ConsumableEntry entry;
|
||||
|
||||
while ( done < tail ) {
|
||||
entry = buffer[done % buffer.Length];
|
||||
|
||||
entry.value.Serialize( entry.writer );
|
||||
|
||||
++done;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
++done;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue