* Fixes pooled timer leaking * Fixes `[dumptimers` command so it outputs properly, adds spacing, and stacktraces * Adds `[Tidy]` for serializing Lists. This will remove deleted entities during world save before serializing the list. * Adds helpers for managing Lists/Sets/Dictionaries ### New API ```cs // Creates the list if it is null, then adds Utility.Add(ref list, value); Utility.Add(ref set, value); Utility.Add(ref dict, key, value); // Nulls the variable if the count is zero Utility.Remove(ref list, value); Utility.Remove(ref set, value); Utility.Remove(ref dict, key); // Marks entity as dirty in addition to doing the action entity.Add(list, value); // Marks entity as dirty, and will create list if it doesn't exist entity.Add(ref list, value); // Marks entity as dirty in addition to doing the action entity.Remove(list, value); // Marks entity as dirty, and will null the list count is zero entity.Remove(ref list, value); ``` ### Updates to [dumptimers <img width="825" alt="Screen Shot 2021-08-14 at 2 55 10 AM" src="https://user-images.githubusercontent.com/3953314/129442449-ccf7fe14-29d6-4f3f-9366-c8eb7b9828a7.png">
135 lines
4.7 KiB
C#
135 lines
4.7 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2021 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: ISerializableExtensions.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System.Collections.Generic;
|
|
using System.Runtime.CompilerServices;
|
|
|
|
namespace Server
|
|
{
|
|
public static class ISerializableExtensions
|
|
{
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void MarkDirty(this ISerializable entity)
|
|
{
|
|
entity.SavePosition = -1;
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Add<T>(this ISerializable entity, ICollection<T> list, T value)
|
|
{
|
|
list.Add(value);
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Add<K, V>(this ISerializable entity, IDictionary<K, V> dict, K key, V value)
|
|
{
|
|
dict[key] = value;
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Insert<T>(this ISerializable entity, IList<T> list, T value, int index)
|
|
{
|
|
list.Insert(index, value);
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static bool Remove<T>(this ISerializable entity, ICollection<T> list, T value)
|
|
{
|
|
if (list.Remove(value))
|
|
{
|
|
entity.MarkDirty();
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static bool Remove<K, V>(this ISerializable entity, IDictionary<K, V> dict, K key, out V value)
|
|
{
|
|
if (dict.Remove(key, out value))
|
|
{
|
|
entity.MarkDirty();
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void RemoveAt<T>(this ISerializable entity, IList<T> list, int index)
|
|
{
|
|
list.RemoveAt(index);
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Clear<T>(this ISerializable entity, ICollection<T> list)
|
|
{
|
|
list.Clear();
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Add<T>(this ISerializable entity, ref List<T> list, T value)
|
|
{
|
|
Utility.Add(ref list, value);
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Add<K, V>(this ISerializable entity, ref Dictionary<K, V> dict, K key, V value)
|
|
{
|
|
Utility.Add(ref dict, key, value);
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static bool Remove<T>(this ISerializable entity, ref List<T> list, T value)
|
|
{
|
|
if (Utility.Remove(ref list, value))
|
|
{
|
|
entity.MarkDirty();
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Clear<T>(this ISerializable entity, ref List<T> list)
|
|
{
|
|
Utility.Clear(ref list);
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Clear<T>(this ISerializable entity, ref HashSet<T> set)
|
|
{
|
|
Utility.Clear(ref set);
|
|
entity.MarkDirty();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public static void Clear<K, V>(this ISerializable entity, ref Dictionary<K, V> dict)
|
|
{
|
|
Utility.Clear(ref dict);
|
|
entity.MarkDirty();
|
|
}
|
|
}
|
|
}
|