From d1784355d0deca541b7e12bfd03144877680e825 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 23 Oct 2018 11:51:47 -0500 Subject: [PATCH 1/7] icons.cs - applying a layer of frost --- src/client/spark/Images/Icons.cs | 104 +++++++++++++++---------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index 2eec0bce9..f9fee789c 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -20,7 +20,7 @@ namespace mbts.ui { static readonly string base_uri = "pack://application:,,,/Images/Icons/"; private static ResourceDictionary _resources = (ResourceDictionary)Application.LoadComponent(new Uri("/Images/Vector/Icons.xaml", UriKind.RelativeOrAbsolute)); - + private static Uri uri(string filename) { return new Uri(base_uri + filename); } @@ -36,20 +36,20 @@ 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 Analytics { get { return (DrawingImage)_resources["Analytics"]; } } - public static ImageSource Sheets { get { return (DrawingImage)_resources["Sheets"]; } } - public static ImageSource Trades { get { return (DrawingImage)_resources["Trades"]; } } - public static ImageSource Depth { get { return (DrawingImage)_resources["Depth"]; } } - public static ImageSource Ladder { get { return (DrawingImage)_resources["Ladder"]; } } + public static ImageSource Admin { get { return load_resource_and_freeze("Admin"); } } + public static ImageSource Analytics { get { return load_resource_and_freeze("Analytics"); } } + public static ImageSource Sheets { get { return load_resource_and_freeze("Sheets"); } } + public static ImageSource Trades { get { return load_resource_and_freeze("Trades"); } } + public static ImageSource Depth { get { return load_resource_and_freeze("Depth"); } } + public static ImageSource Ladder { get { return load_resource_and_freeze("Ladder"); } } public static ImageSource SheetsRed { get { return load_image("SheetsRed.png"); } } public static ImageSource SheetsGreen { get { return load_image("SheetsGreen.png"); } } - public static ImageSource Spreads { get { return (DrawingImage)_resources["Spreads"]; } } + public static ImageSource Spreads { get { return load_resource_and_freeze("Spreads"); } } public static ImageSource BlueSpreads { get { return load_image("BlueSpread.ico"); } } - public static ImageSource Reports { get { return (DrawingImage)_resources["Reports"]; } } - public static ImageSource Risk { get { return (DrawingImage)_resources["Risk"]; } } - public static ImageSource Eye { get { return (DrawingImage)_resources["Eye"]; } } - public static ImageSource Coins { get { return (DrawingImage)_resources["Coins"]; } } + public static ImageSource Reports { get { return load_resource_and_freeze("Reports"); } } + public static ImageSource Risk { get { return load_resource_and_freeze("Risk"); } } + public static ImageSource Eye { get { return load_resource_and_freeze("Eye"); } } + public static ImageSource Coins { get { return load_resource_and_freeze("Coins"); } } public static ImageSource DataCopy { get { return load_image("DataCopy.ico"); } } @@ -60,10 +60,10 @@ namespace mbts.ui { public static ImageSource Date { get { return load_image("Date.png"); } } - public static ImageSource Cube3d { get { return (DrawingImage)_resources["Cube"]; } } + public static ImageSource Cube3d { get { return load_resource_and_freeze("Cube"); } } public static ImageSource Algo { get { return Cube3d; } } public static ImageSource Quote { get { return Math; } } - public static ImageSource Math { get { return (DrawingImage)_resources["Surface"]; } } + public static ImageSource Math { get { return load_resource_and_freeze("Surface"); } } public static ImageSource Abacus { get { return load_image("Abacus.png"); } } public static ImageSource Delete { get { return load_image("Delete.png"); } } @@ -75,61 +75,61 @@ namespace mbts.ui { #pragma warning restore CS0618 // Vector icons - public static ImageSource Bookmarks { get { return (DrawingImage)_resources["Bookmarks"]; } } - public static ImageSource Window { get { return (DrawingImage)_resources["Window"]; } } - public static ImageSource ActiveWindow { get { return (DrawingImage)_resources["ActiveWindow"]; } } - public static ImageSource Trash { get { return (DrawingImage)_resources["Trash"]; } } - public static ImageSource Trash2 { get { return (DrawingImage)_resources["Trash2"]; } } - public static ImageSource Crucible { get { return (DrawingImage)_resources["Crucible"]; } } + public static ImageSource Bookmarks { get { return load_resource_and_freeze("Bookmarks"); } } + public static ImageSource Window { get { return load_resource_and_freeze("Window"); } } + public static ImageSource ActiveWindow { get { return load_resource_and_freeze("ActiveWindow"); } } + public static ImageSource Trash { get { return load_resource_and_freeze("Trash"); } } + public static ImageSource Trash2 { get { return load_resource_and_freeze("Trash2"); } } + public static ImageSource Crucible { get { return load_resource_and_freeze("Crucible"); } } - public static ImageSource Accounting { get { return (DrawingImage)_resources["Accounting"]; } } - public static ImageSource Add { get { return (DrawingImage)_resources["Add"]; } } - public static ImageSource AddEncircled { get { return (DrawingImage)_resources["AddEncircled"]; } } - public static ImageSource Beaker { get { return (DrawingImage)_resources["Beaker"]; } } - public static ImageSource Book { get { return (DrawingImage)_resources["Book"]; } } + public static ImageSource Accounting { get { return load_resource_and_freeze("Accounting"); } } + public static ImageSource Add { get { return load_resource_and_freeze("Add"); } } + public static ImageSource AddEncircled { get { return load_resource_and_freeze("AddEncircled"); } } + public static ImageSource Beaker { get { return load_resource_and_freeze("Beaker"); } } + public static ImageSource Book { get { return load_resource_and_freeze("Book"); } } public static ImageSource Orders => create_icon(OrdersGeometryKey); - public static ImageSource AddOrders { get { return (DrawingImage)_resources["AddOrders"]; } } - public static ImageSource CancelOrders { get { return (DrawingImage)_resources["CancelOrders"]; } } - public static ImageSource CancelBuys { get { return (DrawingImage)_resources["CancelBuys"]; } } - public static ImageSource CancelSells { get { return (DrawingImage)_resources["CancelSells"]; } } - public static ImageSource CancelSelected { get { return (DrawingImage)_resources["CancelSelected"]; } } - - public static ImageSource LadderCancelOrders { get { return (DrawingImage)_resources["LadderCancelOrders"]; } } - public static ImageSource LadderCancelBuys { get { return (DrawingImage)_resources["LadderCancelBuys"]; } } - public static ImageSource LadderCancelSells { get { return (DrawingImage)_resources["LadderCancelSells"]; } } + public static ImageSource AddOrders { get { return load_resource_and_freeze("AddOrders"); } } + public static ImageSource CancelOrders { get { return load_resource_and_freeze("CancelOrders"); } } + public static ImageSource CancelBuys { get { return load_resource_and_freeze("CancelBuys"); } } + public static ImageSource CancelSells { get { return load_resource_and_freeze("CancelSells"); } } + public static ImageSource CancelSelected { get { return load_resource_and_freeze("CancelSelected"); } } - public static ImageSource Synthetics { get { return (DrawingImage)_resources["Synthetics"]; } } - public static ImageSource AddSynthetic { get { return (DrawingImage)_resources["AddSynthetic"]; } } - public static ImageSource RemoveSynthetic { get { return (DrawingImage)_resources["RemoveSynthetic"]; } } - public static ImageSource ModifySynthetic { get { return (DrawingImage)_resources["ModifySynthetic"]; } } - public static ImageSource CloneSynthetic { get { return (DrawingImage)_resources["CloneSynthetic"]; } } + public static ImageSource LadderCancelOrders { get { return load_resource_and_freeze("LadderCancelOrders"); } } + public static ImageSource LadderCancelBuys { get { return load_resource_and_freeze("LadderCancelBuys"); } } + public static ImageSource LadderCancelSells { get { return load_resource_and_freeze("LadderCancelSells"); } } - public static ImageSource ModifyOrder { get { return (DrawingImage)_resources["ModifyOrder"]; } } - public static ImageSource Clock { get { return (DrawingImage)_resources["Clock"]; } } - public static ImageSource Defrag { get { return (DrawingImage)_resources["Defrag"]; } } - public static ImageSource Display { get { return (DrawingImage)_resources["Display"]; } } + public static ImageSource Synthetics { get { return load_resource_and_freeze("Synthetics"); } } + public static ImageSource AddSynthetic { get { return load_resource_and_freeze("AddSynthetic"); } } + public static ImageSource RemoveSynthetic { get { return load_resource_and_freeze("RemoveSynthetic"); } } + public static ImageSource ModifySynthetic { get { return load_resource_and_freeze("ModifySynthetic"); } } + public static ImageSource CloneSynthetic { get { return load_resource_and_freeze("CloneSynthetic"); } } + + public static ImageSource ModifyOrder { get { return load_resource_and_freeze("ModifyOrder"); } } + public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } } + public static ImageSource Defrag { get { return load_resource_and_freeze("Defrag"); } } + public static ImageSource Display { get { return load_resource_and_freeze("Display"); } } public static ImageSource Draggable => create_icon(DraggableGeometryKey); public static ImageSource Export => load_resource_and_freeze("Export"); - public static ImageSource Filter { get { return (DrawingImage)_resources["Filter"]; } } - public static ImageSource FilterActive { get { return (DrawingImage)_resources["FilterActive"]; } } - public static ImageSource FilterError { get { return (DrawingImage)_resources["FilterError"]; } } + public static ImageSource Filter { get { return load_resource_and_freeze("Filter"); } } + public static ImageSource FilterActive { get { return load_resource_and_freeze("FilterActive"); } } + public static ImageSource FilterError { get { return load_resource_and_freeze("FilterError"); } } public static ImageSource Gear => create_icon(GearGeometryKey); public static ImageSource Import => load_resource_and_freeze("Import"); - public static ImageSource Knight { get { return (DrawingImage)_resources["Knight"]; } } + public static ImageSource Knight { get { return load_resource_and_freeze("Knight"); } } public static ImageSource Payment => create_icon(PaymentGeometryKey); - public static ImageSource Spawn { get { return (DrawingImage)_resources["Spawn"]; } } - public static ImageSource Target { get { return (DrawingImage)_resources["Target"]; } } - public static ImageSource Tetris { get { return (DrawingImage)_resources["Tetris"]; } } + public static ImageSource Spawn { get { return load_resource_and_freeze("Spawn"); } } + public static ImageSource Target { get { return load_resource_and_freeze("Target"); } } + public static ImageSource Tetris { get { return load_resource_and_freeze("Tetris"); } } public static ImageSource Tools => create_icon(ToolsGeometryKey); public static ImageSource ViewSettings => load_resource_and_freeze("ViewSettings"); - public static ImageSource Wrench { get { return (DrawingImage)_resources["Wrench"]; } } + public static ImageSource Wrench { get { return load_resource_and_freeze("Wrench"); } } public static ImageSource RightArrow { get { return (load_resource_and_freeze("RightArrow")); } } public static ImageSource DownArrow { get { return (load_resource_and_freeze("DownArrow")); } } public static ImageSource Factory { get { return (load_resource_and_freeze("Factory")); } } public static ImageSource DotsVertical { get { return (load_resource_and_freeze("DotsVertical")); } } public static ImageSource HandPointingOverDocument => load_resource_and_freeze("HandPointingOverDocument"); - public static ImageSource Support => load_resource_and_freeze("SupportIcon"); + public static ImageSource Support => load_resource_and_freeze("SupportIcon"); public static ImageSource create_icon(string geometric_path_key) => create_icon(geometric_path_key, Brushes.Black); From 853f8d2e84c37f431af6bdd101bc4eb61f0fd396 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 23 Oct 2018 11:59:14 -0400 Subject: [PATCH 2/7] Start ExchangeSim earlier to avoid race condition. --- src/lib/config/protos/MarketData.proto | 1 + src/lib/orderman/actors/MDSource.h | 1 + src/server/sparkd/cmds/Run.cpp | 4 ---- src/server/sparkd/md/run_md.cpp | 10 ++++++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index b08e0e7ca..d19d36952 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -5,6 +5,7 @@ message MarketDataConfig { // Allows you to turn off in-proc market data entirely optional bool use_md = 1 [default = true]; optional bool use_replay = 2 [default=false]; + optional bool use_sim = 3 [default=true]; } message PlatformMap diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index ab5fa50c0..26316ed7b 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -25,6 +25,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { : _handles(), _md_consumer(consumer), _book_update(), _stats(stats), _loop_timer() {} void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); + bts_assert_msg(_md_consumer.all_heartbeats_ok(), "Marketdata heartbeats are bad. MDConsumer will not recover from this condition. Please run 'sparkd md cleanup' and restart sparkd"); std::array buckets; auto i = 1; diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 45bb356f1..24155e9d6 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -18,7 +18,6 @@ #include "lib/orderman/server/OrderServiceServer.h" #include "lib/persistence/PersistenceServiceServer.h" #include "lib/utils/thread_manager.h" -#include "server/sparkd/exchange_sim/ExchangeSim.h" #include "server/sparkd/http/WebServer.h" #include "server/sparkd/md/run_md.h" #include "server/sparkd/position/PositionServiceServer.h" @@ -78,9 +77,6 @@ int Run::execute(std::vector const &) { timer2.start(); stats.publish(bg_health); - threading::make_thread("ExchangeSim", []() { sim::start_exchange_sim(); }) - .detach(); - std::this_thread::sleep_until( std::chrono::time_point::max()); return 0; diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 1f398a3f9..b4d5a4f78 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -10,6 +10,8 @@ #include "lib/md/Diag/ShmDumper.h" #include "platforms/mdp3_onixs/MDP3Main.h" #include "lib/md/SecurityDB.h" +#include "server/sparkd/exchange_sim/ExchangeSim.h" +#include "lib/utils/thread_manager.h" #include #include @@ -74,7 +76,6 @@ void run_cleanup() { std::thread* _md_thread; void run_market_data_publishers_forever() { os::set_thread_name("md publisher"); - run_cleanup(); if (config::get().use_replay()) { run_replay(); } @@ -85,13 +86,18 @@ void run_market_data_publishers_forever() { void run_market_datapublishers() { bts_assert(_md_thread == nullptr); - if (!config::get().use_md()) return; run_cleanup(); + if (!config::get().use_md()) return; // start a thread for the md _md_thread = new std::thread([]() { run_market_data_publishers_forever(); }); + if (config::get().use_sim()) { + threading::make_thread("ExchangeSim", []() { sim::start_exchange_sim(); }) + .detach(); + } + std::this_thread::sleep_for(2s); } From 45f5e485d320e2905c397e5b3b2bb83fbd52e08d Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 23 Oct 2018 15:27:45 -0400 Subject: [PATCH 3/7] Remove unused md defaults --- src/lib/config/defaults/MarketData.conf | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 20357897b..4a9bebc13 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -35,16 +35,3 @@ CMEOptions { } } -CMEOptions { - rule: "'MDP3_LL' = System.qualifier" - value { - feed_engine { - name: "driver" - #num_threads: 2 - } - channel { - id: "310" - feed_engine: "driver" - } - } -} From 0a426b84e3837c5d6f1ba5a44179fc81f9e8b6f9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 23 Oct 2018 15:28:00 -0400 Subject: [PATCH 4/7] Fix sparkd crash in webserver.cpp --- src/server/sparkd/http/WebServer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index 3a30efa71..653c26ecf 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -117,7 +117,11 @@ namespace http { GatewayRequest request; if(request.ParseFromString(msg->get_payload())) { iter->second.handle(request, [this,hdl](const GatewayResponse& response) { - _server.send(hdl, response.SerializeAsString(), websocketpp::frame::opcode::binary); + websocketpp::lib::error_code ec; + _server.send(hdl, response.SerializeAsString(), websocketpp::frame::opcode::binary, ec); + if (ec) { + LOG(Api,Warn, "Error sending from websocket: '{}'", ec.message()); + } }); } else { From 7c28938ba61b417a9a755f8d3c1b0595397a6bae Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 23 Oct 2018 16:10:09 -0400 Subject: [PATCH 5/7] Stop slowly publishing md_permissions when nobody is listening. --- src/lib/CMakeDeps.cmake | 2 +- src/server/sparkd/user/AdminServiceServer.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 9979952dc..5022d6833 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -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/MarketDataAuxiliaryService.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/cme_reference_data.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.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/cme_reference_data.proto;config/protos/dynamic_orders.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.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/threads.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;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_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;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.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/GrowableSPSCQueue.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;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +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/MarketDataAuxiliaryService.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/cme_reference_data.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.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/cme_reference_data.proto;config/protos/dynamic_orders.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.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/threads.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/GrowableSPSCQueue.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;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 5ae3c2319..bb5c07fe1 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -6,6 +6,7 @@ #include "lib/utils/PBUtils.h" #include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/utils/TimeStamp.h" #include #include @@ -135,6 +136,7 @@ void AdminServiceServer::delete_account( } void AdminServiceServer::_update_and_publish(bool is_insert){ std::string ser_state; + auto start = utils::TimeStamp::now(); if (_state.SerializeToString(&ser_state)) { LOG(Gen, Info, "Saving admin data"); @@ -145,7 +147,9 @@ void AdminServiceServer::_update_and_publish(bool is_insert){ _publisher.add_or_update(_state); _publisher.flush(); _publish_md_entitlements(); - _publish_md_permissions(); + // _publish_md_permissions(); + auto elapsed = (utils::TimeStamp::now() - start).milliseconds(); + LOG(Gen, Info, "Saved admin data ({}ms)", elapsed); } else LOG(Gen, Error, "Could not serialize admin data, saving failed"); From fa31c2ef1192a0197963534c4cc77db5a8bacab6 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 23 Oct 2018 15:39:15 -0500 Subject: [PATCH 6/7] MView - Better (Implied, Direct, Merged) Header Text defaults, column size adjusted appropriately --- .../spark/Modules/Market/MarketView/MarketViewVM.cs | 10 +++++----- .../Market/MarketView/MarketViewWindowFactory.cs | 12 ++++++------ .../view/Controls/DIYGrid/Columns/ColumnBase.cs | 4 ++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 5f536d8c4..c193f506c 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -43,14 +43,14 @@ namespace mbts.spark { add_col(Columns.LastSize, merged_size_col_header, r => r.last_size.ToString(), nameof(Row.last_size), DefaultColumnWidths.Size, last_size_filter, DataGridFilterKnownTemplates.UShortMinMax, h_alignment: System.Windows.HorizontalAlignment.Right); add_col(Columns.Position, "Pos", r => r.position.ToString(), nameof(Row.position), DefaultColumnWidths.Size, position_filter, DataGridFilterKnownTemplates.IntMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right); add_hl_working_orders_col(Columns.WorkingBids, working_col_header, nameof(Row.working_bids_text), nameof(Row.working_best_bid), nameof(Row.working_bids_click), working_bid_volume_filter, BTSColors.MarketData.bid, System.Windows.HorizontalAlignment.Right); - add_col(Columns.BidImpliedSize, implied_size_col_header, r => r.bid_implied_size.ToString(), nameof(Row.bid_implied_size), DefaultColumnWidths.Size, bid_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right); - add_col(Columns.BidDirectSize, direct_size_col_header, r => r.bid_direct_size.ToString(), nameof(Row.bid_direct_size), DefaultColumnWidths.Size, bid_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right); + add_col(Columns.BidImpliedSize, implied_size_col_header, r => r.bid_implied_size.ToString(), nameof(Row.bid_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right); + add_col(Columns.BidDirectSize, direct_size_col_header, r => r.bid_direct_size.ToString(), nameof(Row.bid_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right); add_hl_merged_size_col(Columns.BidMergedSize, merged_size_col_header, nameof(Row.bid_merged_size), nameof(Row.bid_merged_size_text), nameof(Row.bid_merged_size_click), bid_merged_size_filter, BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right); add_hl_price_col(Columns.Bid, "Bid", nameof(Row.bid_price), nameof(Row.bid_price_click), bid_price_filter, BTSColors.header_text, BTSColors.MarketData.bid_brush, h_alignment: System.Windows.HorizontalAlignment.Right); add_hl_price_col(Columns.Ask, "Ask", nameof(Row.ask_price), nameof(Row.ask_price_click), ask_price_filter, BTSColors.header_text, BTSColors.MarketData.ask_brush, h_alignment: System.Windows.HorizontalAlignment.Right); add_hl_merged_size_col(Columns.AskMergedSize, merged_size_col_header, nameof(Row.ask_merged_size), nameof(Row.ask_merged_size_text), nameof(Row.ask_merged_size_click), ask_merged_size_filter, BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right); - add_col(Columns.AskDirectSize, direct_size_col_header, r => r.ask_direct_size.ToString(), nameof(Row.ask_direct_size), DefaultColumnWidths.Size, ask_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right); - add_col(Columns.AskImpliedSize, implied_size_col_header, r => r.ask_implied_size.ToString(), nameof(Row.ask_implied_size), DefaultColumnWidths.Size, ask_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right); + add_col(Columns.AskDirectSize, direct_size_col_header, r => r.ask_direct_size.ToString(), nameof(Row.ask_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right); + add_col(Columns.AskImpliedSize, implied_size_col_header, r => r.ask_implied_size.ToString(), nameof(Row.ask_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right); add_hl_working_orders_col(Columns.WorkingAsks, working_col_header, nameof(Row.working_asks_text), nameof(Row.working_best_ask), nameof(Row.working_asks_click), working_ask_volume_filter, BTSColors.MarketData.ask, System.Windows.HorizontalAlignment.Right); add_col(Columns.Settlement, "Settlement", r => r.format_price(r.settlement), nameof(Row.settlement), DefaultColumnWidths.Settlement, settlement_filter, DataGridFilterKnownTemplates.DoubleMinMax, h_alignment: System.Windows.HorizontalAlignment.Right); add_col(Columns.DayChange, "Change", r => r.format_price(r.day_change), nameof(Row.day_change), DefaultColumnWidths.Price, day_change_filter, DataGridFilterKnownTemplates.DoubleMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right); @@ -74,7 +74,7 @@ namespace mbts.spark { add_hl_col(col_key, header, price_binding(prop), prop, command_prop, filter, DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.MViewPrice, foreground, background, DefaultSelectionHighlight, h_alignment); void add_hl_merged_size_col(Columns col_key, string header, string sort_prop, string text_prop, string command_prop, IDataGridColumnFilter filter, Color foreground, System.Windows.HorizontalAlignment h_alignment) => - add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.UShortMinMax, DefaultColumnWidths.Size, foreground, null, null, h_alignment); + add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.UShortMinMax, DefaultColumnWidths.ImpliedDirectMergedSize, foreground, null, null, h_alignment); void add_hl_working_orders_col(Columns col_key, string header, string text_prop, string sort_prop, string command_prop, IDataGridColumnFilter filter, Color foreground, System.Windows.HorizontalAlignment h_alignment) => add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.IntMinMax, working_orders_col_width, foreground, null, null, h_alignment); diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index 52942ed40..a5d80795c 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -83,14 +83,14 @@ namespace bts.shell { public static GridColumnSettings last_size => new GridColumnSettings(col_id(Columns.LastSize), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings position => new GridColumnSettings(col_id(Columns.Position), DefaultColumnHeaders.Pos, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings working_bids => new GridColumnSettings(col_id(Columns.WorkingBids), DefaultColumnHeaders.Working, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.Working, horizontal_alignment: System.Windows.HorizontalAlignment.Right); - public static GridColumnSettings bid_implied_size => new GridColumnSettings(col_id(Columns.BidImpliedSize), DefaultColumnHeaders.Size, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); - public static GridColumnSettings bid_direct_size => new GridColumnSettings(col_id(Columns.BidDirectSize), DefaultColumnHeaders.Size, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); - public static GridColumnSettings bid_merged_size => new GridColumnSettings(col_id(Columns.BidMergedSize), DefaultColumnHeaders.Size, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); + public static GridColumnSettings bid_implied_size => new GridColumnSettings(col_id(Columns.BidImpliedSize), DefaultColumnHeaders.ImpliedSize, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right); + public static GridColumnSettings bid_direct_size => new GridColumnSettings(col_id(Columns.BidDirectSize), DefaultColumnHeaders.DirectSize, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right); + public static GridColumnSettings bid_merged_size => new GridColumnSettings(col_id(Columns.BidMergedSize), DefaultColumnHeaders.MergedSize, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings bid => new GridColumnSettings(col_id(Columns.Bid), DefaultColumnHeaders.Bid, font_color_override: BTSColors.header_text, width:DefaultColumnWidths.MViewPrice, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings ask => new GridColumnSettings(col_id(Columns.Ask), DefaultColumnHeaders.Ask, font_color_override: BTSColors.header_text, width: DefaultColumnWidths.MViewPrice, horizontal_alignment: System.Windows.HorizontalAlignment.Right); - public static GridColumnSettings ask_merged_size => new GridColumnSettings(col_id(Columns.AskMergedSize), DefaultColumnHeaders.Size, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); - public static GridColumnSettings ask_direct_size => new GridColumnSettings(col_id(Columns.AskDirectSize), DefaultColumnHeaders.Size, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); - public static GridColumnSettings ask_implied_size => new GridColumnSettings(col_id(Columns.AskImpliedSize), DefaultColumnHeaders.Size, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); + public static GridColumnSettings ask_merged_size => new GridColumnSettings(col_id(Columns.AskMergedSize), DefaultColumnHeaders.MergedSize, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right); + public static GridColumnSettings ask_direct_size => new GridColumnSettings(col_id(Columns.AskDirectSize), DefaultColumnHeaders.DirectSize, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right); + public static GridColumnSettings ask_implied_size => new GridColumnSettings(col_id(Columns.AskImpliedSize), DefaultColumnHeaders.ImpliedSize, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings working_asks => new GridColumnSettings(col_id(Columns.WorkingAsks), DefaultColumnHeaders.Working, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.Working, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings settlement => new GridColumnSettings(col_id(Columns.Settlement), DefaultColumnHeaders.Settlement, width: DefaultColumnWidths.Settlement, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings day_change => new GridColumnSettings(col_id(Columns.DayChange), DefaultColumnHeaders.DayChange, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right); diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 8b4491cb8..3edb17e7d 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -31,6 +31,7 @@ namespace mbts.ui.controls { SecurityType = 96, Side = 47, Size = 48, + ImpliedDirectMergedSize = 68, Filled = 56, Symbol = 78, Time = 112, @@ -65,6 +66,9 @@ namespace mbts.ui.controls { SecurityType = "Security Type", Side = "Side", Size = "Qty", + MergedSize = "Qty (M)", + DirectSize = "Qty (D)", + ImpliedSize = "Qty (I)", Symbol = "Symbol", TimeInForce = "TIF", TradeKey = "Trade Key", From a53d48a6e3cedf23df9e6331fc038e77e7019630 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 23 Oct 2018 17:37:31 -0400 Subject: [PATCH 7/7] FirstOrDefault is incompatible with immutable.... --- src/client/spark/Admin/AdminModel.cs | 2 +- src/client/spark_core/utils/GlobalExtensions.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 55a314811..f3319cab2 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -26,7 +26,7 @@ namespace mbts.spark { AdminModel(AdminService service, [Import("username")]string user_name) { _user_name = user_name; _dispose = service.subscribei_admin_data().Select(update => { - _wrapper_subject.OnNext(new AdminModelWrapper(update.all.FirstOrDefault(), _user_name)); + _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), _user_name)); IEnumerable active_users = from admin_data in update.all from bts_user in admin_data.Users diff --git a/src/client/spark_core/utils/GlobalExtensions.cs b/src/client/spark_core/utils/GlobalExtensions.cs index 5948cb21d..b872b32ae 100644 --- a/src/client/spark_core/utils/GlobalExtensions.cs +++ b/src/client/spark_core/utils/GlobalExtensions.cs @@ -67,5 +67,11 @@ namespace mbts { } } + public static T? TryFirst(this IEnumerable src) where T : struct + { + foreach(var v in src) + return v; + return null; + } } } \ No newline at end of file