GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed collect list from GC

Browse Source
This commit is contained in:
Albin Corén 2018-04-11 19:03:14 +01:00
parent 18d965d562
commit 45f82180d2
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
MLAPI/NetworkingManagerComponents/Binary/BitWriter.cs
View File

@ -6,10 +6,9 @@ using UnityEngine;
namespace MLAPI.NetworkingManagerComponents.Binary namespace MLAPI.NetworkingManagerComponents.Binary
{ {
public sealed class BitWiter : IDisposable public sealed class BitWriter : IDisposable
{ {
// Collects reusable private static readonly Queue<List<object>> listPool = new Queue<List<object>>();
private static readonly List<WeakReference> expired = new List<WeakReference>();
private static readonly float[] holder_f = new float[1]; private static readonly float[] holder_f = new float[1];
private static readonly double[] holder_d = new double[1]; private static readonly double[] holder_d = new double[1];
@ -38,43 +37,45 @@ namespace MLAPI.NetworkingManagerComponents.Binary
dec_hi, dec_hi,
dec_flags; dec_flags;
static BitWiter() static BitWriter()
{ {
dec_lo = typeof(decimal).GetField("lo", BindingFlags.NonPublic); dec_lo = typeof(decimal).GetField("lo", BindingFlags.NonPublic);
dec_mid = typeof(decimal).GetField("mid", BindingFlags.NonPublic); dec_mid = typeof(decimal).GetField("mid", BindingFlags.NonPublic);
dec_hi = typeof(decimal).GetField("hi", BindingFlags.NonPublic); dec_hi = typeof(decimal).GetField("hi", BindingFlags.NonPublic);
dec_flags = typeof(decimal).GetField("flags", BindingFlags.NonPublic); dec_flags = typeof(decimal).GetField("flags", BindingFlags.NonPublic);
for (int i = 0; i < 10; i++)
{
listPool.Enqueue(new List<object>());
}
} }
private object[] collect; private List<object> collect = null;
private bool tempAlloc = false;
private readonly int bufferSize; private readonly int bufferSize;
private int collectCount = 0; private int collectCount = 0;
/// <summary> /// <summary>
/// Allocates a new binary collector. /// Allocates a new binary collector.
/// </summary> /// </summary>
public BitWiter(int bufferSize) public BitWriter()
{ {
this.bufferSize = bufferSize; if (listPool.Count == 0)
for (int i = expired.Count - 1; i >= 0; --i) {
if (expired[i].IsAlive) Debug.LogWarning("MLAPI: There can be no more than 10 BitWriters. Have you forgotten do dispose? (It will still work with worse performance)");
{ collect = new List<object>();
collect = (object[])expired[i].Target; tempAlloc = true;
if (collect.Length >= bufferSize) }
{ else
expired.RemoveAt(i); // This entry he been un-expired for now {
break; collect = listPool.Dequeue();
} }
}
else expired.RemoveAt(i); // Entry has been collected by GC
if (collect == null || collect.Length < bufferSize)
collect = new object[bufferSize];
} }
private void Push<T>(T b) private void Push<T>(T b)
{ {
if (b is string || b.GetType().IsArray || IsSupportedType(b.GetType())) if (b is string || b.GetType().IsArray || IsSupportedType(b.GetType()))
collect[collectCount++] = b is string ? Encoding.UTF8.GetBytes(b as string) : b as object; collect.Add(b is string ? Encoding.UTF8.GetBytes(b as string) : b as object);
//else //else
// Debug.LogWarning("MLAPI: The type \"" + b.GetType() + "\" is not supported by the Binary Serializer. It will be ignored"); // Debug.LogWarning("MLAPI: The type \"" + b.GetType() + "\" is not supported by the Binary Serializer. It will be ignored");
} }
@ -122,7 +123,7 @@ namespace MLAPI.NetworkingManagerComponents.Binary
foreach (var item in collect) foreach (var item in collect)
Serialize(item, buffer, ref bitOffset); Serialize(item, buffer, ref bitOffset);
return (bitCount / 8) + (bitCount % 8 == 0 ? 0 : 1)); return (bitCount / 8) + (bitCount % 8 == 0 ? 0 : 1);
} }
public long GetFinalizeSize() public long GetFinalizeSize()
@ -367,8 +368,12 @@ namespace MLAPI.NetworkingManagerComponents.Binary
// Creates a weak reference to the allocated collector so that reuse may be possible // Creates a weak reference to the allocated collector so that reuse may be possible
public void Dispose() public void Dispose()
{ {
expired.Add(new WeakReference(collect)); if (!tempAlloc)
collect = null; {
collect.Clear();
listPool.Enqueue(collect);
}
collect = null; //GC picks this
} }
} }
} }