From 958212ea0c6ef845b7fc55be4e5b69f180bb8fa2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 15 Oct 2018 13:41:40 -0500 Subject: [PATCH] OrderBook - 'BranchFilterSource' subscriptions weren't getting disposed --- .../Trading/OrderBook/OrderBookRowVM.cs | 21 ++++++++++++------- .../Modules/Trading/OrderBook/OrderBookVM.cs | 20 +++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 8b0652f65..02bd76fbf 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -30,7 +30,6 @@ namespace mbts.spark { string _symbol; OrderBookRowVM _parent; OrderBookVM.BranchFilterSource _branch_filter_source; - IDisposable _branch_filter_sub; // Core IOrderBookCellStore _order_key_store; IOrderBookCellStore _parent_order_key_store; @@ -114,15 +113,11 @@ namespace mbts.spark { _show_order_modify_cmd = new ObservantCommand(() => bus.post(SparkTags.ShowModifyOrderTag, _order.Key)); _show_order_modify_cmd.OnNext(status.value == OrderStatus.Working); row_passes_filter = _book_vm.columns.filter(this); - _passes_filter = backing(nameof(passes_filter), - Observable.FromEvent>, IObservable>( - cb => _branch_filter_source_changed += cb, cb => _branch_filter_source_changed -= cb) - .SelectMany(o => o)); + _passes_filter = backing(nameof(passes_filter), row_passes_filter); } public event Action invalidated; public event Action<(OrderRecordTuple old_val, OrderRecordTuple new_val)> updated; - event Action> _branch_filter_source_changed; public OrderRecordImmutable order => _order; public OrderMetadata order_metadata => _model.factory.get_metadata(order_type.value); @@ -228,11 +223,15 @@ namespace mbts.spark { } public void join_branch_filter_source(OrderBookVM.BranchFilterSource new_branch_filter_source) { + if (_branch_filter_source != null) { + _branch_filter_source.passes_filter_changed -= _passes_filter.set; + } _branch_filter_source = new_branch_filter_source; _branch_filter_source.set_row_passes_filter(_order.Key, row_passes_filter); - _branch_filter_source_changed?.Invoke(_branch_filter_source); foreach (var child_row in _child_rows) child_row.join_branch_filter_source(_branch_filter_source); + _passes_filter.set(_branch_filter_source.passes_filter); + _branch_filter_source.passes_filter_changed += _passes_filter.set; } /// @@ -311,7 +310,13 @@ namespace mbts.spark { public override int GetHashCode() => (int)_order.Key; public override string ToString() => $"{order_key} {last_change} {parent_order_key}"; - protected override void Dispose(bool disposing) => Disposable.dispose(ref _branch_filter_sub); + protected override void Dispose(bool disposing) { + // idempotent + if (_branch_filter_source != null) { + _branch_filter_source.passes_filter_changed -= _passes_filter.set; + _branch_filter_source = null; + } + } static IEnumerable _descendents(OrderBookRowVM root) { foreach (var child in root.child_orders) { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 93996d4fe..07aaaacbc 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -243,6 +243,9 @@ namespace mbts.spark { internal void remove_branch_filter_root(uint key) => _branch_filter_roots.Remove(key); + protected override void Dispose(bool disposing) => + Disposable.dispose(_order_rows); + static GridSettingsManager _create_grid_settings_manager( IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, ObservableCollection rows, ICollectionView rows_view, ObservableCollection columns) { @@ -297,24 +300,21 @@ namespace mbts.spark { } } - internal class BranchFilterSource : IObservable { + internal class BranchFilterSource { readonly HashSet _orders_pass_filter = new HashSet(); - event Action _passes_filter_changed; + + public event Action passes_filter_changed; + + public bool passes_filter => _orders_pass_filter.Count > 0; public void set_row_passes_filter(uint key, bool value) { if (value) { if (_orders_pass_filter.Add(key) && _orders_pass_filter.Count == 1) - _passes_filter_changed?.Invoke(value); + passes_filter_changed?.Invoke(value); } else if (_orders_pass_filter.Remove(key) && _orders_pass_filter.Count == 0) { - _passes_filter_changed?.Invoke(value); + passes_filter_changed?.Invoke(value); } } - - public IDisposable Subscribe(IObserver observer) { - _passes_filter_changed += observer.OnNext; - observer.OnNext(_orders_pass_filter.Count > 0); - return Disposable.Create(() => _passes_filter_changed -= observer.OnNext); - } } class LiveSortingColumKeys : HashSet {