From 81cc932f9533288ac6efcfdda827e69be893ce71 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 29 Sep 2017 14:45:18 +0000 Subject: [PATCH 1/6] Still working on custom Windows build. --- tools/pp_setup_builds.bat | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/pp_setup_builds.bat b/tools/pp_setup_builds.bat index fd51b70dc..8dd1b16b2 100644 --- a/tools/pp_setup_builds.bat +++ b/tools/pp_setup_builds.bat @@ -1,11 +1,14 @@ @echo off @setlocal cd %~dp0\.. +set ROOT=%cd% mkdir c:\build 2> nul -pushd c:\build -rmdir /s /q Debug -rmdir /s /q Release -cmake.exe -G "Visual Studio 15 2017 Win64" .. -popd +rmdir /s /q c:\build\Debug +rmdir /s /q c:\build\Release +cd c:\build +c: +cmake.exe -G "Visual Studio 15 2017 Win64" %ROOT% +cd %ROOT% +P: copy /y tools\cpp.build.props c:\build\Directory.Build.Props del c:\build\spark.sln From 5f937ac94a0e2987609da2ca609b627f7d170002 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 29 Sep 2017 14:46:05 +0000 Subject: [PATCH 2/6] Added status reporting to order service. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/OrderService.proto | 25 ++++++++++-- src/lib/config/protos/Executor.proto | 12 ------ src/lib/utils/PBUtils.cpp | 10 +++++ src/lib/utils/PBUtils.h | 10 ++++- src/server/sparkd/main.cpp | 3 ++ .../orderman/events/ExecutionReport.cpp | 13 +++---- .../events/NativeOrderStateChange.cpp | 1 + .../orderman/service/OrderServiceServer.cpp | 39 ++++++++++++------- src/server/sparkd/persistence/SqliteStore.cpp | 2 +- 10 files changed, 77 insertions(+), 40 deletions(-) mode change 100644 => 100755 src/lib/CMakeDeps.cmake delete mode 100644 src/lib/config/protos/Executor.proto diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake old mode 100644 new mode 100755 index 27713cdda..fe55310db --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.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/services/ApiUnitTestService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.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/Account.conf;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Symbols.conf;config/defaults/User.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/Account.proto;config/protos/Executor.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/User.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.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;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/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Structure/FixedSecurity.cpp;md/Structure/PriceSize.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_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;security_model/SecurityHelper.cpp;security_model/old_security.proto;sparkproto/SparkProtos.proto;testing/windows_test_driver.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file +set(sources api/apicore.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/services/ApiUnitTestService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.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/Account.conf;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Symbols.conf;config/defaults/User.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/Account.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/User.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.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;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/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Structure/FixedSecurity.cpp;md/Structure/PriceSize.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_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;security_model/SecurityHelper.cpp;security_model/old_security.proto;sparkproto/SparkProtos.proto;testing/windows_test_driver.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index c5cfd1740..bf6f2a0db 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -60,13 +60,20 @@ enum OrderError { OE_OK = 0 ; OE_UNSUPPORTED_ORDER_TYPE = 1 ; - OE_VENUE_NOT_READY = 2 ; + OE_GATEWAY_NOT_READY = 2 ; OE_UNKNOWN_ORDER = 5 ; OE_UNKNOWN_SECURITY = 6 ; OE_ORDER_NOT_ACK = 7 ; OE_SERVER_NOT_READY = 8 ; } +enum GatewayStatus +{ + GATEWAYSTATUS_UNDEFINED = 0 ; + GATEWAYSTATUS_READY = 2 ; + GATEWAYSTATUS_NOT_READY = 3 ; +} + enum CTICode { CTI_UNDEFINED = 0 ; @@ -98,8 +105,8 @@ enum ExecType } enum ManualOrderIndicator { - MOI_NO = 0; - MOI_YES = 1; + MOI_NO = 0 ; + MOI_YES = 1 ; } message NativeOrderState { @@ -221,8 +228,16 @@ message NativeFill { google.protobuf.Timestamp timestamp = 8; } +message GatewayStatusUpdate { + google.protobuf.Timestamp timestamp = 1; + GatewayStatus gateway_status = 2; + string gateway_name = 3 [(bts.api.key)=true]; + uint32 order_key = 4; // Work around bug in code gen +} + message OrdersSub {} message FillsSub {} +message GatewayStatusSub {} service OrderService { option (bts.api.service_description)="Implements algo management"; @@ -230,7 +245,9 @@ service OrderService { rpc create_order(CreateOrderRequest) returns (CreateOrderResponse); rpc cancel_order(CancelOrderRequest) returns (CancelOrderResponse); rpc update_order(UpdateOrderRequest) returns (UpdateOrderResponse); + rpc orders (OrdersSub) returns (stream OrderState); - rpc fills (FillsSub) returns (stream NativeFill); + rpc fills (FillsSub) returns (stream NativeFill); + rpc gateway (GatewayStatusSub) returns (stream GatewayStatusUpdate); } diff --git a/src/lib/config/protos/Executor.proto b/src/lib/config/protos/Executor.proto deleted file mode 100644 index b745e5ef5..000000000 --- a/src/lib/config/protos/Executor.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax='proto2'; -package bts.config; - -message Executor { - optional int32 affinity = 1 [default = -1]; - optional bool yield_cpu = 2 [default = true]; - repeated string actor = 3; -} - -message ExecutorCfg { - repeated Executor executor = 1; -} diff --git a/src/lib/utils/PBUtils.cpp b/src/lib/utils/PBUtils.cpp index f48664b8e..237c1c021 100755 --- a/src/lib/utils/PBUtils.cpp +++ b/src/lib/utils/PBUtils.cpp @@ -1,6 +1,9 @@ #include "PBUtils.h" #include +#include +#include +#include namespace bts { namespace utils { @@ -13,5 +16,12 @@ std::string to_string (google::protobuf::Message const &msg) return result; } +google::protobuf::Timestamp to_timestamp(datetime::PTime const &ptime) +{ + google::protobuf::Timestamp gts; + gts.set_seconds(boost::posix_time::to_time_t(ptime)); + gts.set_nanos(0); + return gts; +} }}} diff --git a/src/lib/utils/PBUtils.h b/src/lib/utils/PBUtils.h index 2f8839044..e8f5932bc 100755 --- a/src/lib/utils/PBUtils.h +++ b/src/lib/utils/PBUtils.h @@ -2,23 +2,31 @@ #include #include +#include "lib/utils/datetime.h" + #include "bts_export.h" namespace google { namespace protobuf { class Message; +class Timestamp; }} namespace bts { namespace utils { namespace pb { + BTS_EXPORT std::string to_string (google::protobuf::Message const &msg); +BTS_EXPORT google::protobuf::Timestamp to_timestamp(datetime::PTime const &ptime); template bool from_string(const std::string &str, T*out) { return google::protobuf::TextFormat::ParseFromString (str,out); } -}}} + +}} +} + diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 6c075cf33..52c88d273 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -14,6 +14,7 @@ #include "server/sparkd/md/run_md.h" #include "server/sparkd/orderman/service/OrderServiceServer.h" #include "lib/md/relay/QueryServer.h" +#include "lib/api/services/OrderService.pb.h" #include "server/sparkd/orderman/events/ExecutionReport.h" @@ -34,6 +35,8 @@ void start_services() user::UserServiceServer login_server(sc); run_market_datapublishers(); md::QueryServerPtr md_query_server(md::run_query_server(sc)); + orderman::OrderServiceServer order_server(sc); + std::this_thread::sleep_until(std::chrono::time_point::max()); } } diff --git a/src/server/sparkd/orderman/events/ExecutionReport.cpp b/src/server/sparkd/orderman/events/ExecutionReport.cpp index 940ac0905..244da724d 100644 --- a/src/server/sparkd/orderman/events/ExecutionReport.cpp +++ b/src/server/sparkd/orderman/events/ExecutionReport.cpp @@ -1,10 +1,11 @@ #include "ExecutionReport.h" -#include "lib/utils/datetime.h" -#include -#include +#include "lib/utils/datetime.h" +#include "lib/utils/PBUtils.h" + #include #include +#include namespace bts { namespace orderman { @@ -20,11 +21,9 @@ api::orderman::NativeFill to_pb(ExecutionReport::Data const&r) result.set_last_price(r.last_price.value()); result.set_avg_price(r.avg_price.value()); result.set_fill_id(fmt::format("{}/{}",r.order_key.value(),to_str(r.exchange_fill_id))); + auto ts = datetime::parse_FIX_timestamp(to_str(r.transact_time)); - google::protobuf::Timestamp gts; - gts.set_seconds(boost::posix_time::to_time_t(ts)); - gts.set_nanos(0); - *result.mutable_timestamp() = gts; + *result.mutable_timestamp() = utils::pb::to_timestamp(ts); return result; } diff --git a/src/server/sparkd/orderman/events/NativeOrderStateChange.cpp b/src/server/sparkd/orderman/events/NativeOrderStateChange.cpp index fe0c6285f..587279f79 100644 --- a/src/server/sparkd/orderman/events/NativeOrderStateChange.cpp +++ b/src/server/sparkd/orderman/events/NativeOrderStateChange.cpp @@ -16,6 +16,7 @@ api::orderman::OrderState to_pb(NativeOrderHeader const&header,NativeOrderState result.set_order_key(header.order_key.value()); result.set_parent_order_key(header.parent_order_key.value()); + auto &ts = *result.mutable_timestamp(); struct timeval tv; gettimeofday(&tv, NULL); diff --git a/src/server/sparkd/orderman/service/OrderServiceServer.cpp b/src/server/sparkd/orderman/service/OrderServiceServer.cpp index 6ad5d79d0..0ed2106c6 100644 --- a/src/server/sparkd/orderman/service/OrderServiceServer.cpp +++ b/src/server/sparkd/orderman/service/OrderServiceServer.cpp @@ -34,6 +34,7 @@ #include "lib/api/public/ServiceContext.h" #include "server/sparkd/event_grid/events/Init.h" +#include "lib/utils/PBUtils.h" namespace bts { namespace orderman { @@ -202,7 +203,7 @@ struct SlowExecutor { } }; -enum class OrderServiceServer::State { PENDING_INIT,VENUE_READY, VENUE_NOT_READY}; +enum class OrderServiceServer::State { PENDING_INIT,CONNECTED, DISCONNECTED}; struct OrderServiceServer::PImpl { @@ -218,7 +219,8 @@ struct OrderServiceServer::PImpl known_orders(), publish_fills(), known_fills(), - native_order_objs() + native_order_objs(), + publish_gateway_status() { } @@ -235,6 +237,7 @@ struct OrderServiceServer::PImpl OrderServiceServer::FillsPublisher publish_fills; std::set known_fills; std::map native_order_objs; + OrderServiceServer::GatewayPublisher publish_gateway_status; }; OrderServiceServer::OrderServiceServer (bts::api::ServiceContext& ctx) @@ -248,7 +251,6 @@ OrderServiceServer::OrderServiceServer (bts::api::ServiceContext& ctx) event_grid::forward (me->fast.node,me->slow.node); me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); - me->fast.node.observe ([&ctx,this] (auto const&s) { ctx.post([this,s] () { this->on_gateway_status_change(s);}); }); @@ -281,7 +283,7 @@ void OrderServiceServer::init() bts_assert(me->state == State::PENDING_INIT); me->fast.run(); me->slow.run(); - me->state = State::VENUE_NOT_READY; + me->state = State::DISCONNECTED; } void OrderServiceServer::on_fills(event::NativeFills const&f) @@ -330,15 +332,24 @@ void OrderServiceServer::on_gateway_status_change(event::GatewayStatusChange con case State::PENDING_INIT: bts_assert(false); break; - case State::VENUE_NOT_READY: + case State::DISCONNECTED: bts_assert(st.is_connected); - me->state = State::VENUE_READY; + me->state = State::CONNECTED; break; - case State::VENUE_READY: + case State::CONNECTED: bts_assert(!st.is_connected); - me->state = State::VENUE_NOT_READY; + me->state = State::DISCONNECTED; break; } + + api::orderman::GatewayStatusUpdate update; + *update.mutable_timestamp() = utils::pb::to_timestamp(datetime::now()); + update.set_gateway_name(st.name.value()); + update.set_gateway_status(st.is_connected? + api::orderman::GATEWAYSTATUS_READY : + api::orderman::GATEWAYSTATUS_NOT_READY); + std::vector pub {update}; + me->publish_gateway_status(&pub,nullptr,nullptr); } void OrderServiceServer::on_native_order_state_change(event::NativeOrderStateChange const&o) @@ -365,8 +376,8 @@ void OrderServiceServer::create_order(const api::orderman::CreateOrderRequest& r return; } - if (me->state == State::VENUE_NOT_READY) { - resp.set_error_code(api::orderman::OE_VENUE_NOT_READY); + if (me->state == State::DISCONNECTED) { + resp.set_error_code(api::orderman::OE_GATEWAY_NOT_READY); on_reply(resp); return; } @@ -410,8 +421,8 @@ void OrderServiceServer::cancel_order(const api::orderman::CancelOrderRequest& c api::orderman::CancelOrderResponse resp; resp.set_order_key(cancel.order_key()); - if (me->state == State::VENUE_NOT_READY) { - resp.set_error_code(api::orderman::OE_VENUE_NOT_READY); + if (me->state == State::DISCONNECTED) { + resp.set_error_code(api::orderman::OE_GATEWAY_NOT_READY); on_reply(resp); return; } @@ -450,8 +461,8 @@ void OrderServiceServer::update_order(const api::orderman::UpdateOrderRequest& u auto const&native = update.native_order(); - if (me->state == State::VENUE_NOT_READY) { - resp.set_error_code(api::orderman::OE_VENUE_NOT_READY); + if (me->state == State::DISCONNECTED) { + resp.set_error_code(api::orderman::OE_GATEWAY_NOT_READY); on_reply(resp); return; } diff --git a/src/server/sparkd/persistence/SqliteStore.cpp b/src/server/sparkd/persistence/SqliteStore.cpp index 81e55aad0..cc2b36056 100644 --- a/src/server/sparkd/persistence/SqliteStore.cpp +++ b/src/server/sparkd/persistence/SqliteStore.cpp @@ -134,7 +134,7 @@ SqliteStore::Data SqliteStore::retrieve_all() { std::pair SqliteStore::retrieve_one(std::string const&ns, std::string const&k) { - auto query_str = fmt::format ("select ns,key,value from store where ns='{}' and k='{}", ns,k); + auto query_str = fmt::format ("select ns,key,value from store where ns='{}' and k='{}'", ns,k); sqlite3_stmt_ptr query = utils::prepare_query(me->conn,query_str.c_str()); std::pair result {false,""}; From 2d265724acef32c3c4d52f62138d7ebb3e5e4e1e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 29 Sep 2017 11:53:31 -0400 Subject: [PATCH 3/6] Fixing SecuritySelectorControl search --- .../Controls/SecuritySelectorControl/SecurityItem.cs | 10 ++-------- .../SecuritySelectorControl.xaml.cs | 2 +- src/client/spark_api/security/SecurityHelper.cs | 5 +++++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs b/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs index 57af36734..3c89b831d 100644 --- a/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs +++ b/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs @@ -18,8 +18,8 @@ namespace mbts.ui.spark public Security security { get; private set; } public Venue exchange => security.Exchange; public ContractOneofCase type => security.ContractCase; - public string symbol => _get_symbol(security); - public string display_name => get_display_name(security); + public string symbol => security.ForceSymbol(); + public string display_name => security.ToString(null); public bool is_selected { get => _is_selected; set { @@ -31,12 +31,6 @@ namespace mbts.ui.spark } } public event Action IsSelectedChanged; - - public static string get_display_name(Security s) { return s.ContractCase == ContractOneofCase.Synthetic ? "{0} ({1:q/n:./m:c})".fmt(s.Synthetic.Name, s) : s.ToString("q/n:./m:c"); } - private static string _get_symbol(Security s) { - if (s.ContractCase == ContractOneofCase.Synthetic) return _get_symbol(s.Synthetic.Legs.First().Security); - else return s.Symbol; - } } } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/SecuritySelectorControl/SecuritySelectorControl.xaml.cs b/src/client/spark/view/Controls/SecuritySelectorControl/SecuritySelectorControl.xaml.cs index 8a848021f..20a766221 100644 --- a/src/client/spark/view/Controls/SecuritySelectorControl/SecuritySelectorControl.xaml.cs +++ b/src/client/spark/view/Controls/SecuritySelectorControl/SecuritySelectorControl.xaml.cs @@ -125,7 +125,7 @@ namespace mbts.ui.spark Predicate filter = SearchHelper.get_filter(text); vs.View.Filter = item => filter(((SecurityItem)item).display_name); // deselect SecurityItems that do not pass the filter - target.SelectedSecurities.RemoveAll(s => !filter(SecurityItem.get_display_name(s))); + target.SelectedSecurities.RemoveAll(s => !filter(s.ToString(null))); vs.View.RaiseOnSearch(); } } diff --git a/src/client/spark_api/security/SecurityHelper.cs b/src/client/spark_api/security/SecurityHelper.cs index 0b1693b2f..47004c97c 100644 --- a/src/client/spark_api/security/SecurityHelper.cs +++ b/src/client/spark_api/security/SecurityHelper.cs @@ -61,6 +61,11 @@ namespace bts.api } public static int SignedQuantity(this ContractLeg leg) { return leg.Side == BuySell.Buy ? (int)leg.Quantity : -(int)leg.Quantity; } + + public static string ForceSymbol(this Security security) { + if (security.ContractCase == ContractOneofCase.Synthetic) return ForceSymbol(security.Synthetic.Legs.First().Security); + else return security.Symbol; + } #endregion } } From 43ced8c1fc325c21bd14d7abed30941338a784f4 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 29 Sep 2017 17:55:43 -0400 Subject: [PATCH 4/6] Improve error message for API when the result of a Subscribe is garbage collected --- .../core/GlobalExtensions/TaskExtensions.cs | 2 +- .../api/Channels/QuickBusClientChannel.cs | 24 +++++++++++++++++- .../spark_core/core/AnonymousDisposable.cs | 25 ++++++++++++++++--- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/client/spark/core/GlobalExtensions/TaskExtensions.cs b/src/client/spark/core/GlobalExtensions/TaskExtensions.cs index 8a7b2e58f..33163970c 100644 --- a/src/client/spark/core/GlobalExtensions/TaskExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/TaskExtensions.cs @@ -47,7 +47,7 @@ namespace System.Threading.Tasks await Task.Delay(delay); if (!cts.IsCancellationRequested) action(); }); - return Disposable.Create(cts.Cancel); + return Disposable.Create((Action)cts.Cancel); } } } \ No newline at end of file diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 1ef3f1f20..7d29eac7d 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -86,16 +86,38 @@ namespace bts.api.core { }; var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); _subscriptions.Add(subscription); - return Disposable.Create(() => { + return FinalizeableAnonymousDisposable.Create((disposing) => { ApiNativeMethods.api_client_unsubscribe(_client, subscription); _subscriptions.Remove(subscription); // keepalive cb = null; + if (!disposing) { + observer.OnError(new ObjectDisposedException("Subscription has been terminated because the returned IDisposable has been finalized.")); + } }); }); return result; } + private class FinalizeableAnonymousDisposable : IDisposable { + private Action _action; + public FinalizeableAnonymousDisposable(Action dispose) { + _action = dispose; + } + public static FinalizeableAnonymousDisposable Create(Action dispose) { return new FinalizeableAnonymousDisposable(dispose); } + ~FinalizeableAnonymousDisposable() { + Dispose(false); + } + public void Dispose() { + GC.SuppressFinalize(this); + Dispose(true); + } + protected virtual void Dispose(bool disposing) { + _action?.Invoke(disposing); + _action = null; + } + } + public override bool is_sync_call_ok() { return !ApiNativeMethods.api_client_is_on_qb_thread(_client); } diff --git a/src/client/spark_core/core/AnonymousDisposable.cs b/src/client/spark_core/core/AnonymousDisposable.cs index 50ca185a4..3abb42cd2 100644 --- a/src/client/spark_core/core/AnonymousDisposable.cs +++ b/src/client/spark_core/core/AnonymousDisposable.cs @@ -18,14 +18,33 @@ namespace mbts } public void Dispose() { - if (_action != null) { - _action(); - } + _action?.Invoke(); + } + } + private class FinalizeableAnonymousDisposable : IDisposable { + private Action _action; + public FinalizeableAnonymousDisposable(Action dispose) { + _action = dispose; + } + ~FinalizeableAnonymousDisposable() { + Dispose(false); + } + public void Dispose() { + GC.SuppressFinalize(this); + Dispose(true); + } + + protected virtual void Dispose(bool disposing) { + _action?.Invoke(disposing); + _action = null; } } public static IDisposable Create(Action a) { return new AnonymousDisposable(a); } + public static IDisposable Create(Action a) { + return new FinalizeableAnonymousDisposable(a); + } public static IDisposable Create(params Action[] actions) { return Create(actions.Select(a => Disposable.Create(a)).ToArray()); } From 29460fabf6453bd121a385226cf681d475dcb2d5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 30 Sep 2017 14:58:51 +0000 Subject: [PATCH 5/6] Ordermman --- src/lib/api/services/OrderService.proto | 2 +- src/lib/config/defaults/jetfix.conf | 2 +- src/lib/os/os.cpp | 3 + src/lib/os/os.h | 1 + src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/CmdRegistry.cpp | 62 ++++++++ src/server/sparkd/cmds/CmdRegistry.h | 33 ++++ src/server/sparkd/cmds/Help.cpp | 31 ++++ src/server/sparkd/cmds/Help.h | 17 ++ src/server/sparkd/cmds/ICmd.h | 17 ++ src/server/sparkd/cmds/Run.cpp | 43 +++++ src/server/sparkd/cmds/Run.h | 17 ++ src/server/sparkd/cmds/Test.cpp | 20 +++ src/server/sparkd/cmds/Test.h | 17 ++ src/server/sparkd/cmds/TestOrderman.cpp | 150 ++++++++++++++++++ src/server/sparkd/cmds/TestOrderman.h | 17 ++ src/server/sparkd/event_grid/EventNode.h | 9 +- .../sparkd/jetfix/connection/AsyncReader.cpp | 14 +- .../sparkd/jetfix/connection/AsyncReader.h | 1 + .../sparkd/jetfix/gateway/CoreGateway.cpp | 1 + .../jetfix/tests/async_reader_tests.cpp | 4 +- src/server/sparkd/main.cpp | 66 +++----- .../orderman/components/NativeOrderMan.cpp | 2 + .../orderman/service/OrderServiceServer.cpp | 5 +- .../sparkd/testing/catch_test_runner.cpp | 11 +- src/server/sparkd/testing/catch_test_runner.h | 5 +- tools/build_and_run.sh | 2 +- 27 files changed, 491 insertions(+), 63 deletions(-) create mode 100755 src/server/sparkd/cmds/CmdRegistry.cpp create mode 100755 src/server/sparkd/cmds/CmdRegistry.h create mode 100755 src/server/sparkd/cmds/Help.cpp create mode 100755 src/server/sparkd/cmds/Help.h create mode 100755 src/server/sparkd/cmds/ICmd.h create mode 100644 src/server/sparkd/cmds/Run.cpp create mode 100644 src/server/sparkd/cmds/Run.h create mode 100755 src/server/sparkd/cmds/Test.cpp create mode 100755 src/server/sparkd/cmds/Test.h create mode 100644 src/server/sparkd/cmds/TestOrderman.cpp create mode 100644 src/server/sparkd/cmds/TestOrderman.h diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index bf6f2a0db..c5a0efc06 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -194,7 +194,7 @@ message CancelSpreaderOrder {} message CancelOrderRequest { uint32 order_key = 1; - google.protobuf.Timestamp transact_timestamp = 2; + google.protobuf.Timestamp timestamp = 2; oneof cancel { CancelNativeOrder native_order = 3; CancelSpreaderOrder spreader = 4; diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 00c4a304e..110741207 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -14,7 +14,7 @@ JetFIX { start_day: "sunday" end_day: "friday" sender_subid: "BTS" - raw_data: "T4CTS" + raw_data: "T4CST" } } } diff --git a/src/lib/os/os.cpp b/src/lib/os/os.cpp index 965a4e2b4..a664964e2 100755 --- a/src/lib/os/os.cpp +++ b/src/lib/os/os.cpp @@ -994,6 +994,9 @@ BTS_EXPORT void debug_break() DEBUG_BREAK(); } +BTS_EXPORT void set_thread_name(std::string const&n) +{set_thread_name(n.c_str());} + BTS_EXPORT void set_thread_name(const char* name) { #ifdef _WIN32 diff --git a/src/lib/os/os.h b/src/lib/os/os.h index 83850174c..c2500fd9e 100755 --- a/src/lib/os/os.h +++ b/src/lib/os/os.h @@ -74,6 +74,7 @@ BTS_EXPORT char* strncpy(char* dest, const char* src, size_t count); BTS_EXPORT void setenv(const char* name, const char* value); BTS_EXPORT void debug_break(); +BTS_EXPORT void set_thread_name(std::string const&); BTS_EXPORT void set_thread_name(const char* name); BTS_EXPORT bool is_nan(double d); diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 7822bc0a5..eced8cafd 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;event_grid/EventNode.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/store_tests.cpp;main.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file +set(sources ;cmds/CmdRegistry.cpp;cmds/Help.cpp;cmds/Run.cpp;cmds/Test.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.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/store_tests.cpp;main.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/CmdRegistry.cpp b/src/server/sparkd/cmds/CmdRegistry.cpp new file mode 100755 index 000000000..2d3f748dc --- /dev/null +++ b/src/server/sparkd/cmds/CmdRegistry.cpp @@ -0,0 +1,62 @@ +#include "CmdRegistry.h" + +#include "ICmd.h" + +#include +#include +#include +#include +#include + +namespace bts { +namespace cmd { + +std::map> CmdRegistry::_cmds; + +int CmdRegistry::dispatch (int argc, char **argv) +{ + if (argc < 2) + return _cmds["help"]->execute (std::vector ()); + else { + std::vector args; + for (int i = 1; i < argc; i++) { + std::string arg (argv[i]); + if (boost::starts_with(boost::to_lower_copy(arg),"-configserver")) { + // skip configserver flag as well as url + i++; + } + else + args.push_back (arg); + } + + ICmd *cmd = retrieve (std::string (args[0])); + if (cmd == 0) { + return _cmds["help"]->execute(std::vector()); + } + else { + args.erase (args.begin ()); + return cmd->execute (args); + } + } +} + +ICmd * CmdRegistry::retrieve (std::string const &name) +{ + std::string lname (name); + boost::to_lower (lname); + if (_cmds.find (lname) == _cmds.end ()) + return 0; + else + return _cmds[lname].get (); +} + +std::vector CmdRegistry::cmds () +{ + std::vector result; + for (auto&p : _cmds) + result.push_back (p.first); + return result; +} + +}} + diff --git a/src/server/sparkd/cmds/CmdRegistry.h b/src/server/sparkd/cmds/CmdRegistry.h new file mode 100755 index 000000000..bab3ea91c --- /dev/null +++ b/src/server/sparkd/cmds/CmdRegistry.h @@ -0,0 +1,33 @@ +#pragma once + +#include +#include +#include +#include +#include +#include "lib/utils/bts_assert.h" + +namespace bts { +namespace cmd { + +class ICmd; + +class CmdRegistry +{ +public: + template static void register_cmd (std::string const &name) + { + std::string lname = name; + boost::to_lower (lname); + bts_assert (_cmds.find (lname) == _cmds.end ()); + _cmds[lname].reset (new CMD ()); + } + static std::vector cmds (); + static int dispatch (int argc, char **argv) ; + static ICmd * retrieve (std::string const &name); + +private: + static std::map> _cmds; +}; + +}} diff --git a/src/server/sparkd/cmds/Help.cpp b/src/server/sparkd/cmds/Help.cpp new file mode 100755 index 000000000..4b79db82e --- /dev/null +++ b/src/server/sparkd/cmds/Help.cpp @@ -0,0 +1,31 @@ +#include "Help.h" +#include "server/sparkd/cmds/CmdRegistry.h" +#include + +namespace bts { +namespace cmd { + +int Help::execute(std::vector const &args) +{ + auto commands = CmdRegistry::cmds (); + if (args.size () != 1 || CmdRegistry::retrieve (args[0]) == 0) { + std::cerr << "Syntax: sparkd or sparkd help , where cmd is one of: " + << std::endl; + + for (auto &cmd : commands) + std::cerr << "\t" << cmd << std::endl; + return 0; + } else { + auto cmd = CmdRegistry::retrieve (args[0]); + std::cerr << "sparkd " << args[0] << ":" << std::endl << cmd->help () << std::endl; + return 0; + } +} + +std::string Help::help () +{ + return "Display help."; +} + +}} + diff --git a/src/server/sparkd/cmds/Help.h b/src/server/sparkd/cmds/Help.h new file mode 100755 index 000000000..73aa45fc4 --- /dev/null +++ b/src/server/sparkd/cmds/Help.h @@ -0,0 +1,17 @@ +#pragma once + +#include "ICmd.h" + +namespace bts { +namespace cmd { + +class Help : public ICmd +{ +public: + int execute(std::vector const &args); + std::string help (); +}; + +}} + + diff --git a/src/server/sparkd/cmds/ICmd.h b/src/server/sparkd/cmds/ICmd.h new file mode 100755 index 000000000..850b37116 --- /dev/null +++ b/src/server/sparkd/cmds/ICmd.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include + +namespace bts { +namespace cmd { + +class ICmd +{ +public: + virtual int execute(std::vector const &args) = 0; + virtual std::string help () = 0; + virtual ~ICmd (){} +}; + +}} diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp new file mode 100644 index 000000000..b4e985bd1 --- /dev/null +++ b/src/server/sparkd/cmds/Run.cpp @@ -0,0 +1,43 @@ +#include "Run.h" +#include "ICmd.h" + +#include "lib/config/config.h" +#include "lib/config/protos/quickbus_cfg.pb.h" +#include "lib/config/protos/Ports.pb.h" +#include "lib/quickbus/quickbus.h" +#include "lib/api/public/ServiceContext.h" + +#include "server/sparkd/persistence/PersistenceServiceServer.h" +#include "server/sparkd/user/UserServiceServer.h" +#include "server/sparkd/md/run_md.h" +#include "server/sparkd/orderman/service/OrderServiceServer.h" +#include "lib/md/relay/QueryServer.h" + +namespace bts { +namespace cmd { + +int Run::execute(std::vector const &) +{ + using namespace bts; + + config::QuickbusNodeCfg qb_cfg; + qb_cfg.set_my_port(config::get().qbus_port()); + qbus::Quickbus quickbus(qb_cfg); + api::ServiceContext sc(&quickbus); + + persistence::PersistenceServiceServer settings_saver(sc,"settings"); + user::UserServiceServer login_server(sc); + run_market_datapublishers(); + md::QueryServerPtr md_query_server(md::run_query_server(sc)); + orderman::OrderServiceServer order_server(sc); + + std::this_thread::sleep_until(std::chrono::time_point::max()); + return 0; +} + +std::string Run::help () {return "\t run default sparkd services";} + + +}} + + diff --git a/src/server/sparkd/cmds/Run.h b/src/server/sparkd/cmds/Run.h new file mode 100644 index 000000000..773fa29db --- /dev/null +++ b/src/server/sparkd/cmds/Run.h @@ -0,0 +1,17 @@ +#pragma once + +#include "ICmd.h" + +namespace bts { +namespace cmd { + +class Run : public ICmd +{ +public: + int execute(std::vector const &args); + std::string help (); +}; + +}} + + diff --git a/src/server/sparkd/cmds/Test.cpp b/src/server/sparkd/cmds/Test.cpp new file mode 100755 index 000000000..fda7a308e --- /dev/null +++ b/src/server/sparkd/cmds/Test.cpp @@ -0,0 +1,20 @@ +#include "Test.h" +#include "ICmd.h" +#include "server/sparkd/testing/catch_test_runner.h" + +namespace bts { +namespace cmd { + + +int Test::execute(std::vector const &args) +{ + return run_tests(args); +} + +std::string Test::help () +{return "\t see https://github.com/philsquared/Catch/blob/master/docs/command-line.md";} + + +}} + + diff --git a/src/server/sparkd/cmds/Test.h b/src/server/sparkd/cmds/Test.h new file mode 100755 index 000000000..15c4c0690 --- /dev/null +++ b/src/server/sparkd/cmds/Test.h @@ -0,0 +1,17 @@ +#pragma once + +#include "ICmd.h" + +namespace bts { +namespace cmd { + +class Test : public ICmd +{ +public: + int execute(std::vector const &args); + std::string help (); +}; + +}} + + diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp new file mode 100644 index 000000000..b24405d61 --- /dev/null +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -0,0 +1,150 @@ +#include "TestOrderman.h" +#include "ICmd.h" + +#include "server/sparkd/orderman/utils/orderman_utils.h" +#include "server/sparkd/orderman/persistence/gen_order_id.h" +#include "lib/api/services/OrderService.pb.h" +#include "server/sparkd/orderman/service/OrderServiceServer.h" +#include "lib/api/public/ServiceContext.h" +#include "lib/api/services/OrderService.client.pb.h" + +#include "lib/utils/datetime.h" +#include "lib/utils/PBUtils.h" + +#include "server/sparkd/event_grid/EventNode.h" +#include "server/sparkd/orderman/events/GatewayBeginReplay.h" +#include "server/sparkd/event_grid/events/Init.h" + + +#include +namespace bts { +namespace cmd { + +using namespace orderman; + +template +inline void print_buffer(const char*label,T const&array) +{ + const char * p = (const char*) &array; + + std::cout << label << ": " ; + for (size_t i = 0; i < sizeof(array); i++) { + std::cout << (int) p[i] << ","; + } + std::cout << "\n"; +} + + +api::orderman::CreateOrderRequest make_create_request(SecurityKey sec, api::BuySell side, Price price, Quantity quantity) +{ + api::orderman::CreateOrderRequest result; + *result.mutable_timestamp() = utils::pb::to_timestamp(datetime::now()); + auto &native = *result.mutable_native_order(); + native.set_account_name("BTS"); + native.set_operator_id("BTS"); + native.set_security_key(sec.value()); + native.set_side(side); + native.set_time_in_force(api::orderman::TIF_DAY); + native.set_order_type(api::orderman::OT_LIMIT); + native.set_customer_or_firm(api::orderman::COF_FIRM); + native.set_cti_code(api::orderman::CTI_CTI1); + native.set_manual_order_indicator(api::orderman::MOI_YES); + native.set_price(price.value()); + native.set_quantity(quantity.value()); + return result; +} + +api::orderman::UpdateOrderRequest make_update_request(OrderKey k, Price price, Quantity quantity) +{ + api::orderman::UpdateOrderRequest result; + result.set_order_key(k.value()); + *result.mutable_timestamp() = utils::pb::to_timestamp(datetime::now()); + + auto &native = *result.mutable_native_order(); + native.set_price(price.value()); + native.set_quantity(quantity.value()); + return result; +} + +api::orderman::CancelOrderRequest make_cancel_request(OrderKey k) +{ + api::orderman::CancelOrderRequest result; + result.set_order_key(k.value()); + *result.mutable_timestamp() = utils::pb::to_timestamp(datetime::now()); + result.mutable_native_order(); + return result; +} + +int TestOrderman::execute(std::vector const &) +{ + using Node = event_grid::EventNode ; + Node::Msg msg; + auto ev = event::GatewayBeginReplay { GatewayName ("hello") }; + print_buffer("ev",ev); + new (&msg.payload[0]) event::GatewayBeginReplay (ev); + print_buffer("pl",msg.payload); + auto ptr = *(event::GatewayBeginReplay*) (&msg.payload[0]); + print_buffer("*ptr",ptr); + std::cout << ptr.name.value() << "\n"; + return 0; + // OrderKey current_order (null_order_key()); + // api::ServiceContext ctx; + // OrderServiceServer server(ctx); + // api::orderman::OrderService client(ctx.locate ()); + + // while (true) { + // std::cout << "create order: c sec_key b/s price quantity\nupdate order: u price quantity\ncancel order: x\nchange current order: o order_key\n"; + // char choice; + // std::cin >> choice; + // switch (choice) { + // case 'c': { + // uint32_t sec_key;char side; double price; int quantity; + // std::cin >> sec_key >> side >> price >> quantity; + // auto resp = client.create_order(make_create_request(SecurityKey(sec_key), + // side == 'b' ? api::BUY : api::SELL, + // Price(price), + // Quantity(quantity))); + // if (resp.success()) { + // current_order = OrderKey(resp.result()->order_key()); + // std::cout << utils::pb::to_string(*resp.result()) << "\n"; + // } + // else + // std::cout << resp.error_message() << "\n"; + // break; + // } + // case 'u': { + // double price; int quantity; + // std::cin >> price >> quantity; + // auto resp = client.update_order(make_update_request(current_order, + // Price(price), + // Quantity(quantity))); + // if (resp.success()) + // std::cout << utils::pb::to_string(*resp.result()) << "\n"; + // else + // std::cout << resp.error_message() << "\n"; + // break; + // } + // case 'x': { + // auto resp = client.cancel_order(make_cancel_request(current_order)); + // if (resp.success()) + // std::cout << utils::pb::to_string(*resp.result()) << "\n"; + // else + // std::cout << resp.error_message() << "\n"; + // break; + // } + // case 'o': { + // std::cin >> current_order.value(); + // std::cout << "Current order: " << current_order.value() << "\n"; + // break; + // } + // } + // } +} + +std::string TestOrderman::help () +{return "\t run interactive order management client\n";} + + +}} + + diff --git a/src/server/sparkd/cmds/TestOrderman.h b/src/server/sparkd/cmds/TestOrderman.h new file mode 100644 index 000000000..221fb8021 --- /dev/null +++ b/src/server/sparkd/cmds/TestOrderman.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include +#include "server/sparkd/cmds/ICmd.h" + +namespace bts { +namespace cmd { + +class TestOrderman : public ICmd +{ +public: + int execute(std::vector const &args); + std::string help (); +}; + +}} diff --git a/src/server/sparkd/event_grid/EventNode.h b/src/server/sparkd/event_grid/EventNode.h index a54f13efe..04b66d00e 100644 --- a/src/server/sparkd/event_grid/EventNode.h +++ b/src/server/sparkd/event_grid/EventNode.h @@ -10,6 +10,7 @@ namespace bts { namespace event_grid { + template class EventRecord { @@ -36,6 +37,7 @@ private: std::array _observers; }; + template struct HandlerInit { static void init(HandlerArray &handlers,EventRecordTuple &event_records) @@ -52,7 +54,7 @@ struct HandlerInit<-1,HandlerArray,EventRecordTuple,Payload> { static void init(HandlerArray &,EventRecordTuple &) {} }; - + template @@ -70,7 +72,7 @@ public: _events() { HandlerInit::init (_handlers,_events); - send(event::Init()); + // send(event::Init()); } template @@ -106,7 +108,7 @@ public: template friend void forward(N1 &from, N2& to); -private: +public: struct Msg { uint8_t handler_idx; uint8_t forwarded; @@ -119,6 +121,7 @@ private: Msg m; m.handler_idx = meta::GetTypeIdxInTuple,EventRecordTuple>::value; m.forwarded = fwd; + new (&m.payload[0]) Event (ev); _queue.enqueue(m); } diff --git a/src/server/sparkd/jetfix/connection/AsyncReader.cpp b/src/server/sparkd/jetfix/connection/AsyncReader.cpp index f2b9fc03d..5b42403cb 100644 --- a/src/server/sparkd/jetfix/connection/AsyncReader.cpp +++ b/src/server/sparkd/jetfix/connection/AsyncReader.cpp @@ -5,6 +5,7 @@ #include "IConnection.h" #include "server/sparkd/jetfix/gateway/ICoreGatewayEventSink.h" #include "lib/utils/bts_assert.h" +#include "lib/os/os.h" #include @@ -66,6 +67,7 @@ size_t extract (char *start, char *end, struct AsyncReader::PImpl { PImpl(IConnection &connection, + std::string const&connection_name, ICoreGatewayEventSink &sink, size_t buffer_sz, size_t high_water_mark) @@ -76,7 +78,8 @@ struct AsyncReader::PImpl write_cursor (0), reader_thread (), sink (sink), - high_water_mark (high_water_mark) + high_water_mark (high_water_mark), + connection_name(connection_name) {} // abstraction for source of raw bytes @@ -95,17 +98,22 @@ struct AsyncReader::PImpl // a position in the current buffer that if reached signals the // need to increase the buffer size uint32_t high_water_mark; + const std::string connection_name; }; AsyncReader::AsyncReader (IConnection &connection, + std::string const&connection_name, ICoreGatewayEventSink &sink, size_t buffer_sz, size_t high_water_mark): - me (new PImpl(connection,sink,buffer_sz,high_water_mark)) + me (new PImpl(connection,connection_name,sink,buffer_sz,high_water_mark)) {} void AsyncReader::start () { - me->reader_thread = std::thread ([this] () {dispatch();}); + me->reader_thread = std::thread ([this] () { + os::set_thread_name(me->connection_name+"_asyncr"); + dispatch(); + }); } char* AsyncReader::cursor () diff --git a/src/server/sparkd/jetfix/connection/AsyncReader.h b/src/server/sparkd/jetfix/connection/AsyncReader.h index 8847791bb..85063d1c7 100644 --- a/src/server/sparkd/jetfix/connection/AsyncReader.h +++ b/src/server/sparkd/jetfix/connection/AsyncReader.h @@ -14,6 +14,7 @@ class AsyncReader { public: AsyncReader(IConnection &connection, + std::string const&connection_name, ICoreGatewayEventSink &sink, size_t buffer_sz, // initial buffer size to use size_t high_water_mark); // when do we allocate a new buffer diff --git a/src/server/sparkd/jetfix/gateway/CoreGateway.cpp b/src/server/sparkd/jetfix/gateway/CoreGateway.cpp index 2c7fd3074..fe30064b1 100644 --- a/src/server/sparkd/jetfix/gateway/CoreGateway.cpp +++ b/src/server/sparkd/jetfix/gateway/CoreGateway.cpp @@ -431,6 +431,7 @@ void CoreGateway::sync_time (EventData const &ev) *this, [] () {return utils::TimeStamp::now ();})); me->session_info->reader.reset (new AsyncReader (*me->session_info->connection, + me->cfg.name(), *this, me->cfg.msg_buffer_sz (), me->cfg.msg_high_water_mark ())); diff --git a/src/server/sparkd/jetfix/tests/async_reader_tests.cpp b/src/server/sparkd/jetfix/tests/async_reader_tests.cpp index e62c82cae..1651a67e1 100644 --- a/src/server/sparkd/jetfix/tests/async_reader_tests.cpp +++ b/src/server/sparkd/jetfix/tests/async_reader_tests.cpp @@ -127,7 +127,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,ob,10,5); + AsyncReader r (c,"test",ob,10,5); r.start (); } @@ -143,7 +143,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,ob,10,5); + AsyncReader r (c,"test",ob,10,5); r.start (); } REQUIRE (ob.got_eof); diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 52c88d273..64947d577 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -1,58 +1,30 @@ #include "lib/os/os.h" #include "lib/utils/init_spark_lib.h" -#include "testing/catch_test_runner.h" +#include "lib/os/os.h" +#include "server/sparkd/cmds/CmdRegistry.h" +#include "server/sparkd/cmds/Test.h" +#include "server/sparkd/cmds/Run.h" +#include "server/sparkd/cmds/Help.h" +#include "server/sparkd/cmds/TestOrderman.h" -#include "lib/config/config.h" -#include "lib/config/protos/quickbus_cfg.pb.h" -#include "lib/config/protos/Ports.pb.h" -#include "lib/quickbus/quickbus.h" -#include "lib/api/public/ServiceContext.h" - -#include "server/sparkd/persistence/PersistenceServiceServer.h" -#include "server/sparkd/user/UserServiceServer.h" -#include "server/sparkd/md/run_md.h" -#include "server/sparkd/orderman/service/OrderServiceServer.h" -#include "lib/md/relay/QueryServer.h" -#include "lib/api/services/OrderService.pb.h" - -#include "server/sparkd/orderman/events/ExecutionReport.h" - -namespace bts { -config::QuickbusNodeCfg make_cfg() -{ - config::QuickbusNodeCfg result; - result.set_my_port(config::get().qbus_port()); - return result; -} - -void start_services() -{ - qbus::Quickbus quickbus(make_cfg()); - api::ServiceContext sc(&quickbus); - - persistence::PersistenceServiceServer settings_saver(sc,"settings"); - user::UserServiceServer login_server(sc); - run_market_datapublishers(); - md::QueryServerPtr md_query_server(md::run_query_server(sc)); - orderman::OrderServiceServer order_server(sc); - - std::this_thread::sleep_until(std::chrono::time_point::max()); -} -} +#define BEGIN_CMD +#define REGISTER(CMD) bts::cmd::CmdRegistry::register_cmd (#CMD) +#define END_CMD return bts::cmd::CmdRegistry::dispatch (argc,argv) int main( int argc, char*argv [] ) { - using namespace bts; - os::set_thread_name("main"); + bts::os::set_thread_name("main"); + bts::utils::init_spark_lib(); - if (argc > 1 && std::string(argv[1]) == "test") - bts::run_tests(--argc, ++argv); - else { - utils::init_spark_lib(); - start_services(); - utils::finit_spark_lib(); - } + BEGIN_CMD; + REGISTER (Test); + REGISTER (Help); + REGISTER (Run); + REGISTER (TestOrderman); + END_CMD; + + bts::utils::finit_spark_lib(); return 0; } diff --git a/src/server/sparkd/orderman/components/NativeOrderMan.cpp b/src/server/sparkd/orderman/components/NativeOrderMan.cpp index d1f8d64d3..0ce2c68f4 100644 --- a/src/server/sparkd/orderman/components/NativeOrderMan.cpp +++ b/src/server/sparkd/orderman/components/NativeOrderMan.cpp @@ -178,6 +178,8 @@ void NativeOrderMan::on(event::GatewayStatusChange const&status) if (status.is_connected) { switch (me->state) { case State::REPLAY: + transition(State::CONNECTED); + break; case State::CONNECTED: bts_assert(false); break; diff --git a/src/server/sparkd/orderman/service/OrderServiceServer.cpp b/src/server/sparkd/orderman/service/OrderServiceServer.cpp index 0ed2106c6..97cec96e9 100644 --- a/src/server/sparkd/orderman/service/OrderServiceServer.cpp +++ b/src/server/sparkd/orderman/service/OrderServiceServer.cpp @@ -140,6 +140,7 @@ struct FastExecutor { void run () { worker = std::thread ([this] () { + os::set_thread_name("orderman_fast"); while (!done) { md.do_work(); gw.do_work(); @@ -193,6 +194,7 @@ struct SlowExecutor { void run () { worker = std::thread ([this] () { + os::set_thread_name("orderman_slow"); while (!done) { sec_db.do_work(); time_source.do_work(); @@ -251,6 +253,7 @@ OrderServiceServer::OrderServiceServer (bts::api::ServiceContext& ctx) event_grid::forward (me->fast.node,me->slow.node); me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); + me->publish_gateway_status = make_gateway_publisher(); me->fast.node.observe ([&ctx,this] (auto const&s) { ctx.post([this,s] () { this->on_gateway_status_change(s);}); }); @@ -259,7 +262,7 @@ OrderServiceServer::OrderServiceServer (bts::api::ServiceContext& ctx) ctx.post([this,f] () { this->on_fills(f); }); - }); + }); me->slow.node.observe ([&ctx,this] (auto const&os) { ctx.post([this,os] () { diff --git a/src/server/sparkd/testing/catch_test_runner.cpp b/src/server/sparkd/testing/catch_test_runner.cpp index 5c680f935..0344136b3 100644 --- a/src/server/sparkd/testing/catch_test_runner.cpp +++ b/src/server/sparkd/testing/catch_test_runner.cpp @@ -6,12 +6,14 @@ #include "lib/logging/logging.h" #include "lib/config/config.h" #include "lib/config/protos/logging.pb.h" +#include "lib/utils/bts_assert.h" namespace bts { -int run_tests (int argc, char **argv) +int run_tests (std::vector const&args) { + // these are necessary to work around an issue with the catch auto // registration // https://groups.google.com/forum/#!msg/catch-forum/FV0Qo62DvgY/jxEO6c9_q3kJ @@ -26,7 +28,12 @@ int run_tests (int argc, char **argv) cfg.mutable_console()->set_default_level("Fatal"); log::configure_logging(cfg); - int result = Catch::Session().run( argc, argv ); + bts_assert(args.size() < 100); + char const *argv[100]; + for (size_t i = 1; i < args.size();i++) + argv[i-1] = args[i].c_str(); + + int result = Catch::Session().run( args.size()-1, argv ); return ( result < 0xff ? result : 0xff ); } } diff --git a/src/server/sparkd/testing/catch_test_runner.h b/src/server/sparkd/testing/catch_test_runner.h index 5fc9d907a..745becb34 100644 --- a/src/server/sparkd/testing/catch_test_runner.h +++ b/src/server/sparkd/testing/catch_test_runner.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + namespace bts { -int run_tests (int argc, char **argv); +int run_tests (std::vector const&args); } diff --git a/tools/build_and_run.sh b/tools/build_and_run.sh index 4590d2eca..9393c9e37 100644 --- a/tools/build_and_run.sh +++ b/tools/build_and_run.sh @@ -17,4 +17,4 @@ fi # and ssh for diagnostics /usr/sbin/sshd # and sparkd -./src/server/sparkd/sparkd +./src/server/sparkd/sparkd run From a4e21f67f698a3626064df9cf8a266f27d2b5c73 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 30 Sep 2017 15:00:10 +0000 Subject: [PATCH 6/6] Merged --- .../core/GlobalExtensions/TaskExtensions.cs | 2 +- .../Synthetic2/SyntheticEditor2.xaml | 17 +++--- .../Synthetic2/SyntheticEditor2.xaml.cs | 29 ++++++++-- .../Synthetic2/SyntheticEditorDialog.xaml | 2 +- .../Securities/Synthetic2/VM/RowModel.cs | 12 ++-- .../Shell/Securities/Synthetic2/VM/RowVM.cs | 4 +- .../Synthetic2/VM/SyntheticEditorVM2.cs | 3 +- .../SecuritySelectorControl/SecurityItem.cs | 10 +--- .../SecuritySelectorControl.xaml.cs | 2 +- src/client/spark/view/Utility/EnumHelper.cs | 30 ++-------- .../api/Channels/QuickBusClientChannel.cs | 24 +++++++- .../spark_api/security/SecurityHelper.cs | 5 ++ .../spark_core/core/AnonymousDisposable.cs | 25 ++++++++- src/lib/domain_model/Security.proto | 6 ++ .../sparkd/risk_limits/RiskLimitManager.cpp | 5 +- .../sparkd/risk_limits/RiskLimitManager.h | 2 + src/server/sparkd/risk_limits/RiskLimiter.cpp | 5 ++ src/server/sparkd/risk_limits/RiskLimiter.h | 4 ++ .../sparkd/risk_limits/SharedRiskLimiter.h | 7 ++- .../risk_limits/tests/RiskLimitsTests.cpp | 55 ++++++++++++++----- 20 files changed, 172 insertions(+), 77 deletions(-) diff --git a/src/client/spark/core/GlobalExtensions/TaskExtensions.cs b/src/client/spark/core/GlobalExtensions/TaskExtensions.cs index 8a7b2e58f..33163970c 100644 --- a/src/client/spark/core/GlobalExtensions/TaskExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/TaskExtensions.cs @@ -47,7 +47,7 @@ namespace System.Threading.Tasks await Task.Delay(delay); if (!cts.IsCancellationRequested) action(); }); - return Disposable.Create(cts.Cancel); + return Disposable.Create((Action)cts.Cancel); } } } \ No newline at end of file diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml b/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml index 72236d992..a9d49b804 100644 --- a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml +++ b/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml @@ -5,6 +5,7 @@ xmlns:usp="clr-namespace:mbts.ui.spark"> + @@ -116,7 +117,7 @@ - + - - + + + - Name + Name - + Pricing + +