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

fix(core): Converts to ref struct enumerators (#426)

Browse source 
- [X] Converts boat moving entities to ref struct enumerator
- [X] Converts skills to a ref struct enumerator
- [X] Converts type cache to ref struct enumerator
This commit is contained in:
Kamron Batman 2021-01-22 19:41:44 -08:00 • committed by GitHub
parent c6ef6ff80a
commit 9ef7752beb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 352 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

83
Projects/Server/AssemblyHandler.cs
View file

@ -14,11 +14,11 @@
*************************************************************************/
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.Loader;
namespace Server
@ -104,7 +104,7 @@ namespace Server
for (var i = 0; i < Assemblies.Length; i++)
{
foreach (var type in GetTypeCache(Assemblies[i]).GetEnumerator(name, ignoreCase))
foreach (var type in GetTypeCache(Assemblies[i]).GetTypesByName(name, ignoreCase))
{
if (type.FullName.EqualsOrdinal(name))
{
@ -113,7 +113,7 @@ namespace Server
}
}
foreach(var type in GetTypeCache(Core.Assembly).GetEnumerator(name, ignoreCase))
foreach(var type in GetTypeCache(Core.Assembly).GetTypesByName(name, ignoreCase))
{
if (type.FullName.EqualsOrdinal(name))
{
@ -138,13 +138,13 @@ namespace Server
for (var i = 0; i < Assemblies.Length; i++)
{
foreach (var type in GetTypeCache(Assemblies[i]).GetEnumerator(name, ignoreCase))
foreach (var type in GetTypeCache(Assemblies[i]).GetTypesByName(name, ignoreCase))
{
return type;
}
}
foreach(var type in GetTypeCache(Core.Assembly).GetEnumerator(name, ignoreCase))
foreach(var type in GetTypeCache(Core.Assembly).GetTypesByName(name, ignoreCase))
{
return type;
}
@ -164,7 +164,7 @@ namespace Server
for (var i = 0; i < Assemblies.Length; i++)
{
foreach (var type in GetTypeCache(Assemblies[i]).GetEnumerator(name, ignoreCase))
foreach (var type in GetTypeCache(Assemblies[i]).GetTypesByName(name, ignoreCase))
{
if (type.FullName.EqualsOrdinal(name))
{
@ -173,7 +173,7 @@ namespace Server
}
}
foreach(var type in GetTypeCache(Core.Assembly).GetEnumerator(name, ignoreCase))
foreach(var type in GetTypeCache(Core.Assembly).GetTypesByName(name, ignoreCase))
{
if (type.FullName.EqualsOrdinal(name))
{
@ -196,13 +196,13 @@ namespace Server
for (var i = 0; i < Assemblies.Length; i++)
{
foreach (var type in GetTypeCache(Assemblies[i]).GetEnumerator(name, ignoreCase))
foreach (var type in GetTypeCache(Assemblies[i]).GetTypesByName(name, ignoreCase))
{
types.Add(type);
}
}
foreach(var type in GetTypeCache(Core.Assembly).GetEnumerator(name, ignoreCase))
foreach(var type in GetTypeCache(Core.Assembly).GetTypesByName(name, ignoreCase))
{
types.Add(type);
}
@ -278,18 +278,38 @@ namespace Server
}
}
public Enumerator GetEnumerator(string name, bool ignoreCase) => new(name, this, ignoreCase);
public Type[] Types { get; }
public struct Enumerator : IEnumerable<Type>, IEnumerator<Type>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public TypeEnumerable GetTypesByName(string name, bool ignoreCase) => new(name, this, ignoreCase);
public ref struct TypeEnumerable
{
private readonly TypeCache _cache;
private readonly string _name;
private readonly bool _ignoreCase;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public TypeEnumerable(string name, TypeCache cache, bool ignoreCase)
{
_name = name;
_cache = cache;
_ignoreCase = ignoreCase;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public TypeEnumerator GetEnumerator() => new(_name, _cache, _ignoreCase);
}
public ref struct TypeEnumerator
{
private readonly TypeCache _cache;
private readonly int[] _values;
private int _index;
private Type _current;
internal Enumerator(string name, TypeCache cache, bool ignoreCase)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal TypeEnumerator(string name, TypeCache cache, bool ignoreCase)
{
_cache = cache;
@ -299,51 +319,26 @@ namespace Server
_current = default;
}
public void Dispose()
{
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool MoveNext()
{
int[] localList = _values;
while ((uint)_index < (uint)localList.Length)
if ((uint)_index < (uint)localList.Length)
{
_current = _cache.Types[_values[_index++]];
if (_current != null)
{
return true;
}
return true;
}
return false;
}
public Type Current => _current!;
object IEnumerator.Current
public Type Current
{
get
{
if (_index == 0 || _index == _values.Length + 1)
{
throw new InvalidOperationException(nameof(_index));
}
return Current;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => _current;
}
void IEnumerator.Reset()
{
_index = 0;
_current = default;
}
public IEnumerator<Type> GetEnumerator() => this;
IEnumerator IEnumerable.GetEnumerator() => this;
}
}
}

3
Projects/Server/Items/BaseMulti.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Runtime.CompilerServices;
namespace Server.Items
{
@ -94,8 +95,10 @@ namespace Server.Items
&& mcl.Tiles[x][y].Length > 0;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool Contains(Mobile m) => m.Map == Map && Contains(m.X, m.Y);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool Contains(Item item) => item.Map == Map && Contains(item.X, item.Y);
public override void Serialize(IGenericWriter writer)

41
Projects/Server/Skills.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using Server.Network;
namespace Server
@ -491,7 +492,7 @@ namespace Server
}
[PropertyObject]
public class Skills : IEnumerable<Skill>
public class Skills
{
private readonly Skill[] m_Skills;
private Skill m_Highest;
@ -805,10 +806,6 @@ namespace Server
[CommandProperty(AccessLevel.Counselor)]
public Skill Throwing => this[SkillName.Throwing];
public Enumerator GetEnumerator() => new(m_Skills);
IEnumerator<Skill> IEnumerable<Skill>.GetEnumerator() => GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
public override string ToString() => "...";
public static bool UseSkill(Mobile from, SkillName name) => UseSkill(from, (int)name);
@ -896,23 +893,24 @@ namespace Server
Owner.NetState.SendSkillChange(skill);
}
public struct Enumerator : IEnumerator<Skill>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public SkillsEnumerator GetEnumerator() => new(m_Skills);
public ref struct SkillsEnumerator
{
private readonly Skill[] _skills;
private int _index;
private Skill _current;
internal Enumerator(Skill[] skills)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal SkillsEnumerator(Skill[] skills)
{
_skills = skills;
_index = 0;
_current = default;
}
public void Dispose()
{
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool MoveNext()
{
Skill[] localList = _skills;
@ -929,25 +927,10 @@ namespace Server
return false;
}
public Skill Current => _current!;
object IEnumerator.Current
public Skill Current
{
get
{
if (_index == 0 || _index == _skills.Length + 1)
{
throw new InvalidOperationException(nameof(_index));
}
return Current;
}
}
void IEnumerator.Reset()
{
_index = 0;
_current = default;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => _current;
}
}
}