From 055e27f9aa7aa0dfa6e2fe8b3944cecaeea9cc1c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 16 Apr 2019 12:16:51 -0500 Subject: [PATCH] SPARK-2288 improve ladder startup performance --- .../Trading/AlgoStudio/VM/AlgoVMWrapper.cs | 9 +++++++ .../Orders/OrderTypeVMs/DefaultAlgoVM.cs | 5 ++++ .../spark/Orders/OrderTypeVMs/IOrderTypeVM.cs | 15 ++++++++++- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 26 ++++++++++++++++++- .../Order/AlgoContentTemplateSelector.xaml | 2 +- 5 files changed, 54 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs index e9ec228a4..3d3271dd3 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs @@ -94,7 +94,15 @@ namespace mbts.spark { public string abbreviation => _value?.abbreviation; public CustomOrderDefinitionImmutable definition => _algo_root?.definition ?? new CustomOrderDefinitionImmutable(new CustomOrderDefinition()); public ObservableCollection child_algo_selectors => _child_algo_selectors; + [EditorBrowsable(EditorBrowsableState.Never)] + public ObservableCollection child_algo_selectors_view { + get { + _value?.algo_root?.ensure_init(); + return _child_algo_selectors; + } + } public IReadOnlyObservableCollection algo_params => _algo_params; + [EditorBrowsable(EditorBrowsableState.Never)] public dynamic children_vm => _algo_root?.children_vm; IAlgoVM _algo_root => _value?.algo_root; @@ -104,6 +112,7 @@ namespace mbts.spark { public void load_from(CustomOrderDefinitionImmutable value) => _algo_root?.load_from(value); public void load_many(IEnumerable values) => _algo_root?.load_many(values); public Task load_from_async(CustomOrderDefinitionImmutable definition) => _algo_root is IAlgoVM vm ? vm.load_from_async(definition) : Task.FromResult(null); + void IAlgoVM.ensure_init() => _value?.algo_root?.ensure_init(); IDisposable _set_hooks(AlgoDefinitionVM vm) { var algo_root_subs = new DisposableContainer(); diff --git a/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs b/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs index 881187d5b..3ebb48bf8 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs @@ -7,6 +7,7 @@ using mbts.utils; using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.ComponentModel; using System.Threading.Tasks; using System.Windows.Input; using AlgoDef = bts.api.orderman.CustomOrderDefinition; @@ -46,6 +47,9 @@ namespace mbts.spark { public string abbreviation => display_name; public AlgoDefi definition => _definition.value; public ObservableCollection child_algo_selectors { get; } = new ObservableCollection(); + [EditorBrowsable(EditorBrowsableState.Never)] + public ObservableCollection child_algo_selectors_view => child_algo_selectors; + [EditorBrowsable(EditorBrowsableState.Never)] public dynamic children_vm => impl?.children_vm; public IReadOnlyObservableCollection algo_params => _algo_params; @@ -56,6 +60,7 @@ namespace mbts.spark { public void load_many(IEnumerable values) => impl?.load_many(values); public Task load_from_async(AlgoDefi definition) => impl?.load_from_async(definition) ?? Task.FromResult(definition); + void IAlgoVM.ensure_init() => impl?.ensure_init(); protected override void Dispose(bool disposing) => _clear_impl(); diff --git a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs index bcb095f81..9063ec29c 100644 --- a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs @@ -10,6 +10,7 @@ using mbts.utils; using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.ComponentModel; using System.Linq; using System.Reactive.Disposables; using System.Reactive.Linq; @@ -38,10 +39,23 @@ namespace mbts.spark { CustomOrderDefinitionImmutable definition { get; } IReadOnlyObservableCollection algo_params { get; } ObservableCollection child_algo_selectors { get; } + /// is almost completely redundant to . + /// However, it serves a very important purpose: the first time its getter is called, lazy-initialization is performed. + /// Therefor, callers should access for this data. + /// + /// This property should only be accessed by the view. The getter should trigger lazy-initialization () the first time it is accessed. + /// + [EditorBrowsable(EditorBrowsableState.Never)] + ObservableCollection child_algo_selectors_view { get; } + /// + /// This property should only be accessed by the view. The getter should trigger lazy-initialization () the first time it is accessed. + /// + [EditorBrowsable(EditorBrowsableState.Never)] dynamic children_vm { get; } bool key_match(KeyEventArgs e); Task load_from_async(CustomOrderDefinitionImmutable definition); void load_many(IEnumerable definitions); + void ensure_init(); } interface IDynamicAlgoVMImpl { @@ -67,7 +81,6 @@ namespace mbts.spark { AlgoParamPermissions permissions { get; set; } void revert(); void mark_committed(); - //void assign_to(CustomOrderDefinition target); } interface IAlgoParamVM : IAlgoParamVM { diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 3ba906ab2..bfbcf1e01 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -120,6 +120,7 @@ namespace mbts.spark { readonly ObservableAutoWrapper _child_algo_selectors; readonly Property _is_expanded; readonly DeferrableActionWrapper _def_change_notifier; + bool _is_initialized; SecurityInput _security_input; AlgoEditingPermissions _editing_permissions; IDisposable _pending_load; @@ -182,8 +183,21 @@ namespace mbts.spark { public OrdersModel orders_model => model; public OrderMetadata meta { get; } // child algos - public dynamic children_vm => _children_vm; + [EditorBrowsable(EditorBrowsableState.Never)] + public dynamic children_vm { + get { + ensure_init(); + return _children_vm; + } + } public ObservableCollection child_algo_selectors => _child_algo_selectors; + [EditorBrowsable(EditorBrowsableState.Never)] + public ObservableCollection child_algo_selectors_view { + get { + ensure_init(); + return _child_algo_selectors; + } + } // editing permissions public AlgoEditingPermissions editing_permissions { get => _editing_permissions; private set => Set(ref _editing_permissions, value); } // expand @@ -197,6 +211,7 @@ namespace mbts.spark { public void assign_to(AlgoDef value) { if (!(_descriptor.Accessor.GetValue(value) is TMutable algo)) _descriptor.Accessor.SetValue(value, algo = new TMutable()); + ensure_init(); foreach (var p in _auto_props) p.assign(algo); foreach (var sd in _child_algo_selector_data) { @@ -210,6 +225,13 @@ namespace mbts.spark { } } + public void ensure_init() { + if (!_is_initialized) { + _is_initialized = true; + sync_selectors(); + } + } + public bool key_match(KeyEventArgs key) => !string.IsNullOrEmpty(display_name) && key.Key == (Key.A + display_name[0] - 'A'); @@ -344,6 +366,8 @@ namespace mbts.spark { OrderDataHelper.get_child_algo_data(order_type); protected void sync_selectors() { + if (!_is_initialized) + return; using (reset()) { foreach (var c in get_selector_datum()) { _children_vm[c.name] = mk_selector(c.name, c.get_child_from_impl, new Func(defi => { diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index 90d976e12..99688c827 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1097,7 +1097,7 @@ - +