This commit is contained in:
Taha Afzal committed 2018-08-31 12:36:37 -04:00
commit aa0080224d
43 files changed
+690 -542

No files matched your search

+56 -106
View File
@@ -1,17 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using bts.api;
using bts.api;
using bts.spark;
using mbts;
using mbts.spark;
using mbts.ui;
using System;
using System.ComponentModel.Composition;
using mbts;
using System.Windows;
using System.Windows.Input;
using bts.spark;
using System.Reactive.Linq;
using System.Windows;
namespace bts {
[Export, Export(typeof(IShellDaemon))]
@@ -29,102 +24,57 @@ namespace bts {
bus.subscribe(SparkTags.ShowAndEditPickMultiple).OnDispatcher().Subscribe(show_and_edit_pick_multiple)
);
}
void show_pick_one(PartialCommand<SecurityMD> message) {
var vm = new ContractPickerModel(_bus, false, null);
var view = new ContractPickerView(vm);
Window picker = new Window {
Content = view,
Title = $"Select a Security for {message.title}",
Icon = message.icon,
Height = view.Height,
Width = view.Width
};
picker.Style = picker.TryFindResource("BTSWindow") as Style;
view.Height = Double.NaN;
view.Width = Double.NaN;
vm.ok_action = () => {
picker.Close();
message.complete(vm.result).execute(_bus);
};
picker.move_to_mouse();
picker.Show();
}
void show_filtered_pick_one((PartialCommand<SecurityMD> message, SecurityCriteria global_filter) message_and_filter) {
var vm = new ContractPickerModel(_bus, false, null, message_and_filter.global_filter);
var view = new ContractPickerView(vm);
Window picker = new Window {
Content = view,
Title = $"Select a Security for {message_and_filter.message.title}",
Icon = message_and_filter.message.icon,
Height = view.Height,
Width = view.Width
};
picker.Style = picker.TryFindResource("BTSWindow") as Style;
view.Height = Double.NaN;
view.Width = Double.NaN;
vm.ok_action = () => {
picker.Close();
message_and_filter.message.complete(vm.result).execute(_bus);
};
picker.move_to_mouse();
picker.Show();
}
void show_pick_multiple(PartialCommand<SecurityCriteria> message) {
var vm = new ContractPickerModel(_bus, true, null);
var view = new ContractPickerView(vm);
Window picker = new Window
{
Content = view,
Title = $"Select Securities for {message.title}",
Icon = message.icon,
Height = view.Height,
Width = view.Width,
};
picker.Style = picker.TryFindResource("BTSWindow") as Style;
view.Height = Double.NaN;
view.Width = Double.NaN;
vm.ok_action = () => {
picker.Close();
message.complete(vm.result_criteria).execute(_bus);
};
picker.move_to_mouse();
picker.Show();
}
void show_and_edit_pick_multiple((PartialCommand<SecurityCriteria> message, SecurityCriteria existing_criteria) message_and_data) {
var vm = new ContractPickerModel(_bus, true, message_and_data.existing_criteria);
var view = new ContractPickerView(vm);
Window picker = new Window {
Content = view,
Title = $" {message_and_data.message.title} security selection",
Icon = message_and_data.message.icon,
Height = view.Height,
Width = view.Width,
};
picker.Style = picker.TryFindResource("BTSWindow") as Style;
view.Height = Double.NaN;
view.Width = Double.NaN;
vm.ok_action = () => {
picker.Close();
message_and_data.message.complete(vm.result_criteria).execute(_bus);
};
picker.move_to_mouse();
picker.Show();
}
public void Dispose() {
public void Dispose() =>
Disposable.dispose(ref _dispose);
void show_pick_one(PartialCommand<SecurityMD> message) =>
_show_picker(message, _fmt_pick_one_title, new ContractPickerModel(_bus, false, null), vm => vm.result);
void show_filtered_pick_one((PartialCommand<SecurityMD> message, SecurityCriteria global_filter) message_and_filter) =>
_show_picker(message_and_filter.message, _fmt_pick_one_title, new ContractPickerModel(_bus, false, null, message_and_filter.global_filter), vm => vm.result);
void show_pick_multiple(PartialCommand<SecurityCriteria> message) =>
_show_picker(message, _fmt_pick_multiple_title, new ContractPickerModel(_bus, true, null), vm => vm.result_criteria);
void show_and_edit_pick_multiple((PartialCommand<SecurityCriteria> message, SecurityCriteria existing_criteria) message_and_data) =>
_show_picker(message_and_data.message, _fmt_pick_multiple_title, new ContractPickerModel(_bus, true, message_and_data.existing_criteria), vm => vm.result_criteria);
static string _fmt_pick_one_title(string message_title) => $"Select a Security for {message_title}";
static string _fmt_pick_multiple_title(string message_title) => $"Select Securities for {message_title}";
void _show_picker<T>(PartialCommand<T> message, Func<string, string> fmt_title, ContractPickerModel vm, Func<ContractPickerModel, T> select_result) {
var icon = message.icon;
if (icon == null) {
// not neccessary grind to hault just bc the icon is null, but it is most likely a dev-mistake that should be addressed.
handle_bad_icon("a null icon");
} else if (!icon.IsFrozen) {
handle_bad_icon("an icon that wasn't frozen (not threadsafe)");
}
//
void handle_bad_icon(string icon_error_desc) {
Log.Api.warn($"{nameof(SecurityPickerDaemon)} received a message '{message.title}' with {icon_error_desc}, will use {nameof(Icons.AdminFrozen)}.");
icon = Icons.AdminFrozen;
}
//
var cpv = new ContractPickerView(vm);
var window = new Window {
Content = cpv,
Title = fmt_title(message.title),
Icon = message.icon,
Height = cpv.Height,
Width = cpv.Width,
};
window.Style = window.TryFindResource("BTSWindow") as Style;
cpv.Width = double.NaN;
cpv.Height = double.NaN;
vm.ok_action = () => {
window.Close();
message.complete(select_result(vm)).execute(_bus);
};
window.move_to_mouse();
window.Show();
}
}
}
}
+33 -15
View File
@@ -1,5 +1,7 @@
using System;
using bts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
@@ -8,10 +10,18 @@ namespace mbts.ui {
public class Icons {
public const string
GearGeometryKey = nameof(GearGeometryKey),
PaymentGeometryKey = nameof(PaymentGeometryKey),
OrdersGeometryKey = nameof(OrdersGeometryKey),
PaymentGeometryKey = nameof(PaymentGeometryKey),
PlayGeometryKey = nameof(PlayGeometryKey),
ToolsGeometryKey = nameof(ToolsGeometryKey);
static Icons() {
// TODO: probably do this for all icons, only reason for holding back is the uncertainity of any unexpected impacts
AdminFrozen = Admin.frozen();
}
public static Geometry PlayGeometry => Geometry.Parse(_get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty);
static readonly string base_uri = "pack://application:,,,/Images/Icons/";
private static ResourceDictionary _resources = (ResourceDictionary)Application.LoadComponent(new Uri("/Images/Vector/Icons.xaml", UriKind.RelativeOrAbsolute));
@@ -27,6 +37,7 @@ namespace mbts.ui {
#pragma warning disable CS0618 // Type or member is obsolete
public static ImageSource Logo { get { return load_image("logo.ico"); } }
public static ImageSource Admin { get { return (DrawingImage)_resources["Admin"]; } }
public static ImageSource AdminFrozen { get; }
public static ImageSource Analytics { get { return (DrawingImage)_resources["Analytics"]; } }
public static ImageSource Sheets { get { return (DrawingImage)_resources["Sheets"]; } }
public static ImageSource Trades { get { return (DrawingImage)_resources["Trades"]; } }
@@ -113,21 +124,15 @@ namespace mbts.ui {
public static ImageSource Tools => create_icon(ToolsGeometryKey);
public static ImageSource ViewSettings => (DrawingImage)_resources["ViewSettings"];
public static ImageSource Wrench { get { return (DrawingImage)_resources["Wrench"]; } }
public static ImageSource UpArrow { get { return (DrawingImage)_resources["UpArrow"]; } }
public static ImageSource RightArrow { get { return ((DrawingImage)_resources["RightArrow"]); } }
public static ImageSource DownArrow { get { return ((DrawingImage)_resources["DownArrow"]); } }
public static ImageSource Support => (DrawingImage)_resources["SupportIcon"];
public static ImageSource create_icon(string geometric_path_key) => create_icon(geometric_path_key, Brushes.Black);
public static ImageSource create_icon(string geometric_path_key, Brush brush, Pen pen = null) {
object obj = _resources[geometric_path_key];
if (obj is string path) {
if (string.IsNullOrEmpty(path))
throw new ArgumentException($"Resource lookup of '{geometric_path_key}' did not return a valid string.", nameof(geometric_path_key));
return _create_icon(new[] { path }, brush, pen);
} else if (obj is string[] paths) {
return _create_icon(paths, brush, pen);
} else return null;
}
public static ImageSource create_icon(string geometric_path_key) =>
create_icon(geometric_path_key, Brushes.Black);
public static ImageSource create_icon(string geometric_path_key, Brush brush, Pen pen = null) =>
_create_icon(_get_geometric_path(geometric_path_key), brush, pen);
static ImageSource _create_icon(IEnumerable<string> paths, Brush brush, Pen pen = null) {
var drawing_group = new DrawingGroup();
@@ -136,5 +141,18 @@ namespace mbts.ui {
}
return new DrawingImage(drawing_group);
}
static IEnumerable<string> _get_geometric_path(string geometric_path_key) {
object obj = _resources[geometric_path_key];
if (obj is string path) {
if (string.IsNullOrEmpty(path)) {
Log.Api.error($"Resource lookup of '{geometric_path_key}' did not return a valid string.", nameof(geometric_path_key));
path = string.Empty;
}
return new[] { path };
} else if (obj is string[] paths) {
return paths.Where(p => !string.IsNullOrEmpty(p)).ToArray();
} else return null;
}
}
}
+33 -17
View File
@@ -17,9 +17,17 @@
M28.000001,6.0000026L28.000001,15 6.0010006,15 6.0010006,17.000003 30.001,17.000003 30.001,6.0000026z M14.231,2.9540056L14.979999,2.9540056 14.979999,3.987005C15.704998,4.009005,16.200997,4.178005,16.550998,4.3600049L16.248998,5.0620046C15.994998,4.9340047 15.499998,4.7010047 14.725999,4.7010047 13.796,4.7010047 13.445001,5.1900046 13.445001,5.6160046 13.445001,6.1710043 13.893,6.4470041 14.943999,6.8310037 16.187998,7.2780037 16.816998,7.8320036 16.816998,8.7800031 16.816998,9.6210027 16.151998,10.409003 14.907999,10.591002L14.907999,11.698002 14.146,11.698002 14.146,10.622003C13.445001,10.611002,12.720001,10.420002,12.297002,10.154003L12.587001,9.4400029C13.022001,9.696003 13.651,9.8980026 14.328,9.8980026 15.185999,9.8980026 15.765998,9.4620028 15.765998,8.8540034 15.765998,8.2680035 15.293999,7.9060035 14.4,7.5870035 13.167001,7.1610038 12.406001,6.6710041 12.406001,5.7440041 12.406001,4.8600047 13.119,4.189005 14.231,4.0290052z M2,2.0000002L2,13 26.000001,13 26.000001,2.0000002z M0,0L28.000001,0 28.000001,4.0000031 32.001,4.0000031 32.001,19.000003 4.0010006,19.000003 4.0010006,15 0,15z
</sys:String>
<sys:String x:Key="{x:Static mbts:Icons.PlayGeometryKey}">
M0,0L25.194,16 0,32z
</sys:String>
<sys:String x:Key="{x:Static mbts:Icons.ToolsGeometryKey}">
M4.9629898,25.440168C4.564003,25.440168 4.0650101,25.640182 3.7659989,25.939165 3.0680008,26.638176 3.0680008,27.635191 3.7659989,28.3342 4.4639969,29.032204 5.4620133,29.032204 6.1600113,28.3342 6.8589859,27.635191 6.8589859,26.638176 6.1600113,25.939165 5.760994,25.640182 5.3620072,25.440168 4.9629898,25.440168z M18.432014,18.457121L22.422005,22.447138 24.816994,22.946165 29.107002,29.431192 27.509987,31.027212 21.025002,26.737175 20.526985,24.343178 16.535988,20.352123z M8.1560135,18.357115L13.643013,23.84415C11.048988,26.638176 8.9539872,28.932196 7.9560013,29.930189 6.359993,31.526207 3.6659928,31.626215 2.070015,29.930189 0.47400668,28.3342 0.47400668,25.640182 2.070015,24.044165z M2.967995,6.7840408C2.768013,6.7840408 2.5690079,6.8840479 2.4690018,6.9840545 2.1699906,7.2830371 2.1699906,7.7820638 2.4690018,8.0810469L11.746986,17.359123C12.047005,17.659113 12.544991,17.659113 12.845009,17.359123 13.14399,17.06011 13.14399,16.561113 12.845009,16.2621L3.5659867,6.9840545C3.3670121,6.8840479,3.1669998,6.7840408,2.967995,6.7840408z M5.2620011,4.4890431C5.0629959,4.4890431 4.8630143,4.5890192 4.7640152,4.6890262 4.3649979,4.9880394 4.3649979,5.4870356 4.7640152,5.8860554L14.042,15.164101C14.341011,15.46409 14.840004,15.46409 15.139015,15.164101 15.439003,14.865087 15.439003,14.366092 15.139015,14.067109L5.8610001,4.6890262C5.661995,4.5890192,5.4620133,4.4890431,5.2620011,4.4890431z M4.3649979,2.3940283C5.4620133,2.3940281,6.5589981,2.7930175,7.3580094,3.5920337L19.328987,15.46409 13.342995,21.450153 1.2720107,9.6770657C-0.42400357,7.9810704 -0.42400357,5.2880291 1.2720107,3.6910337 2.1699906,2.7930175 3.267006,2.3940281 4.3649979,2.3940283z M24.217995,0C25.31501,-8.5992724E-08,26.312996,0.20001344,27.211006,0.59900296L23.021004,4.7890328C22.223,5.5870422,22.223,6.7840408,23.021004,7.4820436L24.617012,9.079069C25.414986,9.8770789,26.612007,9.8770789,27.311012,9.079069L31.501015,4.9880394C31.799995,5.8860554 32.000008,6.7840408 32.000008,7.7820638 32.000008,12.07207 28.508003,15.564097 24.217995,15.564097 19.927986,15.564097 16.436012,12.07207 16.436012,7.7820638 16.436012,3.4920272 19.927986,-8.5992724E-08 24.217995,0z
</sys:String>
<Geometry x:Key="arrow_geometry">
F1 M 78.1398,324.18L 52.5865,298.626C 51.6892,297.728 50.3385,297.459 49.1678,297.946C 47.9971,298.43 47.2305,299.574 47.2305,300.843L 60.6385,326.398L 47.2305,351.952C 47.2305,353.223 47.9971,354.364 49.1678,354.848C 49.5558,355.011 49.9638,355.09 50.3678,355.09C 51.1838,355.09 51.9852,354.77 52.5865,354.171L 78.1398,328.616C 78.7238,328.032 79.0598,327.224 79.0598,326.398C 79.0598,325.572 78.7238,324.764 78.1398,324.18 Z
</Geometry>
<DrawingImage x:Key="Bookmarks">
<DrawingImage.Drawing>
@@ -492,17 +500,6 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z">
</DrawingImage.Drawing>
</DrawingImage>
<DrawingImage x:Key="PlayIcon">
<DrawingImage.Drawing>
<DrawingGroup>
<DrawingGroup.Children>
<GeometryDrawing Brush="Black"
Geometry="M0,0L25.194,16 0,32z" />
</DrawingGroup.Children>
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
<!-- help / support -->
<DrawingImage x:Key="SupportIcon">
<DrawingImage.Drawing>
@@ -763,20 +760,39 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z">
</DrawingImage.Drawing>
</DrawingImage>
<DrawingImage x:Key="UpArrow" x:Shared="False">
<DrawingImage x:Key="RightArrow" x:Shared="False">
<DrawingImage.Drawing>
<DrawingGroup>
<DrawingGroup.Children>
<GeometryDrawing
Brush="Black"
Geometry="M16,0L32,19.745 0,19.745z"
/>
<GeometryDrawing Geometry="{StaticResource arrow_geometry}">
<GeometryDrawing.Pen>
<Pen Thickness="3" Brush="Black"/>
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup.Children>
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
<DrawingImage x:Key="DownArrow" x:Shared="False">
<DrawingImage.Drawing>
<DrawingGroup>
<DrawingGroup.Children>
<GeometryDrawing Geometry="{StaticResource arrow_geometry}">
<GeometryDrawing.Pen>
<Pen Thickness="3" Brush="Black"/>
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup.Children>
<DrawingGroup.Transform>
<RotateTransform Angle="90"/>
</DrawingGroup.Transform>
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
<!-- Pin
<!-- Pin
<Path Data="F1M3,11L3,7 0,7 0,6 1,6 1,1 1,0 6,0 6,1 6,6 7,6 7,7 4,7 4,11 3,11z M2,1L2,6 4,6 4,1 2,1z" />
Unpin
<Path Data="F1M0,3L4,3 4,0 5,0 5,1 10,1 11,1 11,6 10,6 5,6 5,7 4,7 4,4 0,4 0,3z M10,2L5,2 5,4 10,4 10,2z" />
@@ -13,7 +13,7 @@ using System.Windows;
namespace mbts.spark {
class MarketViewWindow : SparkWindow<MarketViewWindowFactory.StartupData>, ISharedWindow {
const string _window_type = "MarketView", _thread_id = "MarketView";
const string _window_type = "MarketView", _thread_id = "MarketView", _window_type_display_name = "Market View";
readonly OrdersModel _orders_model;
readonly AllowOnce _init_guard = new AllowOnce("MarketView");
MarketViewVM _vm;
@@ -44,10 +44,8 @@ namespace mbts.spark {
var state_src = Observable.FromEvent<Action<MarketViewWindowFactory.StartupData>, MarketViewWindowFactory.StartupData>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state);
_vm = new MarketViewVM(_bus, _orders_model, state_src);
_view = new MarketViewView { DataContext = _vm };
var update_securities_tag = new SparkTags.SparkTag<SecurityCriteria>("MarketView Callback");
var update_securities_cmd = SparkCommand.create("Update Market View", Icon, update_securities_tag);
var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
_commands = new List<SparkCommand> {
SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (update_securities_cmd, _state.security_criteria)),
SparkCommands.ShowLadders.complete(_vm.selected_security_mds_observable(), smds => smds.Count > 0),
SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.current_security_md, md => md.HasValue, ObjectHelper.ValueOrDefault),
SparkCommands.ShowFills.complete(_vm.selected_securities_observable(), _ => true,
@@ -56,9 +54,10 @@ namespace mbts.spark {
})
),
SparkCommands.ShowTimeAndSales.complete(_vm.selected_securities_observable(), _ => true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria),
SparkCommands.ShowSyntheticCreate.complete(_vm.selected_securities_observable(), secs => secs.Count > 0 && secs.Count <= 24, secs => new SecurityCriteria(secs))
SparkCommands.ShowSyntheticCreate.complete(_vm.selected_securities_observable(), secs => secs.Count > 0 && secs.Count <= 24, secs => new SecurityCriteria(secs)),
SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria))
};
_subscriptions = _bus.subscribe(update_securities_tag).OnDispatcher().Subscribe(c =>
_subscriptions = _bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(c =>
_state_changed?.Invoke(_state = new MarketViewWindowFactory.StartupData(c, _vm.rows_view.GetSortingCriteria(), _vm.get_filter_states())));
}
@@ -68,4 +67,4 @@ namespace mbts.spark {
Commands.OfType<IDisposable>().DisposeAll();
}
}
}
}
@@ -17,7 +17,7 @@ using static mbts.ui.controls.DIYGrid;
namespace mbts.spark {
class TimeAndSalesWindow : SparkWindow<StartupData>, ISlowWindow {
const string _window_type = "TimeAndSales";
const string _window_type = "TimeAndSales", _window_type_display_name = "Time And Sales";
readonly MDConsumer _consumer;
readonly TimeAndSalesWindowFactory _factory;
SingleValuePump<TimeAndSalesVM> _vm;
@@ -56,18 +56,17 @@ namespace mbts.spark {
public void thread_init() {
_dispose_resources();
_vm = new SingleValuePump<TimeAndSalesVM>();
var update_securities_tag = new SparkTags.SparkTag<SecurityCriteria>("TimeAndSales Callback");
var update_securities_cmd = SparkCommand.create("Update Time and Sales", Icon, update_securities_tag);
var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
var current_smd_source = _vm.observable.SelectMany(vm => vm.current_security_md_observable(_bus)).OnDispatcher();
var selected_secs_source = _vm.observable.SelectMany(vm => vm.selected_securities_observable()).OnDispatcher();
_commands = new SparkCommand[] {
SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (update_securities_cmd, _state.security_criteria)),
SparkCommands.ShowLadder.complete(current_smd_source, md => md.HasValue, ObjectHelper.ValueOrDefault),
SparkCommands.ShowOrderTicketFromSecurity.complete(current_smd_source, md => md.HasValue, ObjectHelper.ValueOrDefault),
SparkCommands.ShowFills.complete(selected_secs_source, always_true, get_fills_startup_data),
SparkCommands.ShowMarketView.complete(selected_secs_source, always_true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria)
SparkCommands.ShowMarketView.complete(selected_secs_source, always_true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria),
SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria))
};
_subscriptions = _bus.subscribe(update_securities_tag).OnDispatcher().Subscribe(update_criteria);
_subscriptions = _bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(update_criteria);
_initialize();
bool always_true<T>(T _) => true;
@@ -12,6 +12,7 @@ using bts.api;
using System.ComponentModel.Composition;
using mbts.ui.spark;
using mbts.persist;
using mbts.config;
namespace bts.ui {
[Export(typeof(IShellModule))]
@@ -25,6 +26,11 @@ namespace bts.ui {
public SettingsShellModule(IBus bus, UserSettingsHub settings_hub, WorkspacesModel ws) {
// todo: settings dialog
ws_model = ws;
var actions_list = new List<SparkCommand>(2) { SparkCommands.ShowWorkspaces };
if (Configuration.get<bts.config.toggles.ToastNotifications>().enabled) {
actions_list.Add(SparkCommands.ShowSettings);
}
actions = actions_list;
_dispose = Disposable.Create(
bus.subscribe(SparkTags.ShowWorkspaces).Subscribe(_ => show_workspaces_dialog()),
bus.subscribe(SparkTags.ShowSettings).Subscribe(_ => {
@@ -36,16 +42,13 @@ namespace bts.ui {
_bus = bus;
}
public ImageSource icon => Icons.Admin;
public ImageSource icon => Icons.AdminFrozen;
public string name => "Settings";
public int priority => 40;
public IEnumerable<SparkCommand> actions => new SparkCommand[]{
SparkCommands.ShowWorkspaces,
SparkCommands.ShowSettings
};
public IEnumerable<SparkCommand> actions { get; }
public Task<IShellWindow> create(Stream load_stream) {
throw new NotImplementedException();
@@ -52,13 +52,15 @@ namespace mbts.spark {
cvls.LiveFilteringProperties.AddRange(nameof(OrderBookRowVM.is_visible), nameof(OrderBookRowVM.passes_filter));
_current_row = backing<OrderBookRowVM>(nameof(current_row));
bool expand_collapse_all_status = false;
expand_collapse_all_rows_command = new DelegateCommand(
collapse_all_rows_command = new DelegateCommand(
() => {
foreach (var r in _order_rows.Where(r => r.is_visible && r.passes_filter)) {
r.is_expanded = !expand_collapse_all_status;
}
expand_collapse_all_status = !expand_collapse_all_status;
foreach (var r in _order_rows.Where(r => r.is_visible && r.passes_filter))
r.is_expanded = false;
});
expand_all_rows_command = new DelegateCommand(
() => {
foreach (var r in _order_rows.Where(r => r.is_visible && r.passes_filter))
r.is_expanded = true;
});
grid_settings_manager = _create_grid_settings_manager(owner_title, bus, notification_service, model, _order_rows, rows_view, columns);
@@ -218,7 +220,8 @@ namespace mbts.spark {
public IEnumerable<OrderRecordImmutable> selected_orders => _selected_rows.Select(r => r.order);
public GridSettingsManager<OrderBookRowVM, OrderRecordTuple, INotificationServiceDataCache, OrderRecordTuplePredicate> grid_settings_manager { get; }
public ICommand expand_collapse_all_rows_command { get; }
public ICommand collapse_all_rows_command { get; }
public ICommand expand_all_rows_command { get; }
public void row_selection_changed(SelectionChangedEventArgs e) {
RowSelectionHelper.apply_changes(_selected_rows, e);
@@ -28,10 +28,10 @@ namespace mbts.spark {
, _cancel_all_orders_command
, _cancel_selected_orders_command
, _recreate_selected_orders_command
, _toggle_collapse_expand_all_command
, _toggle_collapse_all_command
, _toggle_expand_all_command
, _show_grid_settings_command;
public OrderBookWindow(OrdersModel model, OrderBookWindowFactory factory, IBus bus, INotificationService notification_service, OrderBookWindowFactory.OrderBookStartupData state, ImageSource icon)
: base("Order Book", bus, factory, SparkCommands.ShowOrders.icon) {
_model = model;
@@ -98,11 +98,15 @@ namespace mbts.spark {
can_execute: () => _vm.selected_orders.Any(x => _passes_recreate_search_criteria(x))
);
_toggle_collapse_expand_all_command = new SparkCommandCommand("Expand / Collapse All",
Icons.UpArrow,
_vm.expand_collapse_all_rows_command);
_toggle_collapse_all_command = new SparkCommandCommand("Collapse All",
Icons.RightArrow,
_vm.collapse_all_rows_command);
_show_grid_settings_command = SparkCommands.grid_settings_command(_vm.grid_settings_manager.launch_settings_editor);
_toggle_expand_all_command = new SparkCommandCommand("Expand All",
Icons.DownArrow,
_vm.expand_all_rows_command);
_show_grid_settings_command = SparkCommands.window_settings_command(_vm.grid_settings_manager.launch_settings_editor);
_commands = new SparkCommand[] {
_show_fills_command,
@@ -112,7 +116,8 @@ namespace mbts.spark {
_cancel_sell_orders_command,
_cancel_all_orders_command,
_recreate_selected_orders_command,
_toggle_collapse_expand_all_command,
_toggle_collapse_all_command,
_toggle_expand_all_command,
_show_grid_settings_command
};
_vm.selected_order_changed += _vm_selected_order_changed;
+28 -34
View File
@@ -3,9 +3,11 @@ using bts.api;
using bts.shell;
using bts.spark;
using mbts.collections.extensions;
using mbts.config;
using mbts.persist;
using mbts.spark;
using mbts.ui.extensions;
using mbts.ui.utility;
using NAudio.Wave;
using System;
using System.Collections.Generic;
@@ -51,7 +53,7 @@ namespace mbts.ui {
ToastNotificationController _toast_controller;
SoundNotificationPlayer _sound_player;
Dispatcher _dispatcher;
bool _toast_notifications_enabled, _sound_notifications_enabled;
bool _toast_notifications_enabled, _sound_notifications_enabled = NotificationSettings.Default.sound_notification.enabled;
[ImportingConstructor]
public Notifier(IBus bus, UserSettingsHub settings_hub) {
@@ -69,27 +71,29 @@ namespace mbts.ui {
if (_disposer.has_dispose_started)
return;
_sound_player = SoundNotificationPlayer.create();
_toast_controller = new ToastNotificationController(bus);
_settings_sub = settings_hub.subscribe_default_settings().StartWith(settings_hub.current).OnDispatcher().Subscribe(s => {
if (s == null || _disposer.has_dispose_started)
return;
_sound_notifications_enabled = s.notification.sound_notification.enabled;
switch (s.notification.toast_notification.mode) {
case ToastNotificationSettings.Mode.Disabled:
_toast_notifications_enabled = false;
_toast_controller.hide();
break;
case ToastNotificationSettings.Mode.Flash:
_toast_notifications_enabled = true;
_toast_controller.flash_duration = s.notification.toast_notification.duration ?? _fallback_flash_duration;
break;
case ToastNotificationSettings.Mode.ManualClose:
_toast_notifications_enabled = true;
_toast_controller.flash_duration = null;
break;
}
_toast_controller.max_height = Math.Max(s.notification.toast_notification.max_height, _toast_notification_box_min_height);
});
if (Configuration.get<bts.config.toggles.ToastNotifications>().enabled) {
_toast_controller = new ToastNotificationController(bus);
_settings_sub = settings_hub.subscribe_default_settings().StartWith(settings_hub.current).OnDispatcher().Subscribe(s => {
if (s == null || _disposer.has_dispose_started)
return;
_sound_notifications_enabled = s.notification.sound_notification.enabled;
switch (s.notification.toast_notification.mode) {
case ToastNotificationSettings.Mode.Disabled:
_toast_notifications_enabled = false;
_toast_controller.hide();
break;
case ToastNotificationSettings.Mode.Flash:
_toast_notifications_enabled = true;
_toast_controller.flash_duration = s.notification.toast_notification.duration ?? _fallback_flash_duration;
break;
case ToastNotificationSettings.Mode.ManualClose:
_toast_notifications_enabled = true;
_toast_controller.flash_duration = null;
break;
}
_toast_controller.max_height = Math.Max(s.notification.toast_notification.max_height, _toast_notification_box_min_height);
});
}
// it is possible that dispose was called on another thread while we were initializing things above.
if (_disposer.has_dispose_started) {
Disposable.dispose(ref _settings_sub);
@@ -98,8 +102,7 @@ namespace mbts.ui {
(_dispatcher = Dispatcher.CurrentDispatcher).UnhandledException += _on_dispatcher_UnhandledException;
Dispatcher.Run();
}
}
catch (Exception ex) {
} catch (Exception ex) {
Log.assert(false, $"Exception in {Thread.CurrentThread.Name} thread: {ex}");
_disposer.Dispose();
}
@@ -171,16 +174,7 @@ namespace mbts.ui {
}
static IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> _all_players() =>
new Dictionary<SoundNotification.SystemSound, NAudioPlayer> {
{ SoundNotification.SystemSound.GameCorrect, new NAudioPlayer(bts.Properties.Resources.game_sound_correct) },
{ SoundNotification.SystemSound.GameIncorrect, new NAudioPlayer(bts.Properties.Resources.game_sound_wrong) },
{ SoundNotification.SystemSound.GameOverArcade, new NAudioPlayer(bts.Properties.Resources.game_over_arcade) },
{ SoundNotification.SystemSound.Whistle, new NAudioPlayer(bts.Properties.Resources.whistle) },
{ SoundNotification.SystemSound.BellCounter, new NAudioPlayer(bts.Properties.Resources.bell_counter) },
{ SoundNotification.SystemSound.Powerup, new NAudioPlayer(bts.Properties.Resources.powerup) },
{ SoundNotification.SystemSound.CashRegister, new NAudioPlayer(bts.Properties.Resources.cash_register_purchase) },
{ SoundNotification.SystemSound.Reload, new NAudioPlayer(bts.Properties.Resources.reload_1911) }
};
EnumHelper.get_values<SoundNotification.SystemSound>().ToReadOnlyDictionary(s => s, NAudioPlayer.create);
}
// This class adopts to role of view-controller in the mvc paradigm, rather than view-model in mvvm.
+10 -4
View File
@@ -1,4 +1,5 @@
using bts.shell;
using mbts.ui.utility;
using NAudio.Wave;
using System;
using System.IO;
@@ -9,21 +10,26 @@ namespace mbts.ui {
// number of milliseconds to delay playing sound,
// during which time all subsequent requests to play the same sound will be ignored.
const int _delay_ms = 75;
readonly int _start_position;
WaveOutEvent _wave_out = new WaveOutEvent();
WaveFileReader _wave_reader;
bool _is_playing, _is_play_requested;
public NAudioPlayer(Stream uwave_stream) {
public NAudioPlayer(Stream uwave_stream, int start_position = 0) {
var ms = new MemoryStream();
uwave_stream.CopyTo(ms);
ms.Position = 0;
_wave_reader = new WaveFileReader(ms);
_wave_reader.Position = _start_position = (start_position < _wave_reader.Length ? start_position : 0);
_wave_out.Init(_wave_reader);
_wave_out.PlaybackStopped += _on_playback_stopped;
}
public static NAudioPlayer create(SoundNotification.SystemSound system_sound) =>
new NAudioPlayer(_get_stream(system_sound));
public static NAudioPlayer create(SoundNotification.SystemSound system_sound) {
var stream = _get_stream(system_sound);
var sb = EnumHelper.get_attribute<SoundNotification.SystemSound, SilenceBufferAttribute>(system_sound);
return sb != null ? new NAudioPlayer(stream, sb.start_position) : new NAudioPlayer(stream);
}
public void play() {
if (_is_playing) {
@@ -36,7 +42,7 @@ namespace mbts.ui {
}
void _on_playback_stopped(object sender, StoppedEventArgs e) {
_wave_reader.Position = 0;
_wave_reader.Position = _start_position;
if (_is_play_requested) {
_is_play_requested = false;
_play_core();
@@ -25,6 +25,13 @@ namespace bts.shell {
}
}
class SilenceBufferAttribute : Attribute {
public readonly int start_position;
public SilenceBufferAttribute(int start_position) =>
this.start_position = start_position;
}
[ProtoContract]
class SoundNotification {
SystemSound? _system_sound;
@@ -37,10 +44,12 @@ namespace bts.shell {
GameIncorrect,
[License(LicenseType.PublicDomain, "Game Over Arcade", "myfox14", link: "https://freesound.org/people/myfox14/sounds/")]
GameOverArcade,
[SilenceBuffer(100000)]
[License(LicenseType.PublicDomain, "Whistle", "zstewart09", link: "https://freesound.org/people/zstewart09/sounds")]
Whistle,
[License(LicenseType.PublicDomain, "Powerup", "kianda", link: "https://freesound.org/people/kianda/sounds/")]
Powerup,
[SilenceBuffer(130000)]
[License(LicenseType.AttributionLicense, "Bell, Counter, A", "Inspectorj of Freesound.org", link: "https://www.jshaw.co.uk")]
BellCounter,
[License(LicenseType.PublicDomain, "Cash Register Purchase", "Zott820", link: "https://freesound.org/people/Zott820/sounds/")]
+4 -6
View File
@@ -19,14 +19,12 @@ namespace mbts.spark {
key = new FillTupleKey(fill.FillKey, order.HasValue ? order.Value.Key : 0u, security_md.HasValue ? security_md.Value.security.Id : 0u);
}
// the TrimEnd is very important b/c the server currently does not trim,
// but the account is part of the group, so this is necessary
public string account {
get {
var trimmed_account_string = string.Empty;
if (fill.FillKind != FillKind.Sod && order.HasValue && order.Value.HasDef) trimmed_account_string = order.Value.Def.Account;
else trimmed_account_string = fill.Account;
return trimmed_account_string == null ? string.Empty : trimmed_account_string.Trim();
var account_string = string.Empty;
if (fill.FillKind != FillKind.Sod && order.HasValue && order.Value.HasDef) account_string = order.Value.Def.Account;
else account_string = fill.Account;
return account_string == null ? string.Empty : account_string;
}
}
+1 -1
View File
@@ -41,7 +41,7 @@ namespace mbts.spark {
var scheduler = ThreadPoolScheduler.Instance;
var interval = TimeSpan.FromMilliseconds(100);
on_orders = _service.subscribei_orders().Naggle(interval, scheduler).Table().Cache();
on_positions = _position_service.subscribei_position_data().Table().Cache();
on_positions = _position_service.subscribei_position_data().Naggle(interval, scheduler).Table().Cache();
working_orders =
on_orders.Scan(
ImmutableDictionary<uint,OrderRecordImmutable>.Empty,
@@ -19,7 +19,7 @@ namespace mbts {
public static bool check_order_transition_trigger(OrderRecordTuple order, Func<OrderRecordImmutable, bool> order_predicate_core, IPredicate<SecurityImmutable> security_predicate, INotificationServiceDataCache data_cache, out OrderRecordTuple oldval) {
if (check_security_predicate(order, security_predicate) && order_predicate_core(order.order)) {
oldval = data_cache.get_previous_order_state(order.order.Key);
return oldval == null ? !data_cache.is_first_order_update : order_predicate_core(oldval.order);
return oldval == null ? !data_cache.is_first_order_update : !order_predicate_core(oldval.order);
}
oldval = null;
return false;
@@ -1,4 +1,5 @@
using mbts.collections.extensions;
using mbts.config;
using mbts.spark;
using mbts.ui.shell;
using mbts.ui.spark;
@@ -31,6 +32,8 @@ namespace mbts.ui.settings {
}
static class PredicateBuilderVMWrapper {
static readonly bool _toast_notifications_enabled_global = Configuration.get<bts.config.toggles.ToastNotifications>().enabled;
public static ITemplatedPropertyWrapperVM<TSource> wrap_child_oneof<TSource, TChild, TChildOneof>(
Func<TSource, TChild> get, Action<TSource, TChild> set, Func<TChild, TChildOneof> get_child_oneof, Dictionary<TChildOneof, ITemplatedPropertyWrapperVM<TChild>> oneof_vms)
where TChildOneof : struct
@@ -104,8 +107,9 @@ namespace mbts.ui.settings {
}
}
public ITemplatedPropertyWrapperVM<TPredicate> selected_predicate => _selected_predicate.Value;
public bool can_enable_toast_notifications => _can_enable_toast_notifications.Value;
public bool can_enable_toast_notifications => _toast_notifications_enabled_global && _can_enable_toast_notifications.Value;
public bool toast_notifications_enabled { get => _toast_notifications_enabled.Value; set => _toast_notifications_enabled.set(value); }
public bool is_root => true;
string ITemplateSelectorKey.key => PredicateTemplateKeys.Recursive;
protected override void Dispose(bool disposing) =>
@@ -161,6 +165,7 @@ namespace mbts.ui.settings {
}
}
public ITemplatedPropertyWrapperVM<TChild> selected_predicate => _selected_predicate.Value;
public bool is_root => false;
string ITemplateSelectorKey.key => _template_key;
protected override void Dispose(bool disposing) {
+10 -3
View File
@@ -70,7 +70,7 @@ namespace bts.spark
public static SparkCommand ShowWorkspaces =>
SparkCommand.create("Workspaces", Icons.FavoriteWindow, SparkTags.ShowWorkspaces);
public static SparkCommand ShowSettings =>
SparkCommand.create("Settings", Icons.Admin, SparkTags.ShowSettings);
SparkCommand.create("Settings", Icons.AdminFrozen, SparkTags.ShowSettings);
// Support
public static SparkCommand ShowManual =>
@@ -111,7 +111,14 @@ namespace bts.spark
public static PartialCommand<IEnumerable<(OrderDefinitionImmutable, double, uint)>> RecreateSelectedOrders =>
SparkCommand.create("Recreate", Icons.Beaker, SparkTags.RecreateOrder);
public static SparkCommand grid_settings_command(IDialogCommand launch_settings_editor) =>
new SparkCommandWrapper("Window Settings", Icons.Gear, launch_settings_editor);
// TODO: remove this method, eventually want all windows to use window_settings_command()
public static SparkCommand change_securities_command(Func<(PartialCommand<SecurityCriteria>, SecurityCriteria)> get_param) =>
SparkCommand.create("Settings", Icons.AdminFrozen, SparkTags.ShowAndEditPickMultiple, get_param);
public static PartialCommand<SecurityCriteria> change_securities_callback(string window_name) =>
SparkCommand.create(window_name, Icons.AdminFrozen, new SparkTags.SparkTag<SecurityCriteria>($"Change {window_name} securities callback"));
public static SparkCommand window_settings_command(IDialogCommand launch_settings_editor) =>
new SparkCommandWrapper("Settings", Icons.AdminFrozen, launch_settings_editor);
}
}
@@ -17,7 +17,8 @@ namespace mbts.spark {
[ProtoMember(1)]
LadderSettings _ladder;
[ProtoMember(2)]
// removing NotificationSettings these from proto-serialization, since they are disabled by default for now.
// This way, when they are enabled, there won't be any backwards compatability issues to worry about, as no clients will have persisted them yet.
NotificationSettings _notification;
public UserSettings() { }
@@ -0,0 +1,27 @@
using System;
using System.Reactive.Subjects;
namespace mbts.utils {
class KeyDrivenObservable<TKey, TValue> : ISubject<TKey, TValue>, IDisposable {
readonly Func<TKey, IObservable<TValue>> _selector;
Subject<TValue> _value_subject = new Subject<TValue>();
IDisposable _current_key_sub;
public KeyDrivenObservable(Func<TKey, IObservable<TValue>> selector) =>
_selector = selector;
public void OnCompleted() => Disposable.dispose(ref _current_key_sub);
public void OnError(Exception error) { }
public void OnNext(TKey key) {
Disposable.dispose(ref _current_key_sub);
_current_key_sub = _selector(key)?.Subscribe(_value_subject);
}
public IDisposable Subscribe(IObserver<TValue> observer) => _value_subject.Subscribe(observer);
public void Dispose() {
Disposable.dispose(ref _current_key_sub);
Disposable.dispose(ref _value_subject);
}
}
}
@@ -649,9 +649,12 @@ namespace mbts.ui.shell
}
} else {
_items.sync_with(value);
if (_is_user_selected_item)
if (_is_user_selected_item) {
_is_user_selected_item = _items.Contains(_selected_item);
_try_auto_select();
}
if (!_is_user_selected_item) {
_try_auto_select();
}
}
}
void IObserver<IEnumerable<T>>.OnError(Exception error) { }
@@ -21,7 +21,7 @@
<u:WindowStyle.TitleContentTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Image Margin="3,1" Source="{x:Static u:Icons.Gear}"/>
<Image Margin="3,1" Source="{x:Static u:Icons.Admin}"/>
<TextBlock Text="{Binding owner_title, StringFormat='{}\&apos;{0}\&apos; Window Settings'}"/>
</StackPanel>
</DataTemplate>
@@ -133,12 +133,12 @@ namespace mbts.spark {
}
public class PredicateRowAnimationVM : DisposableViewModelBase, IValueFactory<(TPredicateBuilder predicate, IEnumerable<RowAnimation> animations, IEnumerable<SoundNotification> sounds)> {
readonly Property<bool> _show_animations, _play_sound;
readonly Property<bool> _show_animations/*, _play_sound*/;
public PredicateRowAnimationVM(IPropertyWrapperVM<TPredicateBuilder> predicate) {
this.predicate = predicate;
_show_animations = backing(nameof(show_animations), true);
_play_sound = backing(nameof(play_sound), true);
//_play_sound = backing(nameof(play_sound), true);
animations = new ObservableEditableCollection<RowAnimationVM>(() => {
var vm = new RowAnimationVM();
vm.selected_animation_type = vm.animation_types.FirstOrDefault();
@@ -152,13 +152,14 @@ namespace mbts.spark {
public ObservableEditableCollection<RowAnimationVM> animations { get; }
public IEnumerable<CellAnimation.AnimationTypeOneofCase> animation_types { get; } = EnumHelper.get_values_except(CellAnimation.AnimationTypeOneofCase.None);
public bool show_animations { get => _show_animations.Value; set => _show_animations.set(value); }
public bool play_sound { get => _play_sound.Value; set => _play_sound.set(value); }
//public bool play_sound { get => _play_sound.Value; set => _play_sound.set(value); }
public IPropertyWrapperVM<SoundNotification> sound { get; } = SoundAnimationVM.create_system_sound_vm();
public (TPredicateBuilder predicate, IEnumerable<RowAnimation> animations, IEnumerable<SoundNotification> sounds) create() =>
(predicate.create_assigned(),
animations.Select(a => a.create_assigned()),
EnumerableExtensions.return_if(play_sound, () => sound.create_assigned()));
new[] { sound.create_assigned() });
//EnumerableExtensions.return_if(play_sound, () => sound.create_assigned()));
public void load_from((TPredicateBuilder predicate, IEnumerable<RowAnimation> animations, IEnumerable<SoundNotification> sounds) args) {
predicate.load_from(args.predicate);
@@ -169,9 +170,9 @@ namespace mbts.spark {
}));
var en = args.sounds.GetEnumerator();
if (en.MoveNext()) {
_play_sound.set(true);
//_play_sound.set(true);
sound.load_from(en.Current);
} else _play_sound.set(false);
} //else _play_sound.set(false);
}
}
}
@@ -30,6 +30,7 @@
<sys:Double x:Key="HorizontalSplit">8.0</sys:Double>
<sys:Double x:Key="HorizontalGap">16.0</sys:Double>
<sys:Double x:Key="ControlNormalWidth">140</sys:Double>
<sys:Double x:Key="PredicateRootColumnWidth">176</sys:Double>
<sys:Double x:Key="ControlLongWidth">240</sys:Double>
<sys:Double x:Key="ComboBoxShortWidth">70</sys:Double>
<sys:Double x:Key="ComboBoxNormalWidth">88</sys:Double>
@@ -133,7 +134,16 @@
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush}}"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ComboBox x:Name="PART_Predicates" Style="{StaticResource PredicateTypeComboBoxStyle}">
<ComboBox x:Name="PART_Predicates">
<ComboBox.Style>
<Style TargetType="ComboBox" BasedOn="{StaticResource PredicateTypeComboBoxStyle}">
<Style.Triggers>
<DataTrigger Binding="{Binding is_root}" Value="{u:True}">
<Setter Property="Width" Value="{StaticResource PredicateRootColumnWidth}"/>
</DataTrigger>
</Style.Triggers>
</Style>
</ComboBox.Style>
<ComboBox.GroupStyle>
<GroupStyle ContainerStyle="{StaticResource ComboBox.DelineatedGroupContainerStyle}"/>
</ComboBox.GroupStyle>
@@ -446,38 +456,44 @@
Grid.Row="4"
Grid.Column="1"
>
<Grid.RowDefinitions>
<!--<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="{Binding Source={StaticResource VerticalPush}}"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
</Grid.RowDefinitions>-->
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalGap}}"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalSplit}}"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="{Binding Source={StaticResource PredicateRootColumnWidth}}"/>
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush}}"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<CheckBox Grid.Column="1" VerticalAlignment="Center" IsChecked="{Binding play_sound}">Play Sound</CheckBox>
<ComboBox
Grid.Column="3"
ItemsSource="{Binding sound.items}"
SelectedItem="{Binding sound.value}"
ItemTemplate="{StaticResource EnumDescriptionTemplate}"
Visibility="{Binding play_sound, Converter={StaticResource BooleanToVisibilityConverter}}"
/>
<ComboBox
Grid.Column="3"
<Grid HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush}}"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center">Play</TextBlock>
<ComboBox
Grid.Column="2"
ItemsSource="{Binding sound.items}"
SelectedItem="{Binding sound.value}"
ItemTemplate="{StaticResource EnumDescriptionTemplate}"
/>
</Grid>
<!--<CheckBox Grid.Column="1" VerticalAlignment="Center" IsChecked="{Binding play_sound}">Play Sound</CheckBox>-->
<!--<ComboBox
Grid.Column="1"
Visibility="{Binding play_sound, Converter={StaticResource FalseVisibilityConverter}}"
Style="{StaticResource DisabledPlaceholderComboBox}"
/>
/>-->
<Button
Grid.Column="4"
Grid.Column="2"
HorizontalAlignment="Left"
Margin="2,0,0,0"
Command="{x:Static c:SoundAnimationView.PreviewSoundCommand}"
CommandParameter="{Binding sound.value}"
Visibility="{Binding play_sound, Converter={StaticResource BooleanToVisibilityConverter}}"
Style="{StaticResource HelpButtonBaseStyle}"
Style="{StaticResource RoundPlayButton}"
ToolTip="{Binding sound.value, Converter={x:Static c:SoundAnimationView.LicenseInfoTextConverter}}"
>
<Button.CommandBindings>
@@ -499,9 +515,9 @@
</MouseBinding>
</Button.InputBindings>
</Button>
<CheckBox Grid.Row="2" Grid.Column="1" IsEnabled="{Binding predicate.can_enable_toast_notifications}" IsChecked="{Binding predicate.toast_notifications_enabled}">
<!--<CheckBox Grid.Row="2" Grid.Column="1" IsEnabled="{Binding predicate.can_enable_toast_notifications}" IsChecked="{Binding predicate.toast_notifications_enabled}">
Show Notification
</CheckBox>
</CheckBox>-->
</Grid>
</Grid>
</Border>
@@ -409,18 +409,21 @@
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush}}"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="1" VerticalAlignment="Center">Price Type</TextBlock>
<StackPanel
Orientation="Horizontal"
Grid.Row="1"
Grid.Column="2">
<ComboBox
ItemsSource="{Binding trigger_price_types}"
ItemTemplate="{StaticResource EnumDescriptionTemplate}"
SelectedItem="{Binding trigger_price_type}"
/>
>
<TextBlock VerticalAlignment="Center">Price Type</TextBlock>
<c:HelpButton Margin="4,0,0,0" ToolTip="This is the side of the market that is observed for the trigger condition. When this market touches (or penetrates the trigger price), the child order is sent to the market." />
</StackPanel>
<ComboBox
Grid.Row="1"
Grid.Column="2"
ItemsSource="{Binding trigger_price_types}"
ItemTemplate="{StaticResource EnumDescriptionTemplate}"
SelectedItem="{Binding trigger_price_type}"
/>
</Grid>
</GroupBox>
<GroupBox Grid.Row="2">
@@ -440,21 +443,24 @@
<RowDefinition Height="{Binding Source={StaticResource VerticalPush}}"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0">
Child
</TextBlock>
<StackPanel
Orientation="Horizontal"
Grid.Row="0"
Grid.Column="2">
<uag:OrderDetailsPopupControl
IsOpen="{Binding child_order.editable_properties_open, FallbackValue=False}"
ItemsSource="{Binding child_order_types}"
SelectedItem="{Binding child_order}"
HasEditableProperties="{Binding child_order.has_editable_properties, FallbackValue=False}"
/>
>
<TextBlock VerticalAlignment="Center">
Child
</TextBlock>
<c:HelpButton Margin="4,0,0,0" ToolTip="This is the type of the child order algo" />
</StackPanel>
<uag:OrderDetailsPopupControl
Grid.Row="0"
Grid.Column="2"
IsOpen="{Binding child_order.editable_properties_open, FallbackValue=False}"
ItemsSource="{Binding child_order_types}"
SelectedItem="{Binding child_order}"
HasEditableProperties="{Binding child_order.has_editable_properties, FallbackValue=False}"
/>
<GroupBox Grid.Row="2" Grid.ColumnSpan="3">
<GroupBox.Header>
<StackPanel Orientation="Horizontal">
@@ -103,6 +103,11 @@ namespace mbts.ui {
return pen;
}
public static ImageSource frozen(this ImageSource image_source) {
image_source.Freeze();
return image_source;
}
// Perform a breadth first traversal of all children returning any that match the predicate.
// Matching children are *not* further traversed
public static IEnumerable<FrameworkElement> visual_children_where(this FrameworkElement v, Func<FrameworkElement, bool> match) {
@@ -281,6 +281,62 @@
</Style>
<!--PlayButtonRed/Blue are commented out bc they are not referenced anywhere.
However, RoundPlayButton is a new style, and liable to change; these are good potential alternatives.
<Color x:Key="PlayButtonRedColor">#DD4040</Color>
<Color x:Key="PlayButtonBlueColor">#8E8EDD</Color>-->
<Color x:Key="PlayButtonGreenColor">#40DD40</Color>
<Color x:Key="PlayButtonGrayColor">#B8B8B8</Color>
<!--<SolidColorBrush x:Key="PlayButtonRedBrush" Color="{StaticResource PlayButtonRedColor}"/>
<SolidColorBrush x:Key="PlayButtonBlueBrush" Color="{StaticResource PlayButtonBlueColor}"/>-->
<SolidColorBrush x:Key="PlayButtonGreenBrush" Color="{StaticResource PlayButtonGreenColor}"/>
<SolidColorBrush x:Key="PlayButtonGrayBrush" Color="{StaticResource PlayButtonGrayColor}"/>
<Style x:Key="RoundPlayButton" TargetType="{x:Type Button}">
<Setter Property="Background" Value="{StaticResource PlayButtonGrayBrush}"/>
<Setter Property="Padding" Value="5,4,4,4"/>
<Setter Property="Width" Value="18" />
<Setter Property="Height" Value="18" />
<Setter Property="OverridesDefaultStyle" Value="True" />
<Setter Property="Focusable" Value="False" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
<Ellipse HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Fill="{TemplateBinding Background}" x:Name="_el" />
<Image Margin="{TemplateBinding Padding}" Stretch="Uniform">
<Image.Source>
<DrawingImage>
<DrawingImage.Drawing>
<GeometryDrawing Brush="White" Geometry="{x:Static mbts:Icons.PlayGeometry}"/>
</DrawingImage.Drawing>
</DrawingImage>
</Image.Source>
</Image>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Trigger.EnterActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="_el" Storyboard.TargetProperty="Fill.Color" To="{StaticResource PlayButtonGreenColor}" Duration="0:0:0.025"/>
</Storyboard>
</BeginStoryboard>
</Trigger.EnterActions>
<Trigger.ExitActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="_el" Storyboard.TargetProperty="Fill.Color" To="{StaticResource PlayButtonGrayColor}" Duration="0:0:0.1"/>
</Storyboard>
</BeginStoryboard>
</Trigger.ExitActions>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="RoundCloseButton" TargetType="{x:Type Button}">
<Setter Property="Width" Value="14" />
<Setter Property="Height" Value="14" />
@@ -7,6 +7,7 @@ using mbts.persist;
using mbts.ui;
using mbts.ui.shell;
using mbts.ui.utility;
using mbts.utils;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -42,9 +43,9 @@ namespace mbts.spark {
_change = backing(nameof(change), double.NaN);
_open = backing(nameof(open), double.NaN);
_settlement = backing(nameof(settlement), double.NaN);
_position = backing(nameof(position), order_properties_vm.observe_account(true).Select(a => a.name)
.SelectMany(a => _model.order_gateway.security_total_position(security.Id, a))
.OnDispatcher());
// remember: account_positions needs to subscribe to selected_account; both the sub and account_positions need to be disposed
var account_positions = new KeyDrivenObservable<string, double>(a => _model.order_gateway.security_total_position(security.Id, a));
_position = backing(nameof(position), account_positions.OnDispatcher());
_volume = backing(nameof(volume), 0ul);
_auto_clear = backing(nameof(auto_clear), false);
_status = backing(nameof(status_message), "");
@@ -77,6 +78,8 @@ namespace mbts.spark {
_dispose = Disposable.Create(
settings_command,
order_properties_vm,
order_properties_vm.observe_account(true).Select(a => a.name).Subscribe(account_positions),
account_positions,
size_calculator = new CalculatorLogic(0, _settings_manager.subscribe_current().Select(s => s.calculator_buttons)),
bus.subscribe(SparkTags.LogActivity).OnDispatcher().Subscribe(status_update),
model.order_gateway.working_orders.OnDispatcher().Subscribe(working => {
+4 -4
View File
@@ -4,18 +4,18 @@
<name>Blue Trading Systems</name>
</customer>
<period>
<since>2018-08-29</since>
<till>2019-08-28</till>
<since>2018-08-30</since>
<till>2019-10-16</till>
</period>
<dotNetProducts>
<product id="41" name="FIX Analyser" />
</dotNetProducts>
<dotNetCheckSum>eidnzkv57m24dLHIYmL11TfzfAGSd4kzF/t0ZmTYpB660EAZwjvQnPkmY+UaCdOHbSqaLbsJDH+cnv1AtU4XRO867NpDgE3n8VjVsbPnkr6PFnbASZaue2u9tjDJzLvPV79mIKCSyBCXZNNy2hm0rAfV/D3yfEpGQkQ+ELKp9Qc=</dotNetCheckSum>
<dotNetCheckSum>6O68+aAtrLqRaXxY9hLigajhC2ZunVeIev3NbyEXFjHk61WFrNmRTjy6tEduDtFUvGXvS6VUW3VXASaMTLrRgYteZBzfp7+dFTfVIVbzv6cn7c7dnSxWCGO5zPrjXw9cxMXlFz9cshyue6U/DRR5J36ThOhgt2kpY/OP9cgXWJo=</dotNetCheckSum>
<products>
<product id="1" name="OnixS FIX Engine for C++" />
<product id="4" name="CME Market Data Handler for C++" />
<product id="7" name="ICE iMpact Multicast Price Feed Handler for C++" />
<product id="13" name="NYSE ArcaBook Multicast for Equities Handler for C++" />
</products>
<checksum>4D85FA4C77A7A4D28A38F22BED3E4244</checksum>
<checksum>18F98ED1E0A87B4B11DA322403D7BDDD</checksum>
</license>
+5 -1
View File
@@ -1 +1,5 @@
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/dynamic_orders.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp)
<<<<<<< HEAD
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/dynamic_orders.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp)
=======
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/dynamic_orders.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp)
>>>>>>> f5c4eda4df536147ab0b9f37eafa7ee8e3236f5f
+4 -4
View File
@@ -12,10 +12,6 @@ message LaddersOnThreads {
optional bool enabled = 1 [default = true];
}
message CVOrderBook {
optional bool enabled = 1 [default = true];
}
message FilterOrdersWithDanglingSecurities {
optional bool enabled = 1 [default = true];
}
@@ -27,3 +23,7 @@ message FillsSoftCleanup{
message OrdersSoftCleanup{
optional bool enabled = 1 [default = true];
}
message ToastNotifications {
optional bool enabled = 1 [default = false];
}
+15 -14
View File
@@ -12,13 +12,14 @@
#include "lib/jetfix/store/IFIXStore.h"
#include "lib/orderman/orderman_utils/orderman_common.h"
#include "lib/tracing/bts_trace.h"
#include <boost/lockfree/queue.hpp>
#include <atomic>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <fmt/format.h>
#include <fstream>
#include <moodycamel/concurrentqueue.h>
#include <thread>
#include <tbb/concurrent_queue.h>
namespace bts {
namespace jetfix {
@@ -110,7 +111,7 @@ struct CoreGateway::PImpl {
State state;
datetime::PTime start_of_pause;
std::unique_ptr<SessionInfo> session_info;
moodycamel::ConcurrentQueue<EventData> event_queue;
tbb::concurrent_queue <EventData> event_queue;
std::thread timer_thread;
std::atomic<bool> destroy;
bool is_on;
@@ -140,50 +141,50 @@ CoreGateway::~CoreGateway() {
void CoreGateway::send(orderman::TickToTradeCorID cid, OutFIXPtr const &fix) {
tracepoint(bts_trace, trace_order, (char *)"CoreGateway.send", 0, cid,0);
me->event_queue.enqueue(EventData(&CoreGateway::sync_send, cid, fix));
me->event_queue.push(EventData(&CoreGateway::sync_send, cid, fix));
}
void CoreGateway::send_hb() {
me->event_queue.enqueue(EventData(&CoreGateway::sync_send_hb));
me->event_queue.push(EventData(&CoreGateway::sync_send_hb));
}
void CoreGateway::send_test_request() {
me->event_queue.enqueue(EventData(&CoreGateway::sync_send_test_request));
me->event_queue.push(EventData(&CoreGateway::sync_send_test_request));
}
void CoreGateway::start() {
me->event_queue.enqueue(EventData(&CoreGateway::sync_start));
me->event_queue.push(EventData(&CoreGateway::sync_start));
}
void CoreGateway::stop() {
me->event_queue.enqueue(EventData(&CoreGateway::sync_stop));
me->event_queue.push(EventData(&CoreGateway::sync_stop));
}
void CoreGateway::session_ready() {
me->event_queue.enqueue(EventData(&CoreGateway::sync_session_ready));
me->event_queue.push(EventData(&CoreGateway::sync_session_ready));
}
void CoreGateway::session_terminated() {
me->event_queue.enqueue(EventData(&CoreGateway::sync_session_terminated));
me->event_queue.push(EventData(&CoreGateway::sync_session_terminated));
}
void CoreGateway::reader_disconnected() {
me->event_queue.enqueue(EventData(&CoreGateway::sync_reader_disconnected));
me->event_queue.push(EventData(&CoreGateway::sync_reader_disconnected));
}
void CoreGateway::in_msg_raw(InMsgBuffer const &msg) {
me->event_queue.enqueue(EventData(&CoreGateway::sync_in_msg_raw, msg));
me->event_queue.push(EventData(&CoreGateway::sync_in_msg_raw, msg));
}
void CoreGateway::in_msg_sequenced(InMsgBuffer const &msg) {
me->event_queue.enqueue(EventData(&CoreGateway::sync_in_msg_sequenced, msg));
me->event_queue.push(EventData(&CoreGateway::sync_in_msg_sequenced, msg));
}
void CoreGateway::dispatch_events() {
EventData ev;
utils::TimeStamp cid;
// we prioratize sends over receives
while (me->event_queue.try_dequeue(ev)) {
while (me->event_queue.try_pop(ev)) {
if (ev.out_msgs) {
cid = ev.out_msgs->get_ts(jetfix::OutFIX::MD_WRITE_TS);
me->send_batch.push_back(ev);
@@ -207,7 +208,7 @@ void CoreGateway::call_time() {
std::this_thread::sleep_for(10ms);
auto ts = std::make_shared<std::string>(
datetime::FIX_timestamp(datetime::now()));
me->event_queue.enqueue(EventData(&CoreGateway::sync_time, ts)); // NOLINT
me->event_queue.push(EventData(&CoreGateway::sync_time, ts)); // NOLINT
}
}
+1 -1
View File
@@ -783,7 +783,7 @@ OutFIXPtr make_logon(uint32_t seq_num, uint32_t last_seq_num_processed,
buffer.add<HeartBtInt>(session_cfg.seconds_between_hbs());
#ifndef BTS_EDGE
const char *application = "O2";
const char *application = "SPARK";
#else
const char *application = "O2";
#endif
+143 -180
View File
@@ -5,55 +5,41 @@
#include "lib/jetfix/common/InMsgBuffer.h"
#include "lib/jetfix/common/OutFIX.h"
#include "lib/jetfix/store/session_name.h"
#include "lib/os/os.h"
#include "lib/utils/bts_chrono.h"
#include "lib/utils/datetime.h"
#include "lib/utils/file_utils.h"
#include "lib/utils/bts_chrono.h"
#include "lib/os/os.h"
#include <fstream>
#include <thread>
#include <boost/date_time.hpp>
#include <boost/date_time/gregorian/gregorian.hpp>
#include <boost/filesystem.hpp>
#include <boost/date_time.hpp>
#include <moodycamel/readerwriterqueue.h>
#include <tbb/concurrent_queue.h>
#include <fmt/format.h>
#include <fstream>
#include <thread>
namespace bts {
namespace jetfix {
struct FIXFileStore::Event
{
Event ()
: out_msgs (), in_msg (),
quit (false),
has_last_msg_processed (false),
last_msg_processed (0),
has_seq_num (false),
seq_num (0)
{}
struct FIXFileStore::Event {
Event()
: out_msgs(), in_msg(), quit(false), has_last_msg_processed(false),
last_msg_processed(0), has_seq_num(false), seq_num(0) {}
Event (Event const &src)
: out_msgs (src.out_msgs),
in_msg (src.in_msg),
quit (src.quit),
has_last_msg_processed (src.has_last_msg_processed),
last_msg_processed (src.last_msg_processed),
has_seq_num (src.has_seq_num),
seq_num (src.seq_num)
{}
Event(Event const &src)
: out_msgs(src.out_msgs), in_msg(src.in_msg), quit(src.quit),
has_last_msg_processed(src.has_last_msg_processed),
last_msg_processed(src.last_msg_processed),
has_seq_num(src.has_seq_num), seq_num(src.seq_num) {}
Event (Event &&src)
: out_msgs (std::move(src.out_msgs)),
in_msg (std::move(src.in_msg)),
quit (src.quit),
has_last_msg_processed (src.has_last_msg_processed),
last_msg_processed (src.last_msg_processed),
has_seq_num (src.has_seq_num),
seq_num (src.seq_num)
{}
Event(Event &&src)
: out_msgs(std::move(src.out_msgs)), in_msg(std::move(src.in_msg)),
quit(src.quit), has_last_msg_processed(src.has_last_msg_processed),
last_msg_processed(src.last_msg_processed),
has_seq_num(src.has_seq_num), seq_num(src.seq_num) {}
Event& operator=(Event const &src)
{
Event &operator=(Event const &src) {
out_msgs = src.out_msgs;
in_msg = src.in_msg;
quit = src.quit;
@@ -64,8 +50,7 @@ struct FIXFileStore::Event
return *this;
}
Event& operator=(Event const &&src)
{
Event &operator=(Event const &&src) {
out_msgs = std::move(src.out_msgs);
in_msg = std::move(src.in_msg);
quit = src.quit;
@@ -84,21 +69,12 @@ struct FIXFileStore::Event
bool has_seq_num;
uint32_t seq_num;
};
struct FIXFileStore::PImpl
{
PImpl(config::JetFIX::Connection const&cfg) :
active (false),
store_called (false),
replay_messages (),
last_seq_num (0),
last_seq_num_processed (0),
seq_num_path (),
fix_store (),
writer_thread (),
event_queue (),
cfg(cfg)
{}
struct FIXFileStore::PImpl {
PImpl(config::JetFIX::Connection const &cfg)
: active(false), store_called(false), replay_messages(), last_seq_num(0),
last_seq_num_processed(0), seq_num_path(), fix_store(),
writer_thread(), event_queue(), cfg(cfg) {}
bool active;
bool store_called;
@@ -108,237 +84,224 @@ struct FIXFileStore::PImpl
std::string seq_num_path;
std::ofstream fix_store;
std::thread writer_thread;
moodycamel::ReaderWriterQueue<Event> event_queue;
tbb::concurrent_queue<Event> event_queue;
config::JetFIX::Connection const cfg;
};
std::string fix_log_path (std::string const&base_path)
{
std::string fix_log_path(std::string const &base_path) {
boost::filesystem::path result = base_path;
result /= "fix";
return result.string ();
return result.string();
}
std::string seqnum_path (std::string const&base_path)
{
std::string seqnum_path(std::string const &base_path) {
boost::filesystem::path result = base_path;
result /= "seqnum";
return result.string ();
return result.string();
}
std::string store_path (std::string base_path,
std::string const&connection_name,
std::string const&session_name)
{
if (base_path.empty ())
base_path = os::bts_data_path ();
boost::filesystem::path result = utils::normalize_data_path (base_path);
std::string store_path(std::string base_path,
std::string const &connection_name,
std::string const &session_name) {
if (base_path.empty())
base_path = os::bts_data_path();
boost::filesystem::path result = utils::normalize_data_path(base_path);
result /= "jetfix";
result /= connection_name;
result /= session_name;
return result.string ();
return result.string();
}
std::map<uint32_t,InMsgBuffer>
load_replay (config::JetFIX::Connection const &cfg,std::string const&path, uint32_t max_sn)
{
std::map<uint32_t,InMsgBuffer> result;
if (boost::filesystem::exists (path)) {
std::map<uint32_t, InMsgBuffer>
load_replay(config::JetFIX::Connection const &cfg, std::string const &path,
uint32_t max_sn) {
std::map<uint32_t, InMsgBuffer> result;
if (boost::filesystem::exists(path)) {
std::ifstream f (path);
std::ifstream f(path);
std::string line_buffer;
line_buffer.reserve (10*1024);
auto header_size = sizeof("20150427-19:05:17.032 < ")-1;
std::string date_buffer ("20150427-19:05:17.032");
line_buffer.reserve(10 * 1024);
auto header_size = sizeof("20150427-19:05:17.032 < ") - 1;
std::string date_buffer("20150427-19:05:17.032");
for (;;) {
std::getline (f,line_buffer);
if (!f.eof ()) {
bts_assert (line_buffer.size () > header_size);
if (line_buffer[22]=='<') {
auto ts = datetime::parse_FIX_timestamp (line_buffer.substr (0,21));
if (!datetime::is_at_least_secs_old (ts,cfg.seconds_to_replay ())) {
InMsgBuffer msg (line_buffer.substr (24));
auto sn = msg.get_seq_num ();
std::getline(f, line_buffer);
if (!f.eof()) {
bts_assert(line_buffer.size() > header_size);
if (line_buffer[22] == '<') {
auto ts =
datetime::parse_FIX_timestamp(line_buffer.substr(0, 21));
if (!datetime::is_at_least_secs_old(ts,
cfg.seconds_to_replay())) {
InMsgBuffer msg(line_buffer.substr(24));
auto sn = msg.get_seq_num();
if (sn <= max_sn)
result[sn] = msg;
}
}
}
else
} else
break;
}
}
return result;
}
void save_fix (std::ostream &out, const char*data, size_t size, bool is_outgoing)
{
out << datetime::FIX_timestamp (datetime::now ()) << " "
void save_fix(std::ostream &out, const char *data, size_t size,
bool is_outgoing) {
out << datetime::FIX_timestamp(datetime::now()) << " "
<< (is_outgoing ? ">" : "<") << " ";
out.write (data,size);
out.write(data, size);
out << std::endl;
}
void save_seq_nums (std::string const&path,uint32_t last_seq_num, uint32_t last_seq_num_processed)
{
std::ofstream f (path);
void save_seq_nums(std::string const &path, uint32_t last_seq_num,
uint32_t last_seq_num_processed) {
std::ofstream f(path);
f << last_seq_num << " " << last_seq_num_processed << std::endl;
}
void load_seq_nums (std::string const&path,uint32_t* last_seq_num, uint32_t *last_seq_num_processed)
{
if (boost::filesystem::exists (path)) {
std::ifstream f (path);
void load_seq_nums(std::string const &path, uint32_t *last_seq_num,
uint32_t *last_seq_num_processed) {
if (boost::filesystem::exists(path)) {
std::ifstream f(path);
f >> *last_seq_num >> *last_seq_num_processed;
} else {
*last_seq_num = 0;
*last_seq_num_processed = 0;
save_seq_nums (path, *last_seq_num,*last_seq_num_processed);
save_seq_nums(path, *last_seq_num, *last_seq_num_processed);
}
}
FIXFileStore::FIXFileStore (config::JetFIX::Connection const&cfg,std::string base_path)
: me (new PImpl(cfg)) {
auto sn = session_name (cfg);
me->active = sn.size () > 0;
FIXFileStore::FIXFileStore(config::JetFIX::Connection const &cfg,
std::string base_path)
: me(new PImpl(cfg)) {
auto sn = session_name(cfg);
me->active = sn.size() > 0;
if (me->active) {
auto path = store_path (base_path,cfg.name (),sn);
if (!boost::filesystem::exists (path))
bts_assert (boost::filesystem::create_directories (path));
auto path = store_path(base_path, cfg.name(), sn);
if (!boost::filesystem::exists(path))
bts_assert(boost::filesystem::create_directories(path));
// load seq numbers
auto seq_num_p = seqnum_path (path);
load_seq_nums (seq_num_p,&me->last_seq_num,&me->last_seq_num_processed);
auto seq_num_p = seqnum_path(path);
load_seq_nums(seq_num_p, &me->last_seq_num, &me->last_seq_num_processed);
me->seq_num_path = seq_num_p;
// load replay
auto fix_log_p = fix_log_path (path);
auto replay_messages = load_replay (cfg,fix_log_p,me->last_seq_num_processed);
auto fix_log_p = fix_log_path(path);
auto replay_messages =
load_replay(cfg, fix_log_p, me->last_seq_num_processed);
uint32_t previous_sn = 0;
for (auto &p : replay_messages) {
auto sn = p.first;
auto &m = p.second;
if (!(m.has_poss_dup_flag_flag () && m.get_poss_dup_flag ())) {
if (previous_sn != 0)
bts_assert (sn == (previous_sn + 1));
if (!(m.has_poss_dup_flag_flag() && m.get_poss_dup_flag())) {
if (previous_sn != 0)
bts_assert(sn == (previous_sn + 1));
previous_sn = sn;
me->replay_messages.emplace_back (m);
me->replay_messages.emplace_back(m);
}
}
me->fix_store.open (fix_log_p,std::ofstream::app);
me->writer_thread = std::thread (std::bind (&FIXFileStore::write,this));
me->fix_store.open(fix_log_p, std::ofstream::app);
me->writer_thread = std::thread(std::bind(&FIXFileStore::write, this));
}
}
FIXFileStore::~FIXFileStore ()
{
FIXFileStore::~FIXFileStore() {
if (me->active) {
Event ev;
ev.quit = true;
me->event_queue.enqueue (ev);
me->writer_thread.join ();
me->event_queue.push(ev);
me->writer_thread.join();
}
}
bool FIXFileStore::session_active () const
{return me->active;}
bool FIXFileStore::session_active() const { return me->active; }
std::vector<InMsgBuffer> FIXFileStore::replay () const
{
bts_assert (me->active && !me->store_called);
std::vector<InMsgBuffer> FIXFileStore::replay() const {
bts_assert(me->active && !me->store_called);
return me->replay_messages;
}
uint32_t FIXFileStore::last_seq_num () const
{
bts_assert (me->active && !me->store_called);
uint32_t FIXFileStore::last_seq_num() const {
bts_assert(me->active && !me->store_called);
return me->last_seq_num;
}
uint32_t FIXFileStore::last_seq_num_processed () const
{
bts_assert (me->active && !me->store_called);
uint32_t FIXFileStore::last_seq_num_processed() const {
bts_assert(me->active && !me->store_called);
return me->last_seq_num_processed;
}
void FIXFileStore::store (OutFIXPtr const&msgs)
{
bts_assert (me->active);
void FIXFileStore::store(OutFIXPtr const &msgs) {
bts_assert(me->active);
me->store_called = true;
Event ev;
ev.out_msgs = msgs;
me->event_queue.enqueue (ev);
me->event_queue.push(ev);
}
void FIXFileStore::store (InMsgBuffer const&msg)
{
bts_assert (me->active);
void FIXFileStore::store(InMsgBuffer const &msg) {
bts_assert(me->active);
me->store_called = true;
Event ev;
ev.in_msg = msg;
me->event_queue.enqueue (ev);
me->event_queue.push(ev);
}
void FIXFileStore::set_last_msg_processed (uint32_t last_msg_processed)
{
bts_assert (me->active);
void FIXFileStore::set_last_msg_processed(uint32_t last_msg_processed) {
bts_assert(me->active);
me->store_called = true;
Event ev;
ev.has_last_msg_processed = true;
ev.last_msg_processed = last_msg_processed;
me->event_queue.enqueue (ev);
me->event_queue.push(ev);
}
void FIXFileStore::set_last_seq_num(uint32_t last_seq_num)
{
bts_assert (me->active);
void FIXFileStore::set_last_seq_num(uint32_t last_seq_num) {
bts_assert(me->active);
me->store_called = true;
Event ev;
ev.has_seq_num = true;
ev.seq_num = last_seq_num;
me->event_queue.enqueue (ev);
me->event_queue.push(ev);
}
void FIXFileStore::write ()
{
void FIXFileStore::write() {
Event ev;
os::set_thread_name(fmt::format("{0}_store",me->cfg.name()).c_str());
os::set_thread_name(fmt::format("{0}_store", me->cfg.name()).c_str());
while (true)
if (me->event_queue.try_dequeue (ev)) {
if (me->event_queue.try_pop(ev)) {
if (ev.quit) {
return;
}
else if (ev.out_msgs) {
} else if (ev.out_msgs) {
for (auto &encoded_stream : ev.out_msgs->fix)
for (auto &mm : encoded_stream.msg_map ()) {
me->last_seq_num = std::max (me->last_seq_num,mm.seq_num);
save_seq_nums (me->seq_num_path,me->last_seq_num,me->last_seq_num_processed);
save_fix (me->fix_store,encoded_stream.data ()+mm.offset,mm.size,true);
for (auto &mm : encoded_stream.msg_map()) {
me->last_seq_num = std::max(me->last_seq_num, mm.seq_num);
save_seq_nums(me->seq_num_path, me->last_seq_num,
me->last_seq_num_processed);
save_fix(me->fix_store, encoded_stream.data() + mm.offset,
mm.size, true);
}
me->fix_store.flush ();
}
else if (ev.in_msg.size ())
{
save_fix (me->fix_store,ev.in_msg.data (),ev.in_msg.size (),false);
me->fix_store.flush ();
}
else if (ev.has_last_msg_processed) {
me->fix_store.flush();
} else if (ev.in_msg.size()) {
save_fix(me->fix_store, ev.in_msg.data(), ev.in_msg.size(), false);
me->fix_store.flush();
} else if (ev.has_last_msg_processed) {
me->last_seq_num_processed = ev.last_msg_processed;
save_seq_nums (me->seq_num_path,me->last_seq_num,me->last_seq_num_processed);
}
else if (ev.has_seq_num) {
save_seq_nums(me->seq_num_path, me->last_seq_num,
me->last_seq_num_processed);
} else if (ev.has_seq_num) {
me->last_seq_num = ev.seq_num;
save_seq_nums (me->seq_num_path,me->last_seq_num,me->last_seq_num_processed);
}
else
bts_assert (false);
}
else
std::this_thread::sleep_for (100ms);
save_seq_nums(me->seq_num_path, me->last_seq_num,
me->last_seq_num_processed);
} else
bts_assert(false);
} else
std::this_thread::sleep_for(100ms);
}
}}
} // namespace jetfix
} // namespace bts
+7 -2
View File
@@ -53,9 +53,14 @@ Filter get_filter (LoggingConfig &cfg,
config::Logging::SinkConfig const&scfg)
{
Filter result;
for (auto &l : result)
l = Info;
auto it = find_key(cfg.level_names,scfg.default_level());
bts_assert(it != cfg.level_names.end());
if (it == cfg.level_names.end())
return result;
auto default_level = it->first;
for (auto &l : result)
l = default_level;
@@ -69,7 +74,7 @@ Filter get_filter (LoggingConfig &cfg,
auto ss = ss_it->first;
auto level_it = find_key(cfg.level_names,sub_system.level());
if (level_it != cfg.level_names.end())
if (level_it == cfg.level_names.end())
continue;
auto level = level_it->first;
@@ -3,5 +3,7 @@
namespace bts {
namespace mercury {
std::atomic<uint64_t> AsyncEventBroker::_msg_id;
}}
+59 -47
View File
@@ -4,8 +4,8 @@
#include <boost/container/flat_map.hpp>
#include <boost/pool/object_pool.hpp>
#include <memory>
#include <moodycamel/concurrentqueue.h>
#include <typeindex>
#include <boost/lockfree/queue.hpp>
#include "lib/mercury/broker/CoreEventBroker.h"
#include "lib/mercury/mercury_utils/FatWrapper.h"
@@ -14,24 +14,26 @@ namespace bts {
namespace mercury {
class AsyncEventBroker : public IEventBroker {
private:
private:
struct BrokerMsg {
uint64_t msg_id;
EventBrokerID broker_src_id;
utils::FatWrapper<127 - 8 - 4> wrapper;
void (*handle_msg)(AsyncEventBroker *self, BrokerMsg *m);
bool is_external;
};
public:
public:
AsyncEventBroker()
: _core_broker(), _queue(), _internal_pool(), _external_pool(),
_external_pool_mtx(), _current_suid(0),_dequeued(10000) {}
: _core_broker(), _queue(5000), _internal_pool(), _external_pool(),
_external_pool_mtx(), _current_suid(0) {}
void init_neighbours(std::initializer_list<IEventBrokerPtr> const &neighbours)
{
void
init_neighbours(std::initializer_list<IEventBrokerPtr> const &neighbours) {
for (auto const &n : neighbours)
_core_broker.add_neighbour(n);
}
// ieventbroker methods, can be called from multiple threads
EventBrokerID id() const override { return _core_broker.id(); }
@@ -59,13 +61,13 @@ public:
// can be called from outside
void post_action(std::function<void()> const &action) {
post_external_msg<Action>(on_action, action);
post_external_msg<Action>(on_action, EventBrokerID(0), action);
}
// Internal API, i.e. API intended for use by a single thread, the
// same thread calling do_work.
struct InternalNotificationMsg {
public:
public:
template <class T, typename... Args> T &wrap_in_place(Args &&... args) {
auto &n = _msg->wrapper.unwrap<InternalNotification>();
return n.payload.wrap_in_place<T>(std::forward<Args>(args)...);
@@ -82,6 +84,7 @@ public:
}
void internal_notify(InternalNotificationMsg msg) {
msg._msg->broker_src_id = id();
enqueue(msg._msg);
}
@@ -109,37 +112,41 @@ public:
}
bool do_work() {
auto deq = _queue.try_dequeue_bulk(&_dequeued[0],_dequeued.size());
if (deq) {
LOG(Mercury,Diag,"{} dequeing {} messages ({} in queue)", id().value(), deq, _queue.size_approx());
for (size_t i = 0; i < deq;i++) {
auto m = _dequeued[i];
BrokerMsg *m;
auto count = 0;
for(;;) {
m = nullptr;
_queue.pop(m);
if (m) {
LOG(Mercury, Diag, "{} dequeued msg {}:{} ", id().value(), m->broker_src_id.value(), m->msg_id);
m->handle_msg(this, m);
free_msg(m);
count ++;
}
if (deq == _dequeued.size())
_dequeued.resize(_dequeued.size()*2);
return true;
} else
return false;
else
break;
}
return count;
}
private:
private:
void add_neighbour(IEventBrokerPtr const &n) override {
post_external_msg<NeighbourAddition>(on_neighbour_addition, n);
post_external_msg<NeighbourAddition>(on_neighbour_addition,
EventBrokerID(0), n);
}
void remove_neighbour(EventBrokerID n) override {
post_external_msg<NeighbourRemoval>(on_neighbour_removal, n);
post_external_msg<NeighbourRemoval>(on_neighbour_removal,
EventBrokerID(0), n);
}
using MsgHandler = void(AsyncEventBroker *, BrokerMsg *);
using Pool = boost::object_pool<BrokerMsg>;
using Queue = moodycamel::ConcurrentQueue<BrokerMsg *>;
using Queue = boost::lockfree::queue<BrokerMsg *>;
using DispatchMap =
boost::container::flat_map<std::type_index,
std::function<void(BrokerMsg *)>>;
boost::container::flat_map<std::type_index,
std::function<void(BrokerMsg *)>>;
CoreEventBroker _core_broker;
Queue _queue;
Pool _internal_pool;
@@ -147,8 +154,8 @@ private:
std::atomic_flag _external_pool_mtx = ATOMIC_FLAG_INIT;
DispatchMap _dispatch_map;
InternalSubID _current_suid;
std::vector<BrokerMsg*> _dequeued;
static std::atomic<uint64_t> _msg_id;
void free_msg(BrokerMsg *m) {
m->wrapper.clear();
if (m->is_external) {
@@ -161,46 +168,51 @@ private:
}
template <class T, typename... Args>
void post_external_msg(MsgHandler handler, Args &&... args) {
void post_external_msg(MsgHandler handler, EventBrokerID eid,
Args &&... args) {
while (_external_pool_mtx.test_and_set(std::memory_order_acquire))
;
auto msg = _external_pool.construct();
_external_pool_mtx.clear(std::memory_order_release);
msg->broker_src_id = eid;
msg->is_external = true;
msg->handle_msg = handler;
msg->wrapper.wrap_in_place<T>(std::forward<Args>(args)...);
msg->wrapper.wrap_in_place<T>(eid, std::forward<Args>(args)...);
enqueue(msg);
}
template <class T, typename... Args>
void post_internal_msg(MsgHandler handler, Args &&... args) {
auto msg = _internal_pool.construct();
msg->broker_src_id = _core_broker.id();
msg->handle_msg = handler;
msg->is_external = false;
msg->wrapper.wrap_in_place<T>(std::forward<Args>(args)...);
enqueue(msg);
}
void enqueue (BrokerMsg *msg)
{
LOG(Mercury,Diag,"{} enqueing msg {} ({} in queue)", id().value(), (size_t) msg,_queue.size_approx()+1);
_queue.enqueue(msg);
void enqueue(BrokerMsg *msg) {
auto mid = _msg_id.fetch_add(1);
msg->msg_id = mid;
LOG(Mercury, Diag, "{} enqueing msg {}:{}", id().value(), msg->broker_src_id.value(), mid);
_queue.push(msg);
}
struct NeighbourAddition {
NeighbourAddition(const IEventBrokerPtr &src) : ptr(src) {}
NeighbourAddition(EventBrokerID, const IEventBrokerPtr &src) : ptr(src) {}
IEventBrokerPtr ptr;
};
struct NeighbourRemoval {
NeighbourRemoval(EventBrokerID id) : id(id) {}
NeighbourRemoval(EventBrokerID, EventBrokerID id) : id(id) {}
EventBrokerID id;
};
struct Advertisement {
Advertisement(EventBrokerID id, StreamID sid, TopicPtr topic)
: id(id), sid(sid), topic(topic) {}
: id(id), sid(sid), topic(topic) {}
EventBrokerID id;
StreamID sid;
TopicPtr topic;
@@ -214,7 +226,7 @@ private:
struct Subscription {
Subscription(EventBrokerID id, SubID suid, StreamID sid)
: id(id), suid(suid), sid(sid) {}
: id(id), suid(suid), sid(sid) {}
EventBrokerID id;
SubID suid;
StreamID sid;
@@ -222,7 +234,7 @@ private:
struct Unsubscription {
Unsubscription(EventBrokerID id, SubID suid, StreamID sid)
: id(id), suid(suid), sid(sid) {}
: id(id), suid(suid), sid(sid) {}
EventBrokerID id;
SubID suid;
StreamID sid;
@@ -231,7 +243,7 @@ private:
struct Notification {
Notification(EventBrokerID id, StreamID sid, SubID suid,
EventPayload const &payload)
: id(id), sid(sid), suid(suid), payload(payload) {}
: id(id), sid(sid), suid(suid), payload(payload) {}
EventBrokerID id;
StreamID sid;
SubID suid;
@@ -247,7 +259,7 @@ private:
struct InternalSubscription {
InternalSubscription(InternalSubID suid, TopicFilter const &filter,
InternalEventHandler const &handler)
: suid(suid), filter(filter), handler(handler) {}
: suid(suid), filter(filter), handler(handler) {}
InternalSubID suid;
TopicFilter filter;
InternalEventHandler handler;
@@ -259,18 +271,19 @@ private:
};
struct Action {
Action(std::function<void()> const &action) : action(action) {}
Action(EventBrokerID, std::function<void()> const &action)
: action(action) {}
std::function<void()> action;
};
static void on_neighbour_addition(AsyncEventBroker *self, BrokerMsg *m) {
self->_core_broker.add_neighbour(
m->wrapper.unwrap<NeighbourAddition>().ptr);
m->wrapper.unwrap<NeighbourAddition>().ptr);
}
static void on_neighbour_removal(AsyncEventBroker *self, BrokerMsg *m) {
self->_core_broker.remove_neighbour(
m->wrapper.unwrap<NeighbourRemoval>().id);
m->wrapper.unwrap<NeighbourRemoval>().id);
}
static void on_advertisement(AsyncEventBroker *self, BrokerMsg *m) {
@@ -322,6 +335,5 @@ private:
action.action();
}
};
}
}
} // namespace mercury
} // namespace bts
@@ -335,6 +335,11 @@ void CoreEventBroker::notify(EventBrokerID sender, StreamID sid, SubID ex_subid,
NoReenter nr(me->inside);
auto &srec = me->streams[sid];
if (!srec)
LOG(Mercury, Diag,
"Will crash CoreEventBroker {} received notify from broker {} sid: {} sub_id:{}",
id().value(), sender.value(), sid.value(), ex_subid.value());
bts_assert(srec);
bts_assert((srec->is_local() && sender == id()) ||
(!srec->is_local() && srec->src->id() == sender));
+2 -2
View File
@@ -125,8 +125,8 @@ template <size_t N>
class HistogramMetric : public Metric {
std::array<CounterMetric<long>,N> _buckets;
std::array<double,N> _bucket_values;
CounterMetric<double> _sum;
CounterMetric<long> _count;
CounterMetric<uint64_t> _sum;
CounterMetric<uint64_t> _count;
public:
HistogramMetric(
const std::string& name,
+2 -2
View File
@@ -34,7 +34,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor {
_loop_timer =
std::make_shared < metrics::HistogramMetric<16>>(
"spark_metrics_md_loop",
"spark_metrics_md_loop_us",
std::array<double, 16>({2, 4, 8, 16, 32, 64,
128, 256, 512, 1024,2048,4096,8192,16384}));
_stats.publish(_loop_timer);
@@ -79,7 +79,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor {
}
}
auto stop = Timer::now();
_loop_timer->observe(us_diff(stop,start));
_loop_timer->observe(ns_diff(stop,start));
}
struct HandleRecord {
+1
View File
@@ -54,6 +54,7 @@ void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def,
void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec,
const PreActivationOrderServices &) {
me->services = nullptr;
auto const &def = rec.def();
me->def = def;
me->state = rec.state();
+11 -7
View File
@@ -75,7 +75,7 @@ OrderServiceServer::OrderServiceServer(
me->slow_broker->init_neighbours({me->fast_broker});
// fast actors
me->fast_exe.spawn<MDSource>(me->md_consumer,me->stats);
me->fast_exe.spawn<MDSource>(me->md_consumer, me->stats);
me->fast_exe.spawn<OrderManager>();
auto &all_connections = config::get<config::JetFIX>().connection();
@@ -84,17 +84,21 @@ OrderServiceServer::OrderServiceServer(
me->fast_thread = std::thread([this]() {
os::set_thread_name("fast_exe");
auto loop_timer =
std::make_shared < metrics::HistogramMetric<16>>(
"spark_metrics_fast_thread_loop",
std::array<double, 16>({2, 4, 8, 16, 32, 64,
128, 256, 512, 1024,2048,4096,8192,16384}));
std::array<double, 31> buckets;
auto i = 1;
for (auto &b : buckets)
b = (i *= 2);
auto loop_timer = std::make_shared<metrics::HistogramMetric<31>>(
"spark_metrics_fast_thread_loop_ns", buckets);
me->stats.publish(loop_timer);
for (;;) {
auto start = Timer::now();
me->fast_exe.do_work();
auto stop = Timer::now();
loop_timer->observe(us_diff(stop,start));
loop_timer->observe(ns_diff(stop, start));
}
});
+13
View File
@@ -22,6 +22,7 @@
#include <iostream>
#include <moodycamel/concurrentqueue.h>
#include <mutex>
#include <tbb/concurrent_queue.h>
namespace bts {
namespace cmd {
@@ -451,6 +452,18 @@ static void boost_lockless_queue(benchmark::State &state) {
}
BENCHMARK(boost_lockless_queue);
static void tbb_concurrent_queue(benchmark::State &state) {
using FreeList = tbb::concurrent_queue<void *>;
FreeList queue;
for (auto _ : state) {
void *result;
queue.push(nullptr);
benchmark::DoNotOptimize(queue.try_pop(result));
}
}
BENCHMARK(tbb_concurrent_queue);
static void moody_camel_queue(benchmark::State &state) {
using Q = moodycamel::ConcurrentQueue<void *>;
Q queue(1000000);
@@ -191,8 +191,8 @@ void ExchangeSimApplication::onMessage(const FIX42::NewOrderSingle &message,
LOG(ExSim, Info, "Got new order: {}", clOrdID.getString());
try {
if (timeInForce != FIX::TimeInForce_DAY)
throw std::logic_error("Unsupported TIF, use Day");
if (timeInForce != FIX::TimeInForce_DAY && timeInForce != FIX::TimeInForce_IMMEDIATE_OR_CANCEL)
throw std::logic_error("Unsupported TIF, use Day or IOC");
auto &matcher = me->matchers[sec_desc];
if (matcher.get_order(clOrdID))
@@ -244,6 +244,13 @@ void ExchangeSimApplication::onMessage(const FIX42::NewOrderSingle &message,
matcher.add_new(order, &updates);
for (auto const &o : updates)
fillOrder(o);
if (updates.empty() && timeInForce == FIX::TimeInForce_IMMEDIATE_OR_CANCEL) {
auto order_cpy = order;
order_cpy.set_open_quantity(0);
updateOrder(order_cpy, FIX::OrdStatus_CANCELED);
matcher.cancel(clOrdID);
}
update_md(sec_desc);
} catch (std::exception &e) {
rejectOrder(senderCompID, senderSubID, targetCompID, clOrdID, sec_desc,
+5 -4
View File
@@ -11,14 +11,15 @@ button the ladder displays -
1. Force buy and sell fills across the 6 ladders. Keep track
of the long and short positions and verify that that the position
button in the ladder is reflectig the net position carefully.
button in the ladder is reflecting the net position carefully.
Open up the PNL and make sure the Day Long and Day Short positions match what you expect.
The Start Net Pos should be 0. (The Total Net Pos in the PNL should match the pos button
in the ladder)
2. Now comes the SOD part. The SOD is what demarkates a day. Notice the time, convert it to UTC
and override the SOD time in your spark.conf
2. Now comes the SOD part. The SOD is what demarkates a day. Find the most recent time on your fills, select 1 minute past that and convert it to UTC and override the SOD time in your spark.conf
Here's an example of what the key looks like:
SODTime{
value {
@@ -27,7 +28,7 @@ SODTime{
}
}
3. Now restart the server. Verify that all rows in the fills have a Fill Kind 'Sod'.
3. Now restart the server. Verify that all rows in the fills have a Fill Kind 'Sod' and the time matches the SODTime (converted to your local time zone)
4. Verify that the ladder is displaying the correct position (it should be the same as before
the server start)