Ellpeck/Coroutine
1
0
Fork 0
mirror of https://github.com/Ellpeck/Coroutine.git synced 2024-11-21 21:33:29 +01:00
Code Issues Projects Releases Wiki Activity

ensure coroutine handler instance thread safety

Browse source
This commit is contained in:
Ell 2021-11-29 11:37:17 +01:00
parent f71426321f
commit 1deb8a9d89
1 changed files with 46 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
Coroutine/CoroutineHandlerInstance.cs
View file

@ -16,15 +16,26 @@ namespace Coroutine {
private readonly HashSet<ActiveCoroutine> outstandingEventCoroutines = new HashSet<ActiveCoroutine>(); private readonly HashSet<ActiveCoroutine> outstandingEventCoroutines = new HashSet<ActiveCoroutine>();
private readonly HashSet<ActiveCoroutine> outstandingTickingCoroutines = new HashSet<ActiveCoroutine>(); private readonly HashSet<ActiveCoroutine> outstandingTickingCoroutines = new HashSet<ActiveCoroutine>();
private readonly Stopwatch stopwatch = new Stopwatch(); private readonly Stopwatch stopwatch = new Stopwatch();
private readonly object lockObject = new object();
/// <summary> /// <summary>
/// The amount of <see cref="ActiveCoroutine"/> instances that are currently waiting for a tick (waiting for time to pass) /// The amount of <see cref="ActiveCoroutine"/> instances that are currently waiting for a tick (waiting for time to pass)
/// </summary> /// </summary>
public int TickingCount => this.tickingCoroutines.Count; public int TickingCount {
get {
lock (this.lockObject)
return this.tickingCoroutines.Count;
}
}
/// <summary> /// <summary>
/// The amount of <see cref="ActiveCoroutine"/> instances that are currently waiting for an <see cref="Event"/> /// The amount of <see cref="ActiveCoroutine"/> instances that are currently waiting for an <see cref="Event"/>
/// </summary> /// </summary>
public int EventCount => this.eventCoroutines.Sum(c => c.Value.Count); public int EventCount {
get {
lock (this.lockObject)
return this.eventCoroutines.Sum(c => c.Value.Count);
}
}
/// <summary> /// <summary>
/// Starts the given coroutine, returning a <see cref="ActiveCoroutine"/> object for management. /// Starts the given coroutine, returning a <see cref="ActiveCoroutine"/> object for management.
@ -47,8 +58,10 @@ namespace Coroutine {
/// <returns>An active coroutine object representing this coroutine</returns> /// <returns>An active coroutine object representing this coroutine</returns>
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.GetOutstandingCoroutines(inst.IsWaitingForEvent).Add(inst); lock (this.lockObject)
this.GetOutstandingCoroutines(inst.IsWaitingForEvent).Add(inst);
}
return inst; return inst;
} }
@ -70,16 +83,18 @@ namespace Coroutine {
/// </summary> /// </summary>
/// <param name="deltaSeconds">The amount of seconds that have passed since the last time this method was invoked</param> /// <param name="deltaSeconds">The amount of seconds that have passed since the last time this method was invoked</param>
public void Tick(double deltaSeconds) { public void Tick(double deltaSeconds) {
this.MoveOutstandingCoroutines(false); lock (this.lockObject) {
this.tickingCoroutines.RemoveAll(c => { this.MoveOutstandingCoroutines(false);
if (c.Tick(deltaSeconds)) { this.tickingCoroutines.RemoveAll(c => {
return true; if (c.Tick(deltaSeconds)) {
} else if (c.IsWaitingForEvent) { return true;
this.outstandingEventCoroutines.Add(c); } else if (c.IsWaitingForEvent) {
return true; this.outstandingEventCoroutines.Add(c);
} return true;
return false; }
}); return false;
});
}
} }
/// <summary> /// <summary>
@ -96,19 +111,21 @@ namespace Coroutine {
/// </summary> /// </summary>
/// <param name="evt">The event to raise</param> /// <param name="evt">The event to raise</param>
public void RaiseEvent(Event evt) { public void RaiseEvent(Event evt) {
this.MoveOutstandingCoroutines(true); lock (this.lockObject) {
var coroutines = this.GetEventCoroutines(evt, false); this.MoveOutstandingCoroutines(true);
if (coroutines != null) { var coroutines = this.GetEventCoroutines(evt, false);
for (var i = 0; i < coroutines.Count; i++) { if (coroutines != null) {
var c = coroutines[i]; for (var i = 0; i < coroutines.Count; i++) {
var tup = (c.Event, c); var c = coroutines[i];
if (this.eventCoroutinesToRemove.Contains(tup)) var tup = (c.Event, c);
continue; if (this.eventCoroutinesToRemove.Contains(tup))
if (c.OnEvent(evt)) { continue;
this.eventCoroutinesToRemove.Add(tup); if (c.OnEvent(evt)) {
} else if (!c.IsWaitingForEvent) { this.eventCoroutinesToRemove.Add(tup);
this.eventCoroutinesToRemove.Add(tup); } else if (!c.IsWaitingForEvent) {
this.outstandingTickingCoroutines.Add(c); this.eventCoroutinesToRemove.Add(tup);
this.outstandingTickingCoroutines.Add(c);
}
} }
} }
} }
@ -119,7 +136,8 @@ namespace Coroutine {
/// </summary> /// </summary>
/// <returns>All active coroutines</returns> /// <returns>All active coroutines</returns>
public IEnumerable<ActiveCoroutine> GetActiveCoroutines() { public IEnumerable<ActiveCoroutine> GetActiveCoroutines() {
return this.tickingCoroutines.Concat(this.eventCoroutines.Values.SelectMany(c => c)); lock (this.lockObject)
return this.tickingCoroutines.Concat(this.eventCoroutines.Values.SelectMany(c => c));
} }
private void MoveOutstandingCoroutines(bool evt) { private void MoveOutstandingCoroutines(bool evt) {