Ellpeck/Coroutine
1
0
Fork 0
mirror of https://github.com/Ellpeck/Coroutine.git synced 2024-05-26 10:33:38 +02:00
Code Issues Projects Releases Wiki Activity

use sets for eventCoroutinesToRemove to speed up Contains check

Browse source
This commit is contained in:
Ell 2021-03-20 15:24:25 +01:00
parent 501d744326
commit 42360014d8
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Coroutine/CoroutineHandlerInstance.cs
View file

@ -12,8 +12,8 @@ namespace Coroutine {
private readonly List<ActiveCoroutine> tickingCoroutines = new List<ActiveCoroutine>(); private readonly List<ActiveCoroutine> tickingCoroutines = new List<ActiveCoroutine>();
private readonly Dictionary<Event, List<ActiveCoroutine>> eventCoroutines = new Dictionary<Event, List<ActiveCoroutine>>(); private readonly Dictionary<Event, List<ActiveCoroutine>> eventCoroutines = new Dictionary<Event, List<ActiveCoroutine>>();
private readonly Queue<ActiveCoroutine> eventCoroutinesToRemove = new Queue<ActiveCoroutine>(); private readonly HashSet<ActiveCoroutine> eventCoroutinesToRemove = new HashSet<ActiveCoroutine>();
private readonly Queue<ActiveCoroutine> outstandingCoroutines = new Queue<ActiveCoroutine>(); private readonly HashSet<ActiveCoroutine> outstandingCoroutines = new HashSet<ActiveCoroutine>();
private readonly Stopwatch stopwatch = new Stopwatch(); private readonly Stopwatch stopwatch = new Stopwatch();
/// <summary> /// <summary>
@ -47,7 +47,7 @@ namespace Coroutine {
public ActiveCoroutine Start(IEnumerator<Wait> coroutine, string name = "", int priority = 0) { public ActiveCoroutine Start(IEnumerator<Wait> coroutine, string name = "", int priority = 0) {
var inst = new ActiveCoroutine(coroutine, name, priority, this.stopwatch); var inst = new ActiveCoroutine(coroutine, name, priority, this.stopwatch);
if (inst.MoveNext()) if (inst.MoveNext())
this.outstandingCoroutines.Enqueue(inst); this.outstandingCoroutines.Add(inst);
return inst; return inst;
} }
@ -74,7 +74,7 @@ namespace Coroutine {
if (c.Tick(deltaSeconds)) { if (c.Tick(deltaSeconds)) {
return true; return true;
} else if (c.IsWaitingForEvent) { } else if (c.IsWaitingForEvent) {
this.outstandingCoroutines.Enqueue(c); this.outstandingCoroutines.Add(c);
return true; return true;
} }
return false; return false;
@ -103,10 +103,10 @@ namespace Coroutine {
if (this.eventCoroutinesToRemove.Contains(c)) if (this.eventCoroutinesToRemove.Contains(c))
continue; continue;
if (c.OnEvent(evt)) { if (c.OnEvent(evt)) {
this.eventCoroutinesToRemove.Enqueue(c); this.eventCoroutinesToRemove.Add(c);
} else if (!c.IsWaitingForEvent) { } else if (!c.IsWaitingForEvent) {
this.outstandingCoroutines.Enqueue(c); this.eventCoroutinesToRemove.Add(c);
this.eventCoroutinesToRemove.Enqueue(c); this.outstandingCoroutines.Add(c);
} }
} }
} }
@ -121,18 +121,17 @@ namespace Coroutine {
} }
private void MoveOutstandingCoroutines() { private void MoveOutstandingCoroutines() {
while (this.eventCoroutinesToRemove.Count > 0) { // RemoveWhere is twice as fast as iterating and then clearing
var c = this.eventCoroutinesToRemove.Peek(); this.eventCoroutinesToRemove.RemoveWhere(c => {
this.GetEventCoroutines(c.Event, 0).Remove(c); this.GetEventCoroutines(c.Event, 0).Remove(c);
this.eventCoroutinesToRemove.Dequeue(); return true;
} });
while (this.outstandingCoroutines.Count > 0) { this.outstandingCoroutines.RemoveWhere(c => {
var coroutine = this.outstandingCoroutines.Peek(); var list = c.IsWaitingForEvent ? this.GetEventCoroutines(c.Event, 1) : this.tickingCoroutines;
var list = coroutine.IsWaitingForEvent ? this.GetEventCoroutines(coroutine.Event, 1) : this.tickingCoroutines; var position = list.BinarySearch(c);
var position = list.BinarySearch(coroutine); list.Insert(position < 0 ? ~position : position, c);
list.Insert(position < 0 ? ~position : position, coroutine); return true;
this.outstandingCoroutines.Dequeue(); });
}
} }
private List<ActiveCoroutine> GetEventCoroutines(Event evt, int capacity) { private List<ActiveCoroutine> GetEventCoroutines(Event evt, int capacity) {