diff --git a/src/client/spark/core/Utility/CommonValueMonitor.cs b/src/client/spark/core/Utility/CommonValueMonitor.cs index 5fdcd4bca..b5900b938 100644 --- a/src/client/spark/core/Utility/CommonValueMonitor.cs +++ b/src/client/spark/core/Utility/CommonValueMonitor.cs @@ -94,6 +94,13 @@ namespace bts.utils { } } } + + public void clear() { + if (_values.Count > 0) { + _values.Clear(); + _update.execute(); + } + } } class CommonValueGroupMonitor where TKey : struct { @@ -104,6 +111,7 @@ namespace bts.utils { RefCountMap _deferred_adds, _deferred_removes; int _deferral_count; bool _is_deferred => _deferral_count > 0; + bool _reset_requested; public CommonValueGroupMonitor(Func key) : this(key, EqualityComparer.Default, EqualityComparer.Default) { } @@ -172,12 +180,37 @@ namespace bts.utils { } } + public void clear() { + if (_is_deferred) { + _deferred_adds.Clear(); + _deferred_removes.Clear(); + _reset_requested = true; + return; + } + switch (_value_groups.Count) { + case 1: + _value_groups.Clear(); + common_values_changed?.Invoke((Enumerable.Empty(), Enumerable.Empty())); + common_value_group_changed?.Invoke(null); + break; + default: + _value_groups.Clear(); + break; + } + } + public IDisposable deferr_updates() { var last_fired_common_key = common_value_group?.Key; ++_deferral_count; return Disposable.Create(() => { - if (--_deferral_count == 0 && (_deferred_adds.Count > 0 || _deferred_removes.Count > 0)) { - foreach(var kv in _deferred_removes) { + if (--_deferral_count > 0 || (_deferred_adds.Count == 0 && _deferred_removes.Count == 0 && !_reset_requested)) + return; + if (_reset_requested) { + _value_groups.Clear(); + _reset_requested = false; + } + if (_deferred_adds.Count > 0 || _deferred_removes.Count > 0) { + foreach (var kv in _deferred_removes) { var k = _key(kv.Key); if (_value_groups.TryGetValue(k, out RefCountMap rcm)) { rcm.decrement(kv.Key, kv.Value); @@ -192,78 +225,140 @@ namespace bts.utils { } rcm.increment(kv.Key, kv.Value); } - if (!EqualityComparer.nullable_equals(last_fired_common_key, common_value_group?.Key)) { - common_value_group_changed?.Invoke(common_value_group); - } else if (last_fired_common_key is TKey k) { - common_values_changed?.Invoke(( - _deferred_removes.Select(krc => krc.Key).Where(v => _key_comparer.Equals(_key(v), k)), - _deferred_adds.Select(krc => krc.Key).Where(v => _key_comparer.Equals(_key(v), k)))); - } - _deferred_adds = new RefCountMap(_value_comparer); - _deferred_removes = new RefCountMap(_value_comparer); } + if (!EqualityComparer.nullable_equals(last_fired_common_key, common_value_group?.Key)) { + common_value_group_changed?.Invoke(common_value_group); + } else if (last_fired_common_key is TKey k) { + common_values_changed?.Invoke(( + _deferred_removes.Select(krc => krc.Key).Where(v => _key_comparer.Equals(_key(v), k)), + _deferred_adds.Select(krc => krc.Key).Where(v => _key_comparer.Equals(_key(v), k)))); + } + _deferred_adds = new RefCountMap(_value_comparer); + _deferred_removes = new RefCountMap(_value_comparer); }); } } class CommonValueMonitorMultiplexor { + readonly Dictionary _members = new Dictionary(); int _member_id_counter; - readonly Dictionary add, Action remove, Func defer)> _members = new Dictionary add, Action remove, Func defer)>(); public IDisposable defer_updates() => new CompositeDisposable(_members.Values.Select(v => v.defer())); public void add(TSource value) { - foreach ((var add, var remove, var defer) in _members.Values) - add(value); + foreach (var m in _members.Values) + m.add(value); } public void remove(TSource value) { - foreach ((var add, var remove, var defer) in _members.Values) - remove(value); + foreach (var m in _members.Values) + m.remove(value); + } + + public void clear() { + foreach (var m in _members.Values) + m.clear(); } public IDisposable add_member_mon(CommonValueMonitor member_mon, Func get_value) { int id = _member_id_counter++; - _members.Add(id, ( - v => member_mon.add(get_value(v)), - v => member_mon.remove(get_value(v)), - member_mon.defer_updates)); + _members.Add(id, new SelectorMon(member_mon, get_value)); return Disposable.Create(() => _members.Remove(id)); } public IDisposable add_member_mon(CommonValueMonitor member_mon, Func get_value, Func where) { int id = _member_id_counter++; - _members.Add(id, ( - v => { - var res = get_value(v); - if (where(res)) - member_mon.add(res); - }, - v => { - var res = get_value(v); - if (where(res)) - member_mon.remove(res); - }, - member_mon.defer_updates)); + _members.Add(id, new WhereMon(member_mon, get_value, where)); return Disposable.Create(() => _members.Remove(id)); } public IDisposable add_member_mon(CommonValueGroupMonitor member_mon, Func get_value) where TKey : struct { int id = _member_id_counter++; - _members.Add(id, ( - v => { - var res = get_value(v); - member_mon.add(res); - }, - v => { - var res = get_value(v); - member_mon.remove(res); - }, - member_mon.deferr_updates - )); + _members.Add(id, new SelectorGroupMon(member_mon, get_value)); return Disposable.Create(() => _members.Remove(id)); } + + interface IMonitor { + void add(TSource value); + void remove(TSource value); + void clear(); + IDisposable defer(); + } + + class SelectorMon : IMonitor { + readonly CommonValueMonitor _monitor; + readonly Func _get_value; + + public SelectorMon(CommonValueMonitor monitor, Func get_value) { + _monitor = monitor; + _get_value = get_value; + } + + public void add(TSource value) => + _monitor.add(_get_value(value)); + + public void remove(TSource value) => + _monitor.remove(_get_value(value)); + + public void clear() => + _monitor.clear(); + + public IDisposable defer() => + _monitor.defer_updates(); + } + + class SelectorGroupMon : IMonitor where TKey : struct { + readonly CommonValueGroupMonitor _monitor; + readonly Func _get_value; + + public SelectorGroupMon(CommonValueGroupMonitor monitor, Func get_value) { + _monitor = monitor; + _get_value = get_value; + } + + public void add(TSource value) => + _monitor.add(_get_value(value)); + + public void remove(TSource value) => + _monitor.remove(_get_value(value)); + + public void clear() => + _monitor.clear(); + + public IDisposable defer() => + _monitor.deferr_updates(); + } + + class WhereMon : IMonitor { + readonly CommonValueMonitor _monitor; + readonly Func _where; + readonly Func _selector; + + public WhereMon(CommonValueMonitor monitor, Func selector, Func where) { + _monitor = monitor; + _where = where; + _selector = selector; + } + + public void add(TSource value) { + var r = _selector(value); + if (_where(r)) + _monitor.add(r); + } + + public void remove(TSource value) { + var r = _selector(value); + if (_where(r)) + _monitor.remove(r); + } + + public void clear() => + _monitor.clear(); + + public IDisposable defer() => + _monitor.defer_updates(); + } } static class CommonValueMonitorExtensions {