From 20ec9094b4f715e3bc338ad0163f6fc2f5ed9e3a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 19 Dec 2017 09:13:07 -0600 Subject: [PATCH 01/35] Contract Picker - removing static/fake CBOE exchange; using distinct list of exchanges actually present in MD --- .../spark/view/Spark/ContractPicker/ContractPickerModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs b/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs index 68ea2e68d..dcb428563 100644 --- a/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs +++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs @@ -173,7 +173,7 @@ namespace mbts.spark security_criteria_clause_changed?.Invoke(this, e); } - public List all_exchanges { get; } = new List { Venue.Glbx, Venue.Cboe };//UserSymbol.get_all().Select(x => x.exchange).Distinct().ToList(); + public List all_exchanges { get; } = UserSymbol.get_all().Select(x => x.exchange).Distinct().ToList(); public List selected_exchanges = new List(); public IEnumerable security_types { get; } = EnumHelper.get_values_except(SecurityType.Option, SecurityType.Stock, SecurityType.Unset); From d15d8a3db771ade116b289f80d6d83bb7b8e200d Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 19 Dec 2017 10:40:17 -0500 Subject: [PATCH 02/35] comment out ShowP&L menu --- src/client/spark/Modules/Trading/TradingShellModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index a8f56e25e..a3de778bd 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -41,7 +41,7 @@ namespace bts.shell { public IEnumerable actions => new [] { SparkCommands.ShowOrders, SparkCommands.PickFills, - SparkCommands.ShowPAndL, + //SparkCommands.ShowPAndL, SparkCommands.PickLadder, SparkCommands.PickOrderTicket }; From f4f9baa7b49d53baa119d5c7eeb0cc79b00ba94c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 27 Nov 2017 10:42:43 -0500 Subject: [PATCH 03/35] Revamping order management. --- src/client/spark_core/logging/Logger.cs | 1 + src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/OrderService2.proto | 229 +++++++++ src/lib/logging/logging.cpp | 1 + src/lib/logging/logging.h | 1 + src/lib/utils/Puid.cpp | 25 +- src/lib/utils/Puid.h | 6 +- src/lib/utils/Uuid.cpp | 9 - src/lib/utils/Uuid.h | 19 +- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Benchmark.cpp | 485 +++++++++++++++++- .../sparkd/orderman/doc/order_man_notes.org | 14 +- src/server/sparkd/orderman2/common/OrderKey.h | 10 + .../sparkd/orderman2/factory/OrderBuilder.cpp | 7 + .../sparkd/orderman2/factory/OrderBuilder.h | 28 + .../sparkd/orderman2/factory/OrderFactory.cpp | 7 + .../sparkd/orderman2/factory/OrderFactory.h | 31 ++ .../orderman2/mercury/AsyncEventBroker.cpp | 7 + .../orderman2/mercury/AsyncEventBroker.h | 270 ++++++++++ .../orderman2/mercury/CoreEventBroker.cpp | 437 ++++++++++++++++ .../orderman2/mercury/CoreEventBroker.h | 46 ++ .../sparkd/orderman2/mercury/FatWrapper.h | 161 ++++++ .../sparkd/orderman2/mercury/IEventBroker.cpp | 8 + .../sparkd/orderman2/mercury/IEventBroker.h | 29 ++ .../orderman2/mercury/ISynopsisBuilder.h | 19 + .../sparkd/orderman2/mercury/ITopic.cpp | 8 + src/server/sparkd/orderman2/mercury/ITopic.h | 21 + .../orderman2/mercury/SynopsisBuilder.cpp | 6 + .../orderman2/mercury/SynopsisBuilder.h | 17 + .../sparkd/orderman2/mercury/mercury_common.h | 34 ++ src/server/sparkd/orderman2/orders/Order.cpp | 70 +++ src/server/sparkd/orderman2/orders/Order.h | 50 ++ .../orderman2/tests/fat_wrapper_tests.cpp | 53 ++ tools/linux_control/rtags.sh | 4 + tools/setup_builds.sh | 16 +- 35 files changed, 2088 insertions(+), 45 deletions(-) create mode 100644 src/lib/api/services/OrderService2.proto create mode 100644 src/server/sparkd/orderman2/common/OrderKey.h create mode 100644 src/server/sparkd/orderman2/factory/OrderBuilder.cpp create mode 100644 src/server/sparkd/orderman2/factory/OrderBuilder.h create mode 100644 src/server/sparkd/orderman2/factory/OrderFactory.cpp create mode 100644 src/server/sparkd/orderman2/factory/OrderFactory.h create mode 100644 src/server/sparkd/orderman2/mercury/AsyncEventBroker.cpp create mode 100644 src/server/sparkd/orderman2/mercury/AsyncEventBroker.h create mode 100644 src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp create mode 100644 src/server/sparkd/orderman2/mercury/CoreEventBroker.h create mode 100644 src/server/sparkd/orderman2/mercury/FatWrapper.h create mode 100644 src/server/sparkd/orderman2/mercury/IEventBroker.cpp create mode 100644 src/server/sparkd/orderman2/mercury/IEventBroker.h create mode 100644 src/server/sparkd/orderman2/mercury/ISynopsisBuilder.h create mode 100644 src/server/sparkd/orderman2/mercury/ITopic.cpp create mode 100644 src/server/sparkd/orderman2/mercury/ITopic.h create mode 100644 src/server/sparkd/orderman2/mercury/SynopsisBuilder.cpp create mode 100644 src/server/sparkd/orderman2/mercury/SynopsisBuilder.h create mode 100644 src/server/sparkd/orderman2/mercury/mercury_common.h create mode 100644 src/server/sparkd/orderman2/orders/Order.cpp create mode 100644 src/server/sparkd/orderman2/orders/Order.h create mode 100644 src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp create mode 100644 tools/linux_control/rtags.sh diff --git a/src/client/spark_core/logging/Logger.cs b/src/client/spark_core/logging/Logger.cs index 8e3eafa33..ff92a9092 100644 --- a/src/client/spark_core/logging/Logger.cs +++ b/src/client/spark_core/logging/Logger.cs @@ -36,6 +36,7 @@ namespace bts.log { Ui, Persist, ExSim, + Mercury // Please keep this list in sync with logging.h/logging.cpp } } diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 61dc37fdd..af27ebc3c 100644 --- 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/AccountService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/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/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.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;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/download.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/AccountService.proto;api/services/ApiUnitTestService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OrderService2.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/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.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;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/download.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/OrderService2.proto b/src/lib/api/services/OrderService2.proto new file mode 100644 index 000000000..47d201ce6 --- /dev/null +++ b/src/lib/api/services/OrderService2.proto @@ -0,0 +1,229 @@ +syntax="proto3"; +package bts.api.orderman2; +option csharp_namespace="bts.api.orderman2"; + +import "lib/api/apioptions.proto"; +import "lib/domain_model/Security.proto"; +import "google/protobuf/timestamp.proto"; +import "lib/sparkproto/SparkProtos.proto"; + +service OrderService { + option (bts.api.service_description)="Implements order management"; + + // service calls + rpc create_order(Create) returns (Response); + rpc cancel_order(Update) returns (Response); + rpc update_order(Cancel) returns (Response); + rpc crack_order(Crack) returns (Response); + + // streams + rpc orders (OrdersSub) returns (stream OrderState); + rpc fills (FillsSub) returns (stream Fill); + rpc gateway_status (GatewayStatusSub) returns (stream GatewayStatusUpdate); +} + +// request types +message Create {OrderDef new_order = 1;} +message Update {uint32 order_key = 1; double price = 2; uint32 quantity = 3;} +message Cancel {uint32 order_key = 1;}; +message Crack {uint32 order_key = 1;}; + +// response types +message Response {uint32 order_key = 1; OrderError error_code = 2; string msg = 3;} + +// subscription types +message OrdersSub {} +message FillsSub {} +message GatewayStatusSub {} + +message OrderDef { + StdOrderParams std_params = 1; + CustomerOrderParams custom_params = 2; +} + + +message OrderState { + OrderDef definition = 1; + uint32 order_key = 2[(bts.api.key)=true]; + StdOrderState std_state = 3; + CustomOrderState custom_state = 4; +} + +// only native orders have fills +message Fill { + uint32 order_key = 1; + uint32 security_key = 2; + string account = 3; + double last_price = 4; + double avg_price = 9; + api.Side side = 5; + double last_shares = 6; + string fill_key = 7 [(bts.api.key)=true]; + 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 StdOrderState { + uint32 parent_order_key = 2; + google.protobuf.Timestamp timestamp = 3; + StdOrderStatus status = 4; + double price = 5; + uint32 quantity = 6; + uint32 filled_quantity=7; + double last_price = 8; + double avg_price = 9; + string last_msg = 10; +} + +message CustomOrderState { + oneof custom { + LimitOrderState limit = 1; + MarketOrderState market = 2; + StopMarketOrderState stop_market = 3; + StopLimitOrderState stop_limit = 4; + IcebergOrderState iceberg = 5; + SpreaderOrderState spreader = 6; + TimeBoxOrderState time_box = 7; + } +} + +message LimitOrderState {NativeOrderStatus native_status = 1;} +message MarketOrderState {NativeOrderStatus native_status = 1;} +message StopMarketOrderState {NativeOrderStatus native_status = 1;} +message StopLimitOrderState {NativeOrderStatus native_status = 1;} +message IcebergOrderState {} +message SpreaderOrderState {SpreaderChildKind child_kind = 1;} +message TimeBoxOrderState {} + +message StdOrderParams { + uint32 security_key = 1; + api.Side side = 2; + double price = 3; + uint32 quantity = 4; + string login = 5; + string account = 6; + TimeInForce time_in_force = 7; + ManualOrderIndicator manual_order_indicator = 8; + CTICode cti_code = 9; + google.protobuf.Timestamp timestamp = 10; +} + +message CustomerOrderParams { + oneof custom { + LimitOrderParams limit = 1; + MarketOrderParams market = 2; + StopMarketOrderParams stop_market = 3; + StopLimitOrderParams stop_limit = 4; + IcebergOrderParams iceberg = 5; + SpreaderOrderParams spreader = 6; + TimeBoxOrderParams time_box = 7; + } +} + +message LimitOrderParams {} +message MarketOrderParams {} +message StopMarketOrderParams {double stop_price = 1;} +message StopLimitOrderParams {double stop_price = 1;} +message IcebergOrderParams {double show_price = 1; CustomerOrderParams child = 2;} +message SpreaderOrderParams {api.Security security = 1; spark.ExecutionStrategy execution_strategy = 2;} +message TimeBoxOrderParams {google.protobuf.Timestamp start = 1; google.protobuf.Timestamp stop = 2;} + +enum StdOrderStatus { + // The order is has been constructed but not acted on. Inactive + // orders can be abandoned without consequences. The UI should + // ignore orders in this state. + STD_ORDER_STATUS_INACTIVE = 0; + // The order is currently working, i.e. its algorithm is operating. + STD_ORDER_STATUS_ACTIVE = 1; + // The order has completed successfully and accomplished its + // goal. This is a terminal state. + STD_ORDER_STATUS_COMPLETED = 2; + // The order was terminated orderly before it had a chance to + // complete. This is a terminal state. + STD_ORDER_STATUS_CANCELED = 3; + // The order has encountered an unexpected condition from which it + // cannot recover. This a terminal state. + STD_ORDER_STATUS_ERROR = 4; +} + +enum TimeInForce { + TIME_IN_FORCE_UNDEFINED = 0; + TIME_IN_FORCE_DAY = 4; + TIME_IN_FORCE_GTC = 49; + TIME_IN_FORCE_OPG = 50; + TIME_IN_FORCE_IOC = 51; +} + +enum ManualOrderIndicator { + MANUAL_ORDER_INDICATOR_NO = 0; + MANUAL_ORDER_INDICATOR_YES = 1; +} + +enum CustomerOrFirm { + CUSTOMER_OR_FIRM_CUSTOMER = 0; + CUSTOMER_OR_FIRM_FIRM = 1; +} + +enum CTICode { + CTI_CODE_UNDEFINED = 0; + CTI_CODE_CTI_CODE1 = 49; + CTI_CODE_CTI_CODE2 = 50; + CTI_CODE_CTI_CODE3 = 51; + CTI_CODE_CTI4 = 52; +} + +enum NativeOrderStatus +{ + NATIVE_ORDER_STATUS_NONE = 0; + NATIVE_ORDER_STATUS_UNACKNOWLEDGED = 1; + NATIVE_ORDER_STATUS_REJECTED_BY_SPARK = 2; + NATIVE_ORDER_STATUS_NEW = 48; + NATIVE_ORDER_STATUS_PARTIALLY_FILLED = 49; + NATIVE_ORDER_STATUS_FILLED = 50; + NATIVE_ORDER_STATUS_DONE = 51; + NATIVE_ORDER_STATUS_CANCELED = 52; + NATIVE_ORDER_STATUS_REPLACED = 53; + NATIVE_ORDER_STATUS_PENDING_CANCEL = 54; + NATIVE_ORDER_STATUS_STOPPED = 55; + NATIVE_ORDER_STATUS_REJECTED = 56; + NATIVE_ORDER_STATUS_SUSPENDED = 57; + NATIVE_ORDER_STATUS_PENDING_NEW = 65; + NATIVE_ORDER_STATUS_CALCULATED = 66; + NATIVE_ORDER_STATUS_EXPIRED = 67; + NATIVE_ORDER_STATUS_ACCEPTED_FOR_BIDDING = 68; + NATIVE_ORDER_STATUS_PENDING_REPLACE = 69; + NATIVE_ORDER_STATUS_CANCEL_ACK = 72; + NATIVE_ORDER_STATUS_UNDEFINED = 85; + NATIVE_ORDER_STATUS_ORDER_NOT_FOUND = 89; +} + +enum SpreaderChildKind { + SPREADER_CHILD_KIND_UNDEFINED = 0; + SPREADER_CHILD_KIND_SPREADER_HEDGING = 1; + SPREADER_CHILD_KIND_SPREADER_QUOTING = 2; +} + +enum GatewayStatus +{ + GATEWAY_STATUS_UNDEFINED = 0; + GATEWAY_STATUS_READY = 2; + GATEWAY_STATUS_NOT_READY = 3; +} + +enum OrderError +{ + ORDER_ERROR_UNDEFINED = 0; + ORDER_ERROR_UNSUPPORTED_ORDER_TYPE = 1; + ORDER_ERROR_GATEWAY_NOT_READY = 2; + ORDER_ERROR_UNKNOWN_ORDER = 5 ; + ORDER_ERROR_UNKNOWN_SECURITY = 6; + ORDER_ERROR_ORDER_NOT_ACK = 7; + ORDER_ERROR_SERVER_NOT_READY = 8; + ORDER_ERROR_OK = 9; +} diff --git a/src/lib/logging/logging.cpp b/src/lib/logging/logging.cpp index 4e392db29..13d0291b1 100644 --- a/src/lib/logging/logging.cpp +++ b/src/lib/logging/logging.cpp @@ -103,6 +103,7 @@ void configure_logging(bts::config::Logging const&cfg) {log::Ui,"UI"}, {log::Persist,"Persist"}, {log::ExSim,"ExSim"}, + {log::Mercury,"Mercury"}, }; real_cfg.sinks["console"] = diff --git a/src/lib/logging/logging.h b/src/lib/logging/logging.h index aaaf92fef..6e1d3fd4e 100644 --- a/src/lib/logging/logging.h +++ b/src/lib/logging/logging.h @@ -40,6 +40,7 @@ constexpr log::Subsystem Engine {Assert.ordinal+1 }; constexpr log::Subsystem Ui {Engine.ordinal+1 }; constexpr log::Subsystem Persist {Ui.ordinal+1 }; constexpr log::Subsystem ExSim {Persist.ordinal+1 }; +constexpr log::Subsystem Mercury {ExSim.ordinal+1 }; struct LoggerHandle { LoggerHandle(LoggerHandle const&) = delete; diff --git a/src/lib/utils/Puid.cpp b/src/lib/utils/Puid.cpp index dbc9b1274..2bb27e1a3 100644 --- a/src/lib/utils/Puid.cpp +++ b/src/lib/utils/Puid.cpp @@ -139,7 +139,7 @@ std::string &get_host_ip_string (std::string const &ip) return result; } -uint32_t reserve_ids (std::string const &scope, int n_ids) +uint64_t reserve_ids (std::string const &scope, int n_ids) { tbb::mutex::scoped_lock l (lock); @@ -188,7 +188,7 @@ uint32_t reserve_ids (std::string const &scope, int n_ids) copy_file (counter_path, tmp_file); // W3, W4 update temp file, close and flush - uint32_t counter_value; + uint64_t counter_value; std::ifstream (tmp_file.c_str ()) >> counter_value; std::ofstream (tmp_file.c_str ()) << counter_value + n_ids; @@ -206,21 +206,15 @@ uint32_t reserve_ids (std::string const &scope, int n_ids) } } -std::vector gen_ids (std::string const &scope, int n_ids) +std::vector gen_ids (std::string const &scope, int n_ids) { auto counter_value = reserve_ids (scope,n_ids); - std::vector result; + std::vector result; for (int i = 0; i < n_ids; i++) result.push_back (counter_value + i); return result; } -uint32_t gen_id (std::string const &scope) -{ - std::vector result = gen_ids (scope, 1); - return result[0]; -} - static char base_62_alphabet [] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f', 'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v', @@ -239,8 +233,7 @@ std::string to_base_62 (uint32_t src) return out; } -void to_base_62 (std::vector const &id_vec, - std::vector *out) +void to_base_62 (std::vector const &id_vec, std::vector *out) { for (auto src : id_vec) for (int i=5; i >= 0;i--) { @@ -250,10 +243,16 @@ void to_base_62 (std::vector const &id_vec, } } +uint64_t gen_id (std::string const &scope) +{ + std::vector result = gen_ids (scope, 1); + return result[0]; +} + std::vector gen_puids (std::string const &scope, int n_puids) { // first generate a series of unique uint32 numbers (For this machine) - std::vector ids = gen_ids (scope, n_puids); + std::vector ids = gen_ids (scope, n_puids); // now add the host ip and a timer string to the generated id to // guarantee uniqueness across machines diff --git a/src/lib/utils/Puid.h b/src/lib/utils/Puid.h index f14c0cdc4..f4e7a8538 100644 --- a/src/lib/utils/Puid.h +++ b/src/lib/utils/Puid.h @@ -24,13 +24,13 @@ BTS_EXPORT Puid gen_puid (std::string const &scope); // generate machine unique ids (no guarantees of uniqueness across // machines) -BTS_EXPORT std::vector gen_ids (std::string const &scope, int n_ids); +BTS_EXPORT std::vector gen_ids (std::string const &scope, int n_ids); // Similar to the above but instead of copying the ids to a vector // this simply the first free id (x) and skips ahead by n_ids so that the // next gen_id call will will be x+n_ids -BTS_EXPORT uint32_t reserve_ids (std::string const &scope, int n_ids); +BTS_EXPORT uint64_t reserve_ids (std::string const &scope, int n_ids); // generate a single id -BTS_EXPORT uint32_t gen_id (std::string const &scope); +BTS_EXPORT uint64_t gen_id (std::string const &scope); // convert a uint32 to a 6 byte human readeable string containing only // alpha numerical characters. diff --git a/src/lib/utils/Uuid.cpp b/src/lib/utils/Uuid.cpp index f1aacbe0a..786b9bf12 100755 --- a/src/lib/utils/Uuid.cpp +++ b/src/lib/utils/Uuid.cpp @@ -33,15 +33,6 @@ Uuid::Uuid () os::gen_uuid (_id); } -bool Uuid::operator==(Uuid const&rhs) const -{return memcmp (_id,rhs._id,BTS_ARRAYSIZE (_id)) == 0;} - -bool Uuid::operator!=(Uuid const&rhs) const -{return !operator==(rhs);} - -bool Uuid::operator<(Uuid const&rhs) const -{return std::lexicographical_compare (_id, _id + BTS_ARRAYSIZE (_id), rhs._id,rhs._id + BTS_ARRAYSIZE (rhs._id));} - std::string Uuid::to_byte_string () const { std::string publisher_id_string(BTS_ARRAYSIZE (_id),0); diff --git a/src/lib/utils/Uuid.h b/src/lib/utils/Uuid.h index 74c6293c2..d9949bdeb 100755 --- a/src/lib/utils/Uuid.h +++ b/src/lib/utils/Uuid.h @@ -1,8 +1,12 @@ #pragma once +#include "bts_array_size.h" +#include "bts_export.h" + #include #include -#include "bts_export.h" +#include +#include namespace bts { namespace utils { @@ -13,9 +17,16 @@ public: Uuid (std::string const &sid, bool is_byte_string); Uuid (); virtual ~Uuid (); - bool operator==(Uuid const&rhs) const; - bool operator!=(Uuid const&rhs) const; - bool operator<(Uuid const&rhs) const ; + + bool operator==(Uuid const&rhs) const + {return memcmp (_id,rhs._id,BTS_ARRAYSIZE (_id)) == 0;} + + bool operator!=(Uuid const&rhs) const + {return !operator==(rhs);} + + bool operator<(Uuid const&rhs) const + {return memcmp (_id,rhs._id,BTS_ARRAYSIZE (_id)) < 0;} + std::string to_byte_string () const; std::string to_text_string () const; friend BTS_EXPORT std::ostream &operator<<(std::ostream &stream,Uuid const&sid); diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 6b7d8c803..4bc3802bf 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.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;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/ITopic.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/orders/Order.cpp;orderman2/tests/fat_wrapper_tests.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/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckReturnStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 5624f5515..c805e8d33 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -5,10 +5,22 @@ #include "lib/utils/Puid.h" #include "server/sparkd/orderman/persistence/gen_order_id.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/utils/Uuid.h" +#include "server/sparkd/orderman2/mercury/FatWrapper.h" +#include "server/sparkd/orderman2/mercury/CoreEventBroker.h" #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace bts { namespace cmd { @@ -173,6 +185,7 @@ static void mutex_lock_unlock(benchmark::State &state) { BENCHMARK(mutex_lock_unlock); static void spin_lock_unlock(benchmark::State &state) { + int i = 0; std::atomic_flag _mutex = ATOMIC_FLAG_INIT; for (auto _ : state) { @@ -182,19 +195,481 @@ static void spin_lock_unlock(benchmark::State &state) { } } BENCHMARK(spin_lock_unlock); - + + +struct IntId { + IntId() + { + value = std::rand() ; + } + + bool operator<(IntId const&v) const {return value < v.value;} + uint32_t value; +}; + +static void binary_search_of_guid(benchmark::State &state) +{ + using Id = utils::Uuid; + using Map = boost::container::flat_map ; + auto sz = state.range(0); + Map m; + for (int i = 0; i < sz; i++) + m[Id()] = i; + + auto target = Id(); + + int found_count = 0; + for (auto _ : state) { + auto it = m.find(target); + if (it != m.end()) + found_count++; + benchmark::DoNotOptimize(found_count); + } +} +BENCHMARK(binary_search_of_guid)->Range(8,8<<10); + +static void binary_search_of_int64(benchmark::State &state) +{ + using Id = IntId; + using Map = boost::container::flat_map ; + auto sz = state.range(0); + Map m; + for (int i = 0; i < sz; i++) + m[Id()] = i; + + auto target = Id(); + + int found_count = 0; + for (auto _ : state) { + auto it = m.find(target); + if (it != m.end()) + found_count++; + benchmark::DoNotOptimize(found_count); + } +} +BENCHMARK(binary_search_of_int64)->Range(8,8<<10); + +static void guid_gen(benchmark::State &state) +{ + for (auto _ : state) { + benchmark::DoNotOptimize(utils::Uuid()); + } +} +BENCHMARK(guid_gen)->Range(8,8<<10); + +struct A { + int x; +}; + +static void shared_ptr_cpy(benchmark::State &state) +{ + auto a = std::make_shared(); + + for (auto _ : state) { + std::shared_ptr b; + benchmark::DoNotOptimize(b = a); + } +} +BENCHMARK(shared_ptr_cpy); + +static void alloc_free(benchmark::State &state) +{ + + for (auto _ : state) { + auto a = std::make_shared(); + benchmark::DoNotOptimize(a.get()); + } +} +BENCHMARK(alloc_free); + +static void new_delete(benchmark::State &state) +{ + + for (auto _ : state) { + auto a = new A(); + delete a; + benchmark::DoNotOptimize(a); + } +} +BENCHMARK(new_delete); + +static void boost_pool(benchmark::State &state) +{ + boost::pool<> p (sizeof(A)); + for (auto _ : state) { + auto a = p.malloc(); + p.free(a); + benchmark::DoNotOptimize(a); + } +} +BENCHMARK(boost_pool); + +static void boost_object_pool(benchmark::State &state) +{ + boost::object_pool p ; + for (auto _ : state) { + auto a = p.malloc(); + p.free(a); + benchmark::DoNotOptimize(a); + } +} +BENCHMARK(boost_object_pool); + +static void protected_boost_pool(benchmark::State &state) +{ + boost::pool<> p (sizeof(A)); + std::atomic_flag _mutex = ATOMIC_FLAG_INIT; + for (auto _ : state) { + while (_mutex.test_and_set(std::memory_order_acquire)); + auto a = p.malloc(); + _mutex.clear(std::memory_order_release); + while (_mutex.test_and_set(std::memory_order_acquire)); + p.free(a); + _mutex.clear(std::memory_order_release); + benchmark::DoNotOptimize(a); + } +} +BENCHMARK(protected_boost_pool); + +static void boost_singleton_pool(benchmark::State &state) +{ + using Pool = boost::singleton_pool; + for (auto _ : state) { + auto a = Pool::malloc(); + Pool::free(a); + benchmark::DoNotOptimize(a); + } +} +BENCHMARK(boost_singleton_pool); + +static void atomic_inc(benchmark::State &state) +{ + std::atomic i (0); + + for (auto _ : state) { + benchmark::DoNotOptimize(i++); + } +} +BENCHMARK(atomic_inc); + +static void mem_copy(benchmark::State &state) +{ + char* src = new char[state.range(0)]; + char* dst = new char[state.range(0)]; + memset(src, 'x', state.range(0)); + for (auto _ : state) + memcpy(dst, src, state.range(0)); + state.SetBytesProcessed(int64_t(state.iterations()) * + int64_t(state.range(0))); + delete[] src; + delete[] dst; +} +BENCHMARK(mem_copy)->Arg(8)->Arg(64)->Arg(128)->Arg(512)->Arg(1<<10)->Arg(8<<10); + +static void alloc_and_copy_from_pool(benchmark::State &state) +{ + boost::pool<> p (sizeof(A)); + + for (auto _ : state) { + auto a = new (p.malloc()) A(); + a->~A(); + p.free(a); + benchmark::DoNotOptimize(a); + } +} +BENCHMARK(alloc_and_copy_from_pool); + +static void lambda_copy(benchmark::State &state) +{ + auto p = std::make_shared(); + std::function f = [p] () {return 1;}; + + std::array,1> buffer; + for (auto _ : state) { + benchmark::DoNotOptimize(buffer[0] = f); + } +} +BENCHMARK(lambda_copy); + +static void boost_pool_allocator(benchmark::State &state) +{ + boost::fast_pool_allocator p; + for (auto _ : state) { + auto ptr = std::allocate_shared(p); + benchmark::DoNotOptimize(ptr.get()); + } +} +BENCHMARK(boost_pool_allocator); + int Benchmark::execute(std::vector const &args) { - bts_assert(args.size() < 100); - int argc = args.size(); + bts_assert(args.size() < 99); + int argc = args.size()+1; + char *argv[100]; - for (size_t i = 0; i < args.size(); i++) - argv[i] = (char *)args[i].c_str(); + argv[0] = (char*)"spark"; + for (size_t i = 0; i < args.size(); i++) + argv[i+1] = (char *)args[i].c_str(); benchmark::Initialize(&argc, argv); benchmark::RunSpecifiedBenchmarks(); return 0; } +struct Notify { + mercury::EventBrokerID id; + mercury::SubID suid; + mercury::StreamID sid; + mercury::FatWrapper<80> payload; +}; + +static void queue_notification(benchmark::State &state) +{ + std::array,1> queue; + for (auto _ : state) { + auto &n = queue[0].wrap_in_place (); + n.id = mercury::EventBrokerID(1); + n.suid = mercury::SubID(1); + n.sid = mercury::StreamID(1); + auto &a = n.payload.wrap_in_place (); + a.x = 1; + benchmark::DoNotOptimize(queue[0].empty()); + } +} +BENCHMARK(queue_notification); + + +static void queue_notification2(benchmark::State &state) +{ + std::array,2> queue; + auto &n = queue[0].wrap_in_place (); + n.id = mercury::EventBrokerID(1); + n.suid = mercury::SubID(1); + n.sid = mercury::StreamID(1); + auto &a = n.payload.wrap_in_place (); + a.x = 1; + for (auto _ : state) { + queue[1] = queue[0]; + benchmark::DoNotOptimize(queue[1].empty()); + } +} +BENCHMARK(queue_notification2); + +static void boost_lockless_queue(benchmark::State &state) +{ + using FreeList = boost::lockfree::queue; + FreeList queue; + for (auto _ : state) { + void *result; + queue.push(nullptr); + benchmark::DoNotOptimize(queue.pop(result)); + } + +} +BENCHMARK(boost_lockless_queue); + +static void moody_camel_queue(benchmark::State &state) +{ + using Q = moodycamel::ConcurrentQueue ; + Q queue; + for (auto _ : state) { + void *result; + queue.enqueue(nullptr); + benchmark::DoNotOptimize(queue.try_dequeue(result)); + } +} + +BENCHMARK(moody_camel_queue); + + +static void moody_camel_fat_push(benchmark::State &state) +{ + using Msg = mercury::FatWrapper<80> ; + using Q = moodycamel::ConcurrentQueue ; + Q queue; + + Msg fw; + auto &n = fw.wrap_in_place (); + n.id = mercury::EventBrokerID(1); + n.suid = mercury::SubID(1); + n.sid = mercury::StreamID(1); + auto &a = n.payload.wrap_in_place (); + a.x = 1; + + for (auto _ : state) { + queue.enqueue(fw); + Msg fw2; + benchmark::DoNotOptimize(queue.try_dequeue(fw2)); + } +} +BENCHMARK(moody_camel_fat_push); + +static void boost_lockless_stack(benchmark::State &state) +{ + using FreeList = boost::lockfree::stack; + FreeList stack; + for (auto _ : state) { + void *result; + stack.push(nullptr); + benchmark::DoNotOptimize(stack.pop(result)); + } + +} +BENCHMARK(boost_lockless_stack); + +using Msg = mercury::FatWrapper<80> ; +struct PPQueue +{ + std::atomic_flag _mutex = ATOMIC_FLAG_INIT; + std::vector v; + + void push(Msg*e) + { + while (_mutex.test_and_set(std::memory_order_acquire)); + v.push_back(e); + _mutex.clear(std::memory_order_release); + } + bool pop(Msg**e) + { + auto result = false; + while (_mutex.test_and_set(std::memory_order_acquire)); + if (v.size()) { + *e = v.back(); + v.pop_back(); + result = true; + } + _mutex.clear(std::memory_order_release); + return result; + } +}; + +static void moody_camel_slim_push(benchmark::State &state) +{ + using Q = moodycamel::ConcurrentQueue ; + Q queue; + PPQueue store; + store.v.reserve(10); + + Msg fw; + auto &n = fw.wrap_in_place (); + n.id = mercury::EventBrokerID(1); + n.suid = mercury::SubID(1); + n.sid = mercury::StreamID(1); + auto &a = n.payload.wrap_in_place (); + a.x = 1; + + store.push(&fw); + + for (auto _ : state) { + Msg *fw_ptr=nullptr; + store.pop(&fw_ptr); + auto &n = fw_ptr->wrap_in_place (); + n.id = mercury::EventBrokerID(1); + n.suid = mercury::SubID(1); + n.sid = mercury::StreamID(1); + auto &a = n.payload.wrap_in_place (); + a.x = 1; + queue.enqueue(fw_ptr); + queue.try_dequeue(fw_ptr); + store.push(fw_ptr); + benchmark::DoNotOptimize(fw_ptr); + } +} +BENCHMARK(moody_camel_slim_push); + +using EventBrokerID = uint32_t; +using StreamID = uint32_t; +using SubID = uint32_t; +using TopicPtr = std::shared_ptr; +using IEventBrokerPtr = TopicPtr; +using TopicFilter = std::function; +using InternalEventHandler = TopicFilter; +using InternalSubID = uint32_t; + +struct NeighbourAddition { + NeighbourAddition() : ptr() {} + IEventBrokerPtr ptr; +}; +struct NeighbourRemoval { + NeighbourRemoval () : id () {} + EventBrokerID id; +}; + +struct Advertisement { + Advertisement() : id(), sid(), topic() {} + EventBrokerID id; + StreamID sid; + TopicPtr topic; +}; + +struct Unadvertisement { + Unadvertisement() : id(), sid() {} + EventBrokerID id; + StreamID sid; +}; + +struct Subscription { + Subscription() : id(), suid(), sid() {} + EventBrokerID id; + SubID suid; + StreamID sid; +}; + +struct Unsubscription { + Unsubscription() : id(), suid(), sid() {} + EventBrokerID id; + SubID suid; + StreamID sid; +}; + +struct InternalSubscription { + InternalSubscription() : suid(), filter(), handler() {} + InternalSubID suid; + TopicFilter filter; + InternalEventHandler handler; +}; + +struct InternalUnsubscription { + InternalUnsubscription() : suid() {} + InternalSubID suid; +}; + +template +static void lambda_alloc_copy(benchmark::State &state) +{ + mercury::FatWrapper<128> fw; + using Action = std::function; + + T t; + for (auto _ : state) { + benchmark::DoNotOptimize(fw.wrap_in_place([t](){return sizeof(t);})); + } +} +BENCHMARK_TEMPLATE(lambda_alloc_copy,NeighbourAddition); +BENCHMARK_TEMPLATE(lambda_alloc_copy,NeighbourRemoval); +BENCHMARK_TEMPLATE(lambda_alloc_copy,Advertisement); +BENCHMARK_TEMPLATE(lambda_alloc_copy,Unadvertisement); +BENCHMARK_TEMPLATE(lambda_alloc_copy,Subscription); +BENCHMARK_TEMPLATE(lambda_alloc_copy,Unsubscription); +BENCHMARK_TEMPLATE(lambda_alloc_copy,InternalSubscription); +BENCHMARK_TEMPLATE(lambda_alloc_copy,InternalUnsubscription); + +template +static void simple_alloc_copy(benchmark::State &state) +{ + mercury::FatWrapper<128> fw; + for (auto _ : state) { + benchmark::DoNotOptimize(fw.wrap_in_place()); + } +} +BENCHMARK_TEMPLATE(simple_alloc_copy,NeighbourAddition); +BENCHMARK_TEMPLATE(simple_alloc_copy,NeighbourRemoval); +BENCHMARK_TEMPLATE(simple_alloc_copy,Advertisement); +BENCHMARK_TEMPLATE(simple_alloc_copy,Unadvertisement); +BENCHMARK_TEMPLATE(simple_alloc_copy,Subscription); +BENCHMARK_TEMPLATE(simple_alloc_copy,Unsubscription); +BENCHMARK_TEMPLATE(simple_alloc_copy,InternalSubscription); +BENCHMARK_TEMPLATE(simple_alloc_copy,InternalUnsubscription); + std::string Benchmark::help() { return "Run micro-benchmarks"; } } } diff --git a/src/server/sparkd/orderman/doc/order_man_notes.org b/src/server/sparkd/orderman/doc/order_man_notes.org index 82b4a21b9..d6115c159 100644 --- a/src/server/sparkd/orderman/doc/order_man_notes.org +++ b/src/server/sparkd/orderman/doc/order_man_notes.org @@ -318,7 +318,19 @@ CheckSum = 151 10=151 - less indirection in dispatch - consider passing lambdas around * Reference -10.96.25.29 +- 10.96.25.29 +| thing | cost | note | +|-------------------------+------+----------------------| +| lock/unlock | 8 | test_and_set | +| shared_ptr cpy | 14 | | +| binary_search_int64/8 | 7 | | +| binary_search_int64/512 | 13 | | +| mem_copy/8 | 5 | | +| mem_copy/64 | 5 | | +| mem_copy/512 | 14 | | +| new/delete | 58 | | +| boost pool new/delete | 2 | no synchronizatio | +| boost pool new/delete | 19 | with synchronization | * Notes on "A guide to spread trading futures" - Spread trading exploits correlations between securities and mean reversion diff --git a/src/server/sparkd/orderman2/common/OrderKey.h b/src/server/sparkd/orderman2/common/OrderKey.h new file mode 100644 index 000000000..16ee4b03e --- /dev/null +++ b/src/server/sparkd/orderman2/common/OrderKey.h @@ -0,0 +1,10 @@ +#pragma once + +#include "lib/utils/ValueWrapper.h" + +namespace bts { +namespace orderman2 { +using OrderKey = utils::ValueWrapper; +}} + + diff --git a/src/server/sparkd/orderman2/factory/OrderBuilder.cpp b/src/server/sparkd/orderman2/factory/OrderBuilder.cpp new file mode 100644 index 000000000..a8b637c2a --- /dev/null +++ b/src/server/sparkd/orderman2/factory/OrderBuilder.cpp @@ -0,0 +1,7 @@ +#include "OrderBuilder.h" + +namespace bts { +namespace orderman2 { + + +}} diff --git a/src/server/sparkd/orderman2/factory/OrderBuilder.h b/src/server/sparkd/orderman2/factory/OrderBuilder.h new file mode 100644 index 000000000..1751fc217 --- /dev/null +++ b/src/server/sparkd/orderman2/factory/OrderBuilder.h @@ -0,0 +1,28 @@ +#pragma once + +#include + +// fwds +namespace bts { +namespace api {namespace orderman2 {class OrderDef;}} +namespace orderman2 {class Order; class OrderFactory;} +} +// end fwds + +namespace bts { +namespace orderman2 { + +class OrderBuilder +{ +public: + OrderBuilder(); + Order& operator()(); + ~OrderBuilder(); +private: + friend class OrderFactory; + void do_work(); + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/factory/OrderFactory.cpp b/src/server/sparkd/orderman2/factory/OrderFactory.cpp new file mode 100644 index 000000000..6588366b7 --- /dev/null +++ b/src/server/sparkd/orderman2/factory/OrderFactory.cpp @@ -0,0 +1,7 @@ +#include "OrderFactory.h" + +namespace bts { +namespace orderman2 { + + +}} diff --git a/src/server/sparkd/orderman2/factory/OrderFactory.h b/src/server/sparkd/orderman2/factory/OrderFactory.h new file mode 100644 index 000000000..d3dfcf4e6 --- /dev/null +++ b/src/server/sparkd/orderman2/factory/OrderFactory.h @@ -0,0 +1,31 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/common/OrderKey.h" + +// fwds +namespace bts { +namespace api {namespace orderman2 {class OrderDef;}} +namespace orderman2 {class Order; class OrderBuilder;} +} +// end fwds + +namespace bts { +namespace orderman2 { + +// Builds orders based on their definition. Orders are automatically +// persisted and given a durable id. This class is safe for concurrent +// use. +class OrderFactory +{ +public: + OrderFactory(); + Order& make(api::orderman2::OrderDef const&def,OrderKey parent); + OrderBuilder& make_builder(api::orderman2::OrderDef const&def,OrderKey parent, size_t reserve_sz); + ~OrderFactory(); +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.cpp b/src/server/sparkd/orderman2/mercury/AsyncEventBroker.cpp new file mode 100644 index 000000000..139b1df66 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/AsyncEventBroker.cpp @@ -0,0 +1,7 @@ +#include "AsyncEventBroker.h" + +namespace bts { +namespace mercury { + +}} + diff --git a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h b/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h new file mode 100644 index 000000000..de9eab995 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h @@ -0,0 +1,270 @@ +#pragma once + +#include +#include +#include +#include +#include +#include + +#include "server/sparkd/orderman2/mercury/FatWrapper.h" +#include "server/sparkd/orderman2/mercury/CoreEventBroker.h" + +namespace bts { +namespace mercury { + +class AsyncEventBroker : public IEventBroker +{ + struct NeighbourAddition { + NeighbourAddition(const IEventBrokerPtr &src) : ptr(src) {} + IEventBrokerPtr ptr; + }; + + struct NeighbourRemoval { + NeighbourRemoval(EventBrokerID id) : id(id) {} + EventBrokerID id; + }; + + struct Advertisement { + Advertisement(EventBrokerID id, StreamID sid, TopicPtr topic) : + id(id),sid(sid),topic(topic) {} + EventBrokerID id; + StreamID sid; + TopicPtr topic; + }; + + struct Unadvertisement { + Unadvertisement(EventBrokerID id, StreamID sid) : + id(id),sid(sid){} + EventBrokerID id; + StreamID sid; + }; + + struct Subscription { + Subscription(EventBrokerID id, SubID suid,StreamID sid) : + id(id),suid(suid),sid(sid){} + EventBrokerID id; + SubID suid; + StreamID sid; + }; + + struct Unsubscription { + Unsubscription(EventBrokerID id, SubID suid,StreamID sid) : + id(id),suid(suid),sid(sid){} + EventBrokerID id; + SubID suid; + StreamID sid; + }; + + struct Notification { + Notification(EventBrokerID id, StreamID sid,SubID suid, + EventPayload const&payload) : + id(id),sid(sid),suid(suid),payload(payload) + {} + EventBrokerID id; + StreamID sid; + SubID suid; + EventPayload payload; + }; + + struct InternalNotification { + InternalNotification(StreamID sid) : sid(sid), payload() {} + StreamID sid; + EventPayload payload; + }; + + struct InternalSubscription { + InternalSubscription(InternalSubID suid, + TopicFilter const &filter, + InternalEventHandler const &handler) : + suid(suid), + filter(filter), + handler(handler) + {} + InternalSubID suid; + TopicFilter filter; + InternalEventHandler handler; + }; + + struct InternalUnsubscription { + InternalUnsubscription(InternalSubID suid) : + suid(suid) {} + InternalSubID suid; + }; + +public: + AsyncEventBroker () : _core_broker(), _queue(), + _internal_pool(), _external_pool(), + _external_pool_mtx(), + _current_suid(0) + {} + + // ieventbroker methods, can be called from multiple threads + EventBrokerID id() const override + {return _core_broker.id();} + + void add_neighbour(IEventBrokerPtr const &n) override + {post_external_msg (on_neighbour_addition,n);} + + void remove_neighbour(EventBrokerID n) override + {post_external_msg (on_neighbour_removal,n);} + + void advertise(EventBrokerID eid,StreamID sid,TopicPtr const&t) override + {post_external_msg(on_advertisement,eid,sid,t);} + + void unadvertise(EventBrokerID eid,StreamID sid) override + {post_external_msg(on_unadvertisement,eid,sid);} + + void subscribe(EventBrokerID eid,SubID suid,StreamID sid) override + {post_external_msg (on_subscription,eid,suid,sid);} + + void unsubscribe(EventBrokerID eid,SubID suid,StreamID sid) override + {post_external_msg (on_unsubscription,eid,suid,sid);} + + void notify(EventBrokerID eid,StreamID sid,SubID suid,EventPayload const&payload) override + {post_external_msg(on_notification,eid,sid,suid,payload);} + // End IEventBrokerPtr + +// Internal API, i.e. API intended for use by a single thread, the +// same thread calling do_work. + template + void internal_notify(StreamID sid, Args&&... args) + { + auto msg = _internal_pool.construct(); + msg->is_external = false; + msg->handle_msg = on_internal_notification; + auto &n = msg->wrapper.wrap_in_place (sid); + n.payload.wrap_in_place(std::forward(args)...); + _queue.enqueue(msg); + } + + InternalSubID internal_subscribe(TopicFilter const&f,InternalEventHandler const&cb) + { + _current_suid = InternalSubID(_current_suid.value()+1); + post_internal_msg (on_internal_subscription,_current_suid,f,cb); + return _current_suid; + } + + void internal_unsubscribe(InternalSubID suid) + { + post_internal_msg (on_internal_unsubscription,suid); + } + + void do_work() + { + BrokerMsg *m; + if (_queue.try_dequeue(m)) { + m->handle_msg(this,m); + free_msg(m); + } + } + + +private: + struct BrokerMsg { + FatWrapper<127-8-4> wrapper; + void (*handle_msg) (AsyncEventBroker*self,BrokerMsg*m); + bool is_external; + }; + using MsgHandler = void(AsyncEventBroker*,BrokerMsg*); + + using Pool = boost::object_pool; + using Queue = moodycamel::ConcurrentQueue ; + using DispatchMap = boost::container::flat_map>; + CoreEventBroker _core_broker; + Queue _queue; + Pool _internal_pool; + Pool _external_pool; + std::atomic_flag _external_pool_mtx = ATOMIC_FLAG_INIT; + DispatchMap _dispatch_map; + InternalSubID _current_suid; + + void free_msg(BrokerMsg *m) { + m->wrapper.clear(); + if (m->is_external) { + while (_external_pool_mtx.test_and_set(std::memory_order_acquire)); + _external_pool.destroy(m); + _external_pool_mtx.clear(std::memory_order_release); + } + else + _internal_pool.destroy(m); + } + + template + void post_external_msg(MsgHandler handler, Args&&... args) { + + while (_external_pool_mtx.test_and_set(std::memory_order_acquire)); + auto msg = _external_pool.construct(); + _external_pool_mtx.clear(std::memory_order_release); + + msg->is_external = true; + msg->handle_msg = handler; + msg->wrapper.wrap_in_place (std::forward(args)...); + _queue.enqueue(msg); + } + + template + void post_internal_msg(MsgHandler handler, Args&&... args) { + auto msg = _internal_pool.construct(); + msg->handle_msg = handler; + msg->is_external = false; + msg->wrapper.wrap_in_place (std::forward(args)...); + _queue.enqueue(msg); + } + + static void on_neighbour_addition(AsyncEventBroker *self,BrokerMsg *m) + {self->_core_broker.add_neighbour(m->wrapper.unwrap().ptr);} + + static void on_neighbour_removal(AsyncEventBroker *self,BrokerMsg *m) + {self->_core_broker.remove_neighbour(m->wrapper.unwrap().id);} + + static void on_advertisement(AsyncEventBroker *self,BrokerMsg *m) + { + auto const&adv = m->wrapper.unwrap(); + self->_core_broker.advertise(adv.id,adv.sid,adv.topic); + } + + static void on_unadvertisement(AsyncEventBroker *self,BrokerMsg *m) + { + auto const&uadv = m->wrapper.unwrap(); + self->_core_broker.unadvertise(uadv.id,uadv.sid); + } + + static void on_subscription(AsyncEventBroker *self,BrokerMsg *m) + { + auto const&sub = m->wrapper.unwrap(); + self->_core_broker.subscribe(sub.id,sub.suid,sub.sid); + } + + static void on_unsubscription(AsyncEventBroker *self,BrokerMsg *m) + { + auto const&usub = m->wrapper.unwrap(); + self->_core_broker.unsubscribe(usub.id,usub.suid,usub.sid); + } + + static void on_notification(AsyncEventBroker *self,BrokerMsg *m) + { + auto const¬ify = m->wrapper.unwrap(); + self->_core_broker.notify(notify.id,notify.sid,notify.suid,notify.payload); + } + + static void on_internal_notification(AsyncEventBroker *self,BrokerMsg *m) + { + auto const&inotify = m->wrapper.unwrap(); + self->_core_broker.notify(self->_core_broker.id(),inotify.sid,SubID(0),inotify.payload); + } + + static void on_internal_subscription(AsyncEventBroker *self,BrokerMsg *m) + { + auto const&isub = m->wrapper.unwrap(); + self->_core_broker.internal_subscribe(isub.suid,isub.filter,isub.handler); + } + + static void on_internal_unsubscription(AsyncEventBroker *self,BrokerMsg *m) + { + auto const&iunsub = m->wrapper.unwrap(); + self->_core_broker.internal_unsubscribe(iunsub.suid); + } +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp new file mode 100644 index 000000000..7338f873d --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp @@ -0,0 +1,437 @@ +#include "CoreEventBroker.h" + +#include "lib/utils/Puid.h" +#include "lib/utils/bts_assert.h" +#include "server/sparkd/orderman2/mercury/SynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/ITopic.h" + +#include +#include + +namespace bts { +namespace mercury { + +template using Map = boost::container::flat_map; + +struct CoreEventBroker::NoReenter { + NoReenter(bool &inside) : inside(inside) + { + bts_assert(!inside); + inside = true; + } + ~NoReenter() {inside = false;} + bool &inside; +}; + + +struct CoreEventBroker::InternalSubFilter { + TopicFilter matches; + InternalEventHandler handler; +}; + +struct CoreEventBroker::StreamRec +{ + StreamRec(CoreEventBroker &owner, + IEventBrokerPtr const&src, + StreamID sid, + TopicPtr const &topic) : + owner(owner), + src(src), + sid(sid), + topic(topic), + internal_subs(), + external_subs(), + sub_id(), + synopsis_builder(topic->make_synopsis_builder()) + {} + + ~StreamRec() + { + for(auto &isub : internal_subs) + isub.on_event(sid,EventType::END_STREAM,nullptr); + } + + struct InternalSubRec { + InternalSubID sub_id; + InternalEventHandler on_event; + }; + + struct SubRec { + SubID sub_id; + IEventBrokerPtr neighbour; + }; + + CoreEventBroker &owner; + const IEventBrokerPtr src; + const StreamID sid; + const TopicPtr topic; + + std::vector internal_subs; + std::vector external_subs; + + SubID sub_id; + SynopsisBuilderPtr synopsis_builder; + + bool is_local() const {return owner.id() == src->id();} + bool is_active() const {return is_local() || internal_subs.size() || external_subs.size();} + EventPayload * get_synopsis() {return synopsis_builder->get_synopsis();} + + void add_external_sub(IEventBrokerPtr const&node,SubID subid) + { + auto sender = node->id(); + bts_assert(std::find_if(external_subs.begin(), external_subs.end(), + [sender] (auto const &sub_rec) {return sub_rec.neighbour->id() == sender;}) == + external_subs.end()); + + // record wheter we are already active for this stream + auto was_active = is_active(); + + // add subscriber to collection + external_subs.push_back (SubRec {subid,node}); + + // trigger a subscription if appropriate + if (!was_active) + forward_sub(); + else { + // we were already active so if we have a synopsis forward it + auto synopsis = synopsis_builder->get_synopsis(); + if (synopsis) { + LOG(Mercury,Diag, "{} sending synopsis for sid: {} to nid: {} (sub_id:{})", + owner.id().value() , sid.value(),sender.value(), subid.value()); + src->notify(owner.id(), sid, subid, *synopsis); + } + } + } + + void remove_external_sub(EventBrokerID sender,SubID subid) + { + auto it = std::find_if(external_subs.begin(), external_subs.end(), + [sender] (auto const &sub_rec) {return sub_rec.neighbour->id() == sender;}); + bts_assert( it != external_subs.end()); + bts_assert( it->sub_id == subid); + external_subs.erase(it); + if (!is_active()) + forward_unsub(); + } + + void add_internal_sub(InternalEventHandler const&handler,InternalSubID sub_id) + { + auto it = std::find_if (internal_subs.begin(), internal_subs.end(), + [sub_id] (auto &sub) {return sub.sub_id == sub_id;}); + bts_assert (it == internal_subs.end()); + auto was_active = is_active(); + internal_subs.push_back( InternalSubRec {sub_id, handler}); + handler(sid,EventType::BEGIN_STREAM,get_synopsis()); + if (!was_active) + forward_sub(); + } + + void remove_internal_sub(InternalSubID sub_id) + { + auto it = std::find_if (internal_subs.begin(), internal_subs.end(), + [sub_id] (auto &sub) {return sub.sub_id == sub_id;}); + bts_assert (it != internal_subs.end()); + it->on_event(sid,EventType::END_SUB,nullptr); + internal_subs.erase(it); + if (!is_active()) + forward_unsub(); + } + + void notify(EventPayload const&payload) + { + // notify local subs + for (auto &isub : internal_subs) + isub.on_event(sid,EventType::NEW_EVENT,&payload); + + // fwd to remote subs + for (auto &esub : external_subs) + esub.neighbour->notify(owner.id(),sid, esub.sub_id,payload); + + // update synopsis + synopsis_builder->update(payload); + } + + void forward_sub() + { + bts_assert(!is_local()); + bts_assert(internal_subs.size() || external_subs.size()); + + sub_id = owner.gen_external_sub_id(); + + LOG(Mercury,Diag, + "{} issuing subscription for sid: {} to nid: {} (sub_id:{})", + owner.id().value(), + sid.value() , + src->id().value(), + sub_id.value()); + + src->subscribe(owner.id(),sub_id,sid); + synopsis_builder.reset(); + } + + void forward_unsub() + { + bts_assert(!is_local()); + bts_assert(internal_subs.empty() && external_subs.empty()); + LOG(Mercury,Diag, + "{} canceling subscription for {} from {} (sub_id: {})", + owner.id().value(), + sid.value(), + src->id().value(), + sub_id.value()); + src->unsubscribe(owner.id(),sub_id,sid); + } +}; + +struct CoreEventBroker::PImpl +{ + PImpl() + : streams(), + neighbours(), + internal_sub_filters(), + my_id(utils::gen_id("event_broker")), + last_external_sub_id(), + inside(false) + {} + + Map> streams; + Map neighbours; + Map internal_sub_filters; + EventBrokerID my_id; + SubID last_external_sub_id; + bool inside; +}; + +CoreEventBroker::CoreEventBroker () : me (new PImpl()) {} +CoreEventBroker::~CoreEventBroker () {} + +EventBrokerID CoreEventBroker::id() const {return me->my_id;} + +void CoreEventBroker::add_neighbour(IEventBrokerPtr const &neighbour) +{ + LOG(Mercury,Diag,"{} add_neighbour: {}",me->my_id.value(), neighbour->id().value()); + NoReenter nr(me->inside); + + auto &n = me->neighbours[neighbour->id()]; + bts_assert(!n); + n = neighbour; + + for (auto const &s : me->streams) + n->advertise(me->my_id,s.first,s.second->topic); +} + +void CoreEventBroker::remove_neighbour(EventBrokerID removed_neighbour_id) +{ + LOG(Mercury,Diag,"{} remove_neighbour nid: {} ", id().value() ,removed_neighbour_id.value()); + NoReenter nr(me->inside); + + auto &n_rec = me->neighbours[removed_neighbour_id]; + bts_assert(n_rec); + +// collect removed neigbhours's streams and subscriptions + std::vector its_streams; + std::vector> its_subscriptions; + for (auto &kvp : me->streams) { + auto &sid = kvp.first; + auto &sr = kvp.second; + + // does the removed neighbour own this table? + if (sr->src->id() == removed_neighbour_id) + its_streams.push_back(sid); + else + // the removed node does not own this table, but it might be + // subscribed to it. + for (auto &s : sr->external_subs) + if (s.neighbour->id() == removed_neighbour_id) { + its_subscriptions.push_back(std::make_pair(sr->sub_id,sid)); + break; + } + } + + // unadvertise orphan streams + for (auto &sid : its_streams) { + LOG(Mercury,Diag,"{} sending unadvertisement for stream owned by dead node: {} sid: {}", + id().value() , removed_neighbour_id.value() , sid.value()); + _unadvertise(removed_neighbour_id,sid); + } + +// cancel the orphan subscriptions + for (auto &p : its_subscriptions) { + auto sub_id = p.first; + auto sid = p.second; + LOG(Mercury,Diag, "{} canceling subscription for stream requested by dead node: {} sid: {} (sub_id:{})", + id().value(), removed_neighbour_id.value() , sid.value(),sub_id.value()); + _unsubscribe(removed_neighbour_id,sub_id,sid); + } + +// finally remove the node from our index + me->neighbours.erase(removed_neighbour_id); +} + +void CoreEventBroker::advertise(EventBrokerID sender,StreamID sid, TopicPtr const&topic) +{ + LOG(Mercury,Diag, "{} received advertisement from nid: {} sid: {} topic: {}", + id().value() , sender.value() , sid.value() ,topic->to_str()); + NoReenter nr(me->inside); + + auto const&node = me->neighbours[sender]; + bts_assert(node); + + // create an entry for this stream + auto &srec = me->streams[sid]; + bts_assert (!srec); + srec = std::make_unique (*this,node,sid,topic); + + // forward to neighbours + for (auto &kvp : me->neighbours) + if (kvp.first != sender) { + LOG(Mercury,Diag, + "{} forwarding advertisement for stream {} owned by nid: {} to: {} sid: {} ", + id().value() , + topic->to_str(), + sender.value () , + kvp.first.value() , + sid.value()); + kvp.second->advertise(me->my_id,sid,topic); + } + + // match to existing internal subscriptions + for (auto const&kvp : me->internal_sub_filters) { + auto internal_sub_id = kvp.first; + auto const &f = kvp.second; + if (f.matches(*topic)) + srec->add_internal_sub(f.handler,internal_sub_id); + } +} + + +void CoreEventBroker::unadvertise(EventBrokerID sender,StreamID sid) +{ + LOG(Mercury,Diag, "{} received unadvertisement from nid: {} sid: {}", + id().value() , sender.value() , sid.value()); + NoReenter nr(me->inside); + _unadvertise(sender,sid); +} + +void CoreEventBroker::notify(EventBrokerID sender,StreamID sid,SubID ex_subid,EventPayload const&payload) +{ + LOG(Mercury,Diag, "{} received notify from nid: {} sid: {} sub_id:{}", + id().value() , sender.value() , sid.value(),ex_subid.value() ); + NoReenter nr(me->inside); + + auto &srec = me->streams[sid]; + bts_assert(srec); + bts_assert(srec->src->id() == sender); + if (srec->is_local() || srec->sub_id == ex_subid) + srec->notify(payload); +} + +void CoreEventBroker::subscribe(EventBrokerID sender,SubID ex_subid,StreamID sid) +{ + LOG(Mercury,Diag, "{} received subscribe from nid: {} sid: {} sub_id:{}", + id().value() , sender.value() , sid.value(),ex_subid.value() ); + NoReenter nr(me->inside); + + bts_assert(sender != id()); + auto &node = me->neighbours[sender]; + bts_assert(node); + + auto it = me->streams.find(sid); + if (it != me->streams.end()) + it->second->add_external_sub(node,ex_subid); + else + LOG(Mercury,Diag, "{} received external subscribe for dead stream {}. ignoring", id().value() , sid.value()); +} + +void CoreEventBroker::unsubscribe(EventBrokerID sender,SubID ex_subid,StreamID sid) +{ + LOG(Mercury,Diag, "{} received unsubscribe from nid: {} sid: {} sub_id:{}", + id().value() , sender.value() , sid.value(),ex_subid.value() ); + NoReenter nr(me->inside); + _unsubscribe (sender,ex_subid,sid); +} + +void CoreEventBroker::internal_subscribe(InternalSubID in_subid,TopicFilter const&f,InternalEventHandler const&cb) +{ + LOG(Mercury,Diag, "{} received internal_subscribe (sub_id: {})", + id().value() , in_subid.value()); + NoReenter nr(me->inside); + + // no duplicates + bts_assert(me->internal_sub_filters.find(in_subid) == me->internal_sub_filters.end()); + + // add to internal sub list + auto &sf = me->internal_sub_filters[in_subid]; + sf.matches = f; + sf.handler = cb; + + // cross check new sub with all known streams, and trigger sub/synopsis update if appropriate + for (auto &kvp : me->streams) { + auto &srec = kvp.second; + if (sf.matches(*srec->topic)) + srec->add_internal_sub(cb,in_subid); + } +} + +void CoreEventBroker::internal_unsubscribe(InternalSubID in_subid) +{ + LOG(Mercury,Diag, "{} received internal_unsubscribe (sub_id: {})", + id().value() , in_subid.value()); + NoReenter nr(me->inside); + + // must be a previously entered sub + auto it = me->internal_sub_filters.find(in_subid); + bts_assert( it != me->internal_sub_filters.end()); + auto &matches = it->second.matches; + + // for each stream that matched this filter remove the corresponding internal sub + for (auto &kvp : me->streams) { + auto &srec = kvp.second; + if (matches(*srec->topic)) + srec->remove_internal_sub(in_subid); + } +} + +SubID CoreEventBroker::gen_external_sub_id() +{ + me->last_external_sub_id = SubID(me->last_external_sub_id.value()+1); + return me->last_external_sub_id; +} + +void CoreEventBroker::_unadvertise(EventBrokerID sender,StreamID sid) +{ + auto it = me->streams.find(sid); + bts_assert (it != me->streams.end()); + + auto &srec = it->second; + bts_assert(sender == srec->src->id()); + + auto topic_str = srec->topic->to_str(); + + // remove from our index + me->streams.erase(it); + + for (auto &kvp : me->neighbours) + if (kvp.first != sender) { + LOG(Mercury,Diag, + "{} forwarding unadvertisement for stream {} owned by nid: {} to: {} sid: {}", + id().value() , + topic_str, + sender.value () , + kvp.first.value() , + sid.value()); + kvp.second->unadvertise(me->my_id,sid); + } +} + +void CoreEventBroker::_unsubscribe (EventBrokerID sender,SubID sub_id,StreamID sid) +{ + auto it = me->streams.find(sid); + if (it != me->streams.end()) { + auto &srec = it->second; + srec->remove_external_sub(sender,sub_id); + } +} + +}} + diff --git a/src/server/sparkd/orderman2/mercury/CoreEventBroker.h b/src/server/sparkd/orderman2/mercury/CoreEventBroker.h new file mode 100644 index 000000000..3686bb762 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/CoreEventBroker.h @@ -0,0 +1,46 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/IEventBroker.h" + +namespace bts { +namespace mercury { + +class CoreEventBroker : public IEventBroker +{ +public: + CoreEventBroker(); + ~CoreEventBroker(); + + EventBrokerID id() const override; + + void add_neighbour(IEventBrokerPtr const &) override; + void remove_neighbour(EventBrokerID) override; + + void advertise(EventBrokerID,StreamID,TopicPtr const&) override; + void unadvertise(EventBrokerID,StreamID) override; + + void subscribe(EventBrokerID,SubID,StreamID) override; + void unsubscribe(EventBrokerID,SubID,StreamID) override; + + void notify(EventBrokerID,StreamID,SubID,EventPayload const&) override; + + void internal_subscribe(InternalSubID,TopicFilter const&,InternalEventHandler const&cb); + void internal_unsubscribe(InternalSubID); + +private: + struct NoReenter; + struct StreamRec; + struct InternalSubRec; + struct SubRec; + struct InternalSubFilter; + struct PImpl; + + SubID gen_external_sub_id(); + void _unadvertise(EventBrokerID,StreamID) ; + void _unsubscribe (EventBrokerID,SubID,StreamID) ; + + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/FatWrapper.h b/src/server/sparkd/orderman2/mercury/FatWrapper.h new file mode 100644 index 000000000..4814a2820 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/FatWrapper.h @@ -0,0 +1,161 @@ +#pragma once + +#include +#include + +#include "lib/utils/bts_assert.h" + +namespace bts { +namespace mercury { + +template +void fat_wrapper_copy(std::array *dst, + std::array const &src) +{ + if (sizeof(T) <= N) + new (dst->data()) T(*((T*) src.data())); + else { + auto heap_cpy = new T(**((T**) src.data())); + *((T**) dst->data()) = heap_cpy; + } +} + +template +void fat_wrapper_destroy(std::array &dst) +{ + if (sizeof(T) <= N) + ((T*) dst.data())->~T(); + else { + auto heap_ptr = *((T**) dst.data()); + delete heap_ptr; + } +} + +template +class FatWrapper +{ +public: + static const auto Overhead = 3*sizeof(void*); + static const auto BufferSize = SZ - Overhead; + static_assert( SZ>= (Overhead + sizeof(void*)), "Size is too small to hold FatWrapper" ); + + FatWrapper() : + _copy(), + _destroy(), + _wrapped_type(), + _buffer() + { + } + + FatWrapper(FatWrapper const &src) : + _copy(src._copy), + _destroy(src._destroy), + _wrapped_type(src._wrapped_type), + _buffer() + { + if (!empty()) + _copy(&_buffer,src._buffer); + } + + template + T& wrap(T&& t) + { + using RealT = typename std::remove_reference::type ; + + if (!empty()) + _destroy(_buffer); + + _copy = fat_wrapper_copy; + _destroy = fat_wrapper_destroy; + _wrapped_type = &typeid(RealT); + if (sizeof(T) <= BufferSize) + new (_buffer.data()) RealT(std::forward(t)); + else { + auto heap_cpy = new RealT(std::forward(t)); + *((RealT**) _buffer.data()) = heap_cpy; + } + return unwrap(); + } + + template + T& wrap_in_place(Args&&... args) + { + if (!empty()) + _destroy(_buffer); + + _copy = fat_wrapper_copy; + _destroy = fat_wrapper_destroy; + _wrapped_type = &typeid(T); + + if (sizeof(T) <= BufferSize) + new (_buffer.data()) T(std::forward(args)...); + else { + auto heap_cpy = new T(std::forward(args)...); + *((T**) _buffer.data()) = heap_cpy; + } + return unwrap(); + } + + template + T &unwrap() + { + bts_assert(!empty()); + bts_assert(*_wrapped_type == typeid(T)); + if (sizeof(T) <= BufferSize) + return *((T*) _buffer.data()); + else + return **((T**)_buffer.data()); + } + + template + T const &unwrap() const + { + return ((FatWrapper*)this)->unwrap(); + } + + FatWrapper& operator=(const FatWrapper &src) + { + if (!empty()) + _destroy(_buffer); + + _copy = src._copy; + _destroy = src._destroy; + _wrapped_type = src._wrapped_type; + + if (!empty()) + _copy(&_buffer,src._buffer); + return *this; + } + + bool empty() const { + return _destroy == nullptr; + } + + std::type_info const& wrapped_type() + { + bts_assert(!empty()); + return *_wrapped_type; + } + + void clear() + { + if (!empty()) { + _destroy(_buffer); + _destroy = nullptr; + } + } + + ~FatWrapper() + { + clear(); + } + +private: + using Buffer = std::array; + void (*_copy) (Buffer *dst, Buffer const&src); + void (*_destroy) (Buffer &dst); + const std::type_info* _wrapped_type; + Buffer _buffer; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/IEventBroker.cpp b/src/server/sparkd/orderman2/mercury/IEventBroker.cpp new file mode 100644 index 000000000..1968cda8c --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/IEventBroker.cpp @@ -0,0 +1,8 @@ +#include "IEventBroker.h" + +namespace bts { +namespace mercury { + +IEventBroker::~IEventBroker(){} + +}} diff --git a/src/server/sparkd/orderman2/mercury/IEventBroker.h b/src/server/sparkd/orderman2/mercury/IEventBroker.h new file mode 100644 index 000000000..e05084b60 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/IEventBroker.h @@ -0,0 +1,29 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/mercury_common.h" +#include "server/sparkd/orderman2/mercury/ITopic.h" + +namespace bts { +namespace mercury { + +class IEventBroker +{ +public: + virtual EventBrokerID id() const = 0; + + virtual void add_neighbour(IEventBrokerPtr const &) = 0; + virtual void remove_neighbour(EventBrokerID) = 0; + + virtual void advertise(EventBrokerID,StreamID,TopicPtr const&) = 0; + virtual void unadvertise(EventBrokerID,StreamID) = 0; + + virtual void subscribe(EventBrokerID,SubID,StreamID) = 0; + virtual void unsubscribe(EventBrokerID,SubID,StreamID) = 0; + + virtual void notify(EventBrokerID, StreamID,SubID,EventPayload const&) = 0; + + virtual ~IEventBroker() ; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/ISynopsisBuilder.h b/src/server/sparkd/orderman2/mercury/ISynopsisBuilder.h new file mode 100644 index 000000000..e96ab19e3 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/ISynopsisBuilder.h @@ -0,0 +1,19 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/mercury_common.h" + +namespace bts { +namespace mercury { + +class ISynopsisBuilder +{ +public: + EventPayload* get_synopsis() {return nullptr;} + void update(EventPayload const&) {}; + void reset() {}; +}; + +using SynopsisBuilderPtr = std::shared_ptr ; + +}} diff --git a/src/server/sparkd/orderman2/mercury/ITopic.cpp b/src/server/sparkd/orderman2/mercury/ITopic.cpp new file mode 100644 index 000000000..b6f767b56 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/ITopic.cpp @@ -0,0 +1,8 @@ +#include "ITopic.h" + +namespace bts { +namespace mercury { + +ITopic::~ITopic () {} + +}} diff --git a/src/server/sparkd/orderman2/mercury/ITopic.h b/src/server/sparkd/orderman2/mercury/ITopic.h new file mode 100644 index 000000000..240f1b449 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/ITopic.h @@ -0,0 +1,21 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/ISynopsisBuilder.h" + +namespace bts { +namespace mercury { + +class SynopsisBuilder; + +class ITopic +{ +public: + virtual ~ITopic(); + virtual SynopsisBuilderPtr make_synopsis_builder() const = 0; + virtual std::string to_str() const = 0; +}; + +using TopicPtr = std::shared_ptr ; + +}} diff --git a/src/server/sparkd/orderman2/mercury/SynopsisBuilder.cpp b/src/server/sparkd/orderman2/mercury/SynopsisBuilder.cpp new file mode 100644 index 000000000..4f8a559dc --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/SynopsisBuilder.cpp @@ -0,0 +1,6 @@ +#include "SynopsisBuilder.h" + +namespace bts { +namespace mercury { + +}} diff --git a/src/server/sparkd/orderman2/mercury/SynopsisBuilder.h b/src/server/sparkd/orderman2/mercury/SynopsisBuilder.h new file mode 100644 index 000000000..b0ce12837 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/SynopsisBuilder.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/mercury_common.h" + +namespace bts { +namespace mercury { + +class SynopsisBuilder +{ +public: + EventPayload* get_synopsis(); + void update(EventPayload const&); + void reset(); +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/mercury_common.h b/src/server/sparkd/orderman2/mercury/mercury_common.h new file mode 100644 index 000000000..2a9956c8d --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/mercury_common.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include +#include +#include "server/sparkd/orderman2/mercury/FatWrapper.h" +#include "lib/utils/ValueWrapper.h" + +namespace bts { +namespace mercury { + +class ITopic; +using TopicFilter = std::function ; + +class IEventBroker; +using IEventBrokerPtr = std::shared_ptr ; + +using StreamID = utils::ValueWrapper; +using SubID = utils::ValueWrapper; +using EventPayload = FatWrapper<80>; + +using InternalSubID = utils::ValueWrapper; + +using EventTypeID = utils::ValueWrapper; + +using EventBrokerID = utils::ValueWrapper; +enum class EventType { + BEGIN_STREAM, + END_STREAM, + NEW_EVENT, + END_SUB +}; +using InternalEventHandler = std::function; +}} diff --git a/src/server/sparkd/orderman2/orders/Order.cpp b/src/server/sparkd/orderman2/orders/Order.cpp new file mode 100644 index 000000000..d3678aeea --- /dev/null +++ b/src/server/sparkd/orderman2/orders/Order.cpp @@ -0,0 +1,70 @@ +#include "Order.h" + +namespace bts { +namespace orderman2 { + +class A {}; +class B {}; +class C {}; +class D {}; +class E {}; +class F {}; + +using Events = std::tuple ; + +template struct Handler {void on(){}}; + +template +struct Handler : public Handler +{ + using Handler::on; + virtual void on(const H&) {}; +}; + +template class T, typename> +struct instantiate_with_same_args { }; + +template< + template class T, + template class U, + typename... Ts + > +struct instantiate_with_same_args> +{ + using type = T; +}; + +using Handlers = instantiate_with_same_args::type; + + +struct FOrder : protected Handlers +{}; + +template +struct EventHandler { + virtual void on(EV const&) {} +}; + + +template +struct MultiHandler : public EventHandler... +{ +}; + +using MH = MultiHandler; +MH a; + + +struct Order::PImpl +{ + PImpl() + {} +}; + +Order::Order () : me (new PImpl()) { +} + +Order::~Order () +{} + +}} diff --git a/src/server/sparkd/orderman2/orders/Order.h b/src/server/sparkd/orderman2/orders/Order.h new file mode 100644 index 000000000..4d6d5ec48 --- /dev/null +++ b/src/server/sparkd/orderman2/orders/Order.h @@ -0,0 +1,50 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/common/OrderKey.h" +#include "lib/domain_model/common.h" + +// fwds +namespace bts { +namespace api { +class Security; +namespace orderman2 {class OrderDef; class StdOrderState; class CustomOrderState;} +} +namespace orderman2 {class Order; class OrderBuilder;} +} +// end fwds + +namespace bts { +namespace orderman2 { + +class Order +{ +public: + Order(); + OrderKey key(); + OrderKey parent(); + + void activate(); + void update(Price p, Quantity q); + void crack(); + void cancel(); + + virtual ~Order(); + +protected: + Order& make_child_order(api::orderman2::OrderDef const&def); + OrderBuilder& make_child_builder(api::orderman2::OrderDef const&def,size_t reserve_sz); + api::Security const *resolve_security(SecurityKey const&k) ; + void report_state(api::orderman2::StdOrderState const&,api::orderman2::CustomOrderState const&) ; + + virtual void on_activate() = 0; + virtual void on_update(Price p, Quantity q) = 0; + virtual void on_crack() = 0 ; + virtual void on_cancel() = 0; + +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp b/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp new file mode 100644 index 000000000..71870aec8 --- /dev/null +++ b/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp @@ -0,0 +1,53 @@ +#include "server/sparkd/orderman2/mercury/FatWrapper.h" +#include + +namespace bts { +namespace mercury { + +struct A { + std::string s; + bool operator==(const A&src) const {return src.s == s;} +}; + +TEST_CASE ("FatWrapperTests" , "[mercury]") +{ + + SECTION("fat_wrapper_works_small") + { + FatWrapper <128> fw; + A a {"hello"}; + fw.wrap(a); + REQUIRE(a == fw.unwrap()); + + FatWrapper<128> fw2; + fw2 = fw; + REQUIRE(a == fw2.unwrap()); + + auto fw3 (fw); + REQUIRE(a == fw3.unwrap()); + } + + SECTION("fat_wrapper_works_big") + { + FatWrapper <32> fw; + A a {"hello"}; + fw.wrap(a); + REQUIRE(a == fw.unwrap()); + + FatWrapper<32> fw2; + fw2 = fw; + REQUIRE(a == fw2.unwrap()); + + auto fw3 (fw); + REQUIRE(a == fw3.unwrap()); + } + + SECTION("empty_can_be_copied") + { + FatWrapper <64> fw; + FatWrapper <64> fw2; + fw2=fw; + } +} + +}} diff --git a/tools/linux_control/rtags.sh b/tools/linux_control/rtags.sh new file mode 100644 index 000000000..d151fc53c --- /dev/null +++ b/tools/linux_control/rtags.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +rc --compile clang++ $@ +/usr/lib/ccache/clang++ $@ diff --git a/tools/setup_builds.sh b/tools/setup_builds.sh index 93531f3df..755c682eb 100755 --- a/tools/setup_builds.sh +++ b/tools/setup_builds.sh @@ -3,21 +3,21 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" mkdir -p $DIR/../build/ cd $DIR/../build/ +rm -rf clang_debug +mkdir clang_debug +cd clang_debug +cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=`realpath ../../tools/linux_control/rtags.sh` -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ../.. +cd .. + rm -rf ninja_debug mkdir ninja_debug cd ninja_debug -cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ../.. +cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ ../.. cd .. rm -rf ninja_release mkdir ninja_release cd ninja_release -cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ../.. -cd .. - -rm -rf clang_debug -mkdir clang_debug -cd clang_debug -cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=/usr/lib/ccache/clang++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ../.. +cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ ../.. cd .. From 2010f59029ee95a9b611c9ffa42feb59dd1dac68 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 28 Nov 2017 15:42:59 -0500 Subject: [PATCH 04/35] Refactor. --- src/server/sparkd/cmds/Benchmark.cpp | 11 +- .../orderman2/mercury/AsyncEventBroker.h | 248 +++++++++--------- .../orderman2/mercury/CoreEventBroker.cpp | 10 +- 3 files changed, 145 insertions(+), 124 deletions(-) diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index c805e8d33..dec3a62d4 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -669,7 +669,16 @@ BENCHMARK_TEMPLATE(simple_alloc_copy,Subscription); BENCHMARK_TEMPLATE(simple_alloc_copy,Unsubscription); BENCHMARK_TEMPLATE(simple_alloc_copy,InternalSubscription); BENCHMARK_TEMPLATE(simple_alloc_copy,InternalUnsubscription); - + +static void get_thread_id(benchmark::State &state) +{ + for (auto _ : state) { + auto tid = std::this_thread::get_id(); + benchmark::DoNotOptimize(tid == std::this_thread::get_id()); + } +} +BENCHMARK(get_thread_id); + std::string Benchmark::help() { return "Run micro-benchmarks"; } } } diff --git a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h b/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h index de9eab995..6885db2e3 100644 --- a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h +++ b/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h @@ -15,6 +15,127 @@ namespace mercury { class AsyncEventBroker : public IEventBroker { +public: + AsyncEventBroker () : _core_broker(), _queue(), + _internal_pool(), _external_pool(), + _external_pool_mtx(), + _current_suid(0) + {} + + // ieventbroker methods, can be called from multiple threads + EventBrokerID id() const override + {return _core_broker.id();} + + void add_neighbour(IEventBrokerPtr const &n) override + {post_external_msg (on_neighbour_addition,n);} + + void remove_neighbour(EventBrokerID n) override + {post_external_msg (on_neighbour_removal,n);} + + void advertise(EventBrokerID eid,StreamID sid,TopicPtr const&t) override + {post_external_msg(on_advertisement,eid,sid,t);} + + void unadvertise(EventBrokerID eid,StreamID sid) override + {post_external_msg(on_unadvertisement,eid,sid);} + + void subscribe(EventBrokerID eid,SubID suid,StreamID sid) override + {post_external_msg (on_subscription,eid,suid,sid);} + + void unsubscribe(EventBrokerID eid,SubID suid,StreamID sid) override + {post_external_msg (on_unsubscription,eid,suid,sid);} + + void notify(EventBrokerID eid,StreamID sid,SubID suid,EventPayload const&payload) override + {post_external_msg(on_notification,eid,sid,suid,payload);} + // End IEventBrokerPtr + + void post_action(std::function const&action) {post_external_msg(on_action,action);} + +// Internal API, i.e. API intended for use by a single thread, the +// same thread calling do_work. + template + void internal_notify(StreamID sid, Args&&... args) + { + auto msg = _internal_pool.construct(); + msg->is_external = false; + msg->handle_msg = on_internal_notification; + auto &n = msg->wrapper.wrap_in_place (sid); + n.payload.wrap_in_place(std::forward(args)...); + _queue.enqueue(msg); + } + + InternalSubID internal_subscribe(TopicFilter const&f,InternalEventHandler const&cb) + { + _current_suid = InternalSubID(_current_suid.value()+1); + post_internal_msg (on_internal_subscription,_current_suid,f,cb); + return _current_suid; + } + + void internal_unsubscribe(InternalSubID suid) + { + post_internal_msg (on_internal_unsubscription,suid); + } + + void do_work() + { + BrokerMsg *m; + if (_queue.try_dequeue(m)) { + m->handle_msg(this,m); + free_msg(m); + } + } + +private: + struct BrokerMsg { + FatWrapper<127-8-4> wrapper; + void (*handle_msg) (AsyncEventBroker*self,BrokerMsg*m); + bool is_external; + }; + using MsgHandler = void(AsyncEventBroker*,BrokerMsg*); + + using Pool = boost::object_pool; + using Queue = moodycamel::ConcurrentQueue ; + using DispatchMap = boost::container::flat_map>; + CoreEventBroker _core_broker; + Queue _queue; + Pool _internal_pool; + Pool _external_pool; + std::atomic_flag _external_pool_mtx = ATOMIC_FLAG_INIT; + DispatchMap _dispatch_map; + InternalSubID _current_suid; + + void free_msg(BrokerMsg *m) { + m->wrapper.clear(); + if (m->is_external) { + while (_external_pool_mtx.test_and_set(std::memory_order_acquire)); + _external_pool.destroy(m); + _external_pool_mtx.clear(std::memory_order_release); + } + else + _internal_pool.destroy(m); + } + + template + void post_external_msg(MsgHandler handler, Args&&... args) { + + while (_external_pool_mtx.test_and_set(std::memory_order_acquire)); + auto msg = _external_pool.construct(); + _external_pool_mtx.clear(std::memory_order_release); + + msg->is_external = true; + msg->handle_msg = handler; + msg->wrapper.wrap_in_place (std::forward(args)...); + _queue.enqueue(msg); + } + + template + void post_internal_msg(MsgHandler handler, Args&&... args) { + auto msg = _internal_pool.construct(); + msg->handle_msg = handler; + msg->is_external = false; + msg->wrapper.wrap_in_place (std::forward(args)...); + _queue.enqueue(msg); + } + struct NeighbourAddition { NeighbourAddition(const IEventBrokerPtr &src) : ptr(src) {} IEventBrokerPtr ptr; @@ -92,125 +213,10 @@ class AsyncEventBroker : public IEventBroker InternalSubID suid; }; -public: - AsyncEventBroker () : _core_broker(), _queue(), - _internal_pool(), _external_pool(), - _external_pool_mtx(), - _current_suid(0) - {} - - // ieventbroker methods, can be called from multiple threads - EventBrokerID id() const override - {return _core_broker.id();} - - void add_neighbour(IEventBrokerPtr const &n) override - {post_external_msg (on_neighbour_addition,n);} - - void remove_neighbour(EventBrokerID n) override - {post_external_msg (on_neighbour_removal,n);} - - void advertise(EventBrokerID eid,StreamID sid,TopicPtr const&t) override - {post_external_msg(on_advertisement,eid,sid,t);} - - void unadvertise(EventBrokerID eid,StreamID sid) override - {post_external_msg(on_unadvertisement,eid,sid);} - - void subscribe(EventBrokerID eid,SubID suid,StreamID sid) override - {post_external_msg (on_subscription,eid,suid,sid);} - - void unsubscribe(EventBrokerID eid,SubID suid,StreamID sid) override - {post_external_msg (on_unsubscription,eid,suid,sid);} - - void notify(EventBrokerID eid,StreamID sid,SubID suid,EventPayload const&payload) override - {post_external_msg(on_notification,eid,sid,suid,payload);} - // End IEventBrokerPtr - -// Internal API, i.e. API intended for use by a single thread, the -// same thread calling do_work. - template - void internal_notify(StreamID sid, Args&&... args) - { - auto msg = _internal_pool.construct(); - msg->is_external = false; - msg->handle_msg = on_internal_notification; - auto &n = msg->wrapper.wrap_in_place (sid); - n.payload.wrap_in_place(std::forward(args)...); - _queue.enqueue(msg); - } - - InternalSubID internal_subscribe(TopicFilter const&f,InternalEventHandler const&cb) - { - _current_suid = InternalSubID(_current_suid.value()+1); - post_internal_msg (on_internal_subscription,_current_suid,f,cb); - return _current_suid; - } - - void internal_unsubscribe(InternalSubID suid) - { - post_internal_msg (on_internal_unsubscription,suid); - } - - void do_work() - { - BrokerMsg *m; - if (_queue.try_dequeue(m)) { - m->handle_msg(this,m); - free_msg(m); - } - } - - -private: - struct BrokerMsg { - FatWrapper<127-8-4> wrapper; - void (*handle_msg) (AsyncEventBroker*self,BrokerMsg*m); - bool is_external; + struct Action { + Action(std::function const&action) : action(action) {} + std::function action; }; - using MsgHandler = void(AsyncEventBroker*,BrokerMsg*); - - using Pool = boost::object_pool; - using Queue = moodycamel::ConcurrentQueue ; - using DispatchMap = boost::container::flat_map>; - CoreEventBroker _core_broker; - Queue _queue; - Pool _internal_pool; - Pool _external_pool; - std::atomic_flag _external_pool_mtx = ATOMIC_FLAG_INIT; - DispatchMap _dispatch_map; - InternalSubID _current_suid; - - void free_msg(BrokerMsg *m) { - m->wrapper.clear(); - if (m->is_external) { - while (_external_pool_mtx.test_and_set(std::memory_order_acquire)); - _external_pool.destroy(m); - _external_pool_mtx.clear(std::memory_order_release); - } - else - _internal_pool.destroy(m); - } - - template - void post_external_msg(MsgHandler handler, Args&&... args) { - - while (_external_pool_mtx.test_and_set(std::memory_order_acquire)); - auto msg = _external_pool.construct(); - _external_pool_mtx.clear(std::memory_order_release); - - msg->is_external = true; - msg->handle_msg = handler; - msg->wrapper.wrap_in_place (std::forward(args)...); - _queue.enqueue(msg); - } - - template - void post_internal_msg(MsgHandler handler, Args&&... args) { - auto msg = _internal_pool.construct(); - msg->handle_msg = handler; - msg->is_external = false; - msg->wrapper.wrap_in_place (std::forward(args)...); - _queue.enqueue(msg); - } static void on_neighbour_addition(AsyncEventBroker *self,BrokerMsg *m) {self->_core_broker.add_neighbour(m->wrapper.unwrap().ptr);} @@ -265,6 +271,12 @@ private: auto const&iunsub = m->wrapper.unwrap(); self->_core_broker.internal_unsubscribe(iunsub.suid); } + + static void on_action(AsyncEventBroker *,BrokerMsg *m) + { + auto const &action = m->wrapper.unwrap(); + action.action(); + } }; }} diff --git a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp index 7338f873d..2a2e8fb69 100644 --- a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp +++ b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp @@ -296,7 +296,7 @@ void CoreEventBroker::advertise(EventBrokerID sender,StreamID sid, TopicPtr cons } // match to existing internal subscriptions - for (auto const&kvp : me->internal_sub_filters) { + for (auto const&kvp : me->internal_subscriptions) { auto internal_sub_id = kvp.first; auto const &f = kvp.second; if (f.matches(*topic)) @@ -358,10 +358,10 @@ void CoreEventBroker::internal_subscribe(InternalSubID in_subid,TopicFilter cons NoReenter nr(me->inside); // no duplicates - bts_assert(me->internal_sub_filters.find(in_subid) == me->internal_sub_filters.end()); + bts_assert(me->internal_subscriptions.find(in_subid) == me->internal_subscriptions.end()); // add to internal sub list - auto &sf = me->internal_sub_filters[in_subid]; + auto &sf = me->internal_subscriptions[in_subid]; sf.matches = f; sf.handler = cb; @@ -380,8 +380,8 @@ void CoreEventBroker::internal_unsubscribe(InternalSubID in_subid) NoReenter nr(me->inside); // must be a previously entered sub - auto it = me->internal_sub_filters.find(in_subid); - bts_assert( it != me->internal_sub_filters.end()); + auto it = me->internal_subscriptions.find(in_subid); + bts_assert( it != me->internal_subscriptions.end()); auto &matches = it->second.matches; // for each stream that matched this filter remove the corresponding internal sub From 718c4620b0f054860a40324dc0e0058074150055 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 29 Nov 2017 12:21:30 -0500 Subject: [PATCH 05/35] Event broker is code complete. --- src/lib/utils/ValueWrapper.h | 10 +- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/orderman2/mercury/Actor.cpp | 39 ++++ src/server/sparkd/orderman2/mercury/Actor.h | 196 ++++++++++++++++++ .../sparkd/orderman2/mercury/ActorPtr.h | 11 + .../orderman2/mercury/AsyncEventBroker.h | 13 ++ .../sparkd/orderman2/mercury/CacheLast.h | 33 +++ .../orderman2/mercury/CoreEventBroker.cpp | 14 +- src/server/sparkd/orderman2/mercury/Event.h | 17 ++ .../sparkd/orderman2/mercury/Executor.cpp | 7 + .../sparkd/orderman2/mercury/Executor.h | 53 +++++ .../sparkd/orderman2/mercury/NoSynopsis.h | 19 ++ .../sparkd/orderman2/mercury/PollEvent.h | 11 + .../sparkd/orderman2/mercury/Poller.cpp | 6 + src/server/sparkd/orderman2/mercury/Poller.h | 23 ++ src/server/sparkd/orderman2/mercury/Topic.h | 32 +++ src/server/sparkd/orderman2/mercury/Update.h | 17 ++ .../orderman2/mercury/mercury_common.cpp | 13 ++ .../sparkd/orderman2/mercury/mercury_common.h | 3 + 19 files changed, 509 insertions(+), 10 deletions(-) create mode 100644 src/server/sparkd/orderman2/mercury/Actor.cpp create mode 100644 src/server/sparkd/orderman2/mercury/Actor.h create mode 100644 src/server/sparkd/orderman2/mercury/ActorPtr.h create mode 100644 src/server/sparkd/orderman2/mercury/CacheLast.h create mode 100644 src/server/sparkd/orderman2/mercury/Event.h create mode 100644 src/server/sparkd/orderman2/mercury/Executor.cpp create mode 100644 src/server/sparkd/orderman2/mercury/Executor.h create mode 100644 src/server/sparkd/orderman2/mercury/NoSynopsis.h create mode 100644 src/server/sparkd/orderman2/mercury/PollEvent.h create mode 100644 src/server/sparkd/orderman2/mercury/Poller.cpp create mode 100644 src/server/sparkd/orderman2/mercury/Poller.h create mode 100644 src/server/sparkd/orderman2/mercury/Topic.h create mode 100644 src/server/sparkd/orderman2/mercury/Update.h create mode 100644 src/server/sparkd/orderman2/mercury/mercury_common.cpp diff --git a/src/lib/utils/ValueWrapper.h b/src/lib/utils/ValueWrapper.h index 1f6a9dbfa..433384376 100644 --- a/src/lib/utils/ValueWrapper.h +++ b/src/lib/utils/ValueWrapper.h @@ -24,12 +24,18 @@ public: bool operator==(ValueWrapper const&v) const {return _v == v._v;} bool operator!=(ValueWrapper const&v) const {return _v != v._v;} bool operator<(ValueWrapper const&v) const {return _v < v._v;} - std::ostream& operator<<(std::ostream &s) const { s << value(); return s;} ValueT const& value() const {return _v;} ValueT & value() {return _v;} - private: ValueT _v; }; +// don't ask. +template +std::ostream& operator<<(std::ostream &s, ValueWrapper const&v) +{ + s << v.value(); + return s; +} + }} diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 4bc3802bf..5ff33aae0 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/ITopic.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/orders/Order.cpp;orderman2/tests/fat_wrapper_tests.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/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckReturnStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/Actor.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/ITopic.cpp;orderman2/mercury/Poller.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/mercury_common.cpp;orderman2/orders/Order.cpp;orderman2/tests/fat_wrapper_tests.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/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckReturnStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/orderman2/mercury/Actor.cpp b/src/server/sparkd/orderman2/mercury/Actor.cpp new file mode 100644 index 000000000..9e8b920ac --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Actor.cpp @@ -0,0 +1,39 @@ +#include "Actor.h" +#include "server/sparkd/orderman/md/Book.h" +#include "lib/domain_model/common.h" +#include "server/sparkd/orderman2/mercury/CacheLast.h" + +namespace bts { +namespace mercury { + +class Book{}; + +class BookUpdate { +public: + using Tag = SecurityKey; + using SynopsisBuilder = CacheLast; + BookUpdate(Book const &b) : book (b) {} + Book book; +}; + +class MyActor : public Actor { +public: + void init () override { + + subscribe (SecurityKey(1), [](auto update) {std::cout < ([](auto update) {std::cout < ([](auto topic) {return topic.tag().value() > 2;}, + [](auto update) {std::cout < ([](auto update) {std::cout <(SecurityKey(1)); + publish(book_stream,Book {}); + destroy_stream(book_stream); + } +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/Actor.h b/src/server/sparkd/orderman2/mercury/Actor.h new file mode 100644 index 000000000..3ea439ba5 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Actor.h @@ -0,0 +1,196 @@ +#pragma once + +#include +#include + +#include "lib/utils/bts_assert.h" +#include "lib/utils/warn_ctrl.h" +#include "server/sparkd/orderman2/mercury/AsyncEventBroker.h" +#include "server/sparkd/orderman2/mercury/Topic.h" +#include "server/sparkd/orderman2/mercury/Update.h" + +namespace bts { +namespace mercury { + +template class Stream +{ +public: + StreamID sid; +}; + +GCC_DIAG_OFF("-Wnon-virtual-dtor") +class Actor : public std::enable_shared_from_this +{ +public: + using SubHandle = InternalSubID; + + Actor() : _broker(nullptr),_active_streams(),_active_subs() {} + + virtual void init() = 0; + virtual void finit() {}; + + template + SubHandle subscribe(typename Event::Tag const &tag, CB const &cb) + { + bts_assert(_broker); + using TopicType = Topic; + using UpdateType = Update; + + auto self = shared_from_this(); + TopicFilter filter = [tag,self](const ITopic&t) { + auto typed_topic = dynamic_cast (&t); + if (!typed_topic) + return false; + else + return typed_topic->tag() == tag; + }; + + InternalEventHandler handler = [this,cb] (const StreamID &sid, EventType type, + EventPayload const*payload) { + if (!this->_broker) + return; + + if (payload) + cb(UpdateType{sid,type, &(payload->unwrap())}); + else + cb(UpdateType{sid,type,nullptr}); + }; + + return _subscribe(filter,handler); + } + + template + SubHandle subscribe(CB const &cb) + { + bts_assert(_broker); + using TopicType = Topic; + using UpdateType = Update; + + auto self = shared_from_this(); + TopicFilter filter = [self](const ITopic&t) { + auto typed_topic = dynamic_cast (&t); + return typed_topic != nullptr; + }; + + InternalEventHandler handler = [this,cb] (const StreamID &sid, EventType type, + EventPayload const*payload) { + if (!this->_broker) + return; + + if (payload) + cb(UpdateType{sid,type, &(payload->unwrap())}); + else + cb(UpdateType{sid,type,nullptr}); + }; + + return _subscribe(filter,handler); + } + + template + SubHandle subscribe(F const &user_filter, CB const &cb) + { + bts_assert(_broker); + using TopicType = Topic; + using UpdateType = Update; + + auto self = shared_from_this(); + TopicFilter filter = [self,user_filter](const ITopic&t) { + auto typed_topic = dynamic_cast (&t); + if(typed_topic == nullptr) + return false; + else + return user_filter(*typed_topic); + }; + + InternalEventHandler handler = [this,cb] (const StreamID &sid, EventType type, + EventPayload const*payload) { + if (!this->_broker) + return; + + if (payload) + cb(UpdateType{sid,type, &(payload->unwrap())}); + else + cb(UpdateType{sid,type,nullptr}); + }; + + return _subscribe(filter,handler); + } + + void unsubscribe(SubHandle id) + { + bts_assert(_broker); + _broker->internal_unsubscribe(id); + _active_subs.erase(id); + } + + template + Stream make_stream(typename Event::Tag const& tag) + { + bts_assert(_broker); + using TopicType = Topic; + auto topic = std::make_shared (tag); + auto sid = _broker->internal_advertise(topic); + _active_streams.insert(sid); + return Stream {sid}; + } + + template + void publish(Stream const&stream,Args&&... args) + { + bts_assert(_broker); + _broker->internal_notify(stream.sid,std::forward(args)...); + } + + template + void destroy_stream(Stream const&stream) + { + bts_assert(_broker); + _active_streams.erase(stream.sid); + _broker->internal_unadvertise(stream.sid); + } + +protected: + EventBrokerID broker_id() { + bts_assert(_broker); + return _broker->id(); + } + + friend class Executor; + void activate(AsyncEventBroker &broker) + { + bts_assert(!_broker); + _broker = &broker; + init(); + } + + void deactivate() + { + bts_assert(_broker); + finit(); + + for (auto sid : _active_streams) + _broker->internal_unadvertise(sid); + _active_streams.clear(); + + for (auto h : _active_subs) + _broker->internal_unsubscribe(h); + _active_subs.clear(); + + _broker = nullptr; + } + +private: + AsyncEventBroker *_broker; + boost::container::flat_set _active_streams; + boost::container::flat_set _active_subs; + + SubHandle _subscribe(TopicFilter const&f, InternalEventHandler const&h) + { + auto handle = _broker->internal_subscribe(f,h); + _active_subs.insert(handle); + return handle; + } +}; +GCC_DIAG_RESTORE() + +}} diff --git a/src/server/sparkd/orderman2/mercury/ActorPtr.h b/src/server/sparkd/orderman2/mercury/ActorPtr.h new file mode 100644 index 000000000..4bedb0fdc --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/ActorPtr.h @@ -0,0 +1,11 @@ +#pragma once + +#include + +namespace bts { +namespace mercury { + +class Actor; +using ActorPtr = std::shared_ptr; + +}} diff --git a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h b/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h index 6885db2e3..57cf96d85 100644 --- a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h +++ b/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h @@ -48,6 +48,7 @@ public: {post_external_msg(on_notification,eid,sid,suid,payload);} // End IEventBrokerPtr + // can be called from outside void post_action(std::function const&action) {post_external_msg(on_action,action);} // Internal API, i.e. API intended for use by a single thread, the @@ -75,6 +76,18 @@ public: post_internal_msg (on_internal_unsubscription,suid); } + StreamID internal_advertise(TopicPtr const&t) + { + auto sid = gen_stream_id(); + post_external_msg(on_advertisement,id(),sid,t); + return sid; + } + + void internal_unadvertise(StreamID sid) + { + post_external_msg(on_unadvertisement,id(),sid); + } + void do_work() { BrokerMsg *m; diff --git a/src/server/sparkd/orderman2/mercury/CacheLast.h b/src/server/sparkd/orderman2/mercury/CacheLast.h new file mode 100644 index 000000000..9b0cfac47 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/CacheLast.h @@ -0,0 +1,33 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/ISynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/mercury_common.h" + +namespace bts { +namespace mercury { + +template +class CacheLast : public ISynopsisBuilder +{ +public: + CacheLast() : _synopsis(), _empty(true) {} + + EventPayload* get_synopsis() + { + if (!_empty) + return &_synopsis; + else + return nullptr; + } + + void update(EventPayload const&pl) {_synopsis = pl; _empty= false;}; + void reset() {_empty = true;}; + +private: + EventPayload _synopsis; + bool _empty; +}; + + +}} diff --git a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp index 2a2e8fb69..a5dab851e 100644 --- a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp +++ b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp @@ -188,7 +188,7 @@ struct CoreEventBroker::PImpl PImpl() : streams(), neighbours(), - internal_sub_filters(), + internal_subs(), my_id(utils::gen_id("event_broker")), last_external_sub_id(), inside(false) @@ -196,7 +196,7 @@ struct CoreEventBroker::PImpl Map> streams; Map neighbours; - Map internal_sub_filters; + Map internal_subs; EventBrokerID my_id; SubID last_external_sub_id; bool inside; @@ -296,7 +296,7 @@ void CoreEventBroker::advertise(EventBrokerID sender,StreamID sid, TopicPtr cons } // match to existing internal subscriptions - for (auto const&kvp : me->internal_subscriptions) { + for (auto const&kvp : me->internal_subs ) { auto internal_sub_id = kvp.first; auto const &f = kvp.second; if (f.matches(*topic)) @@ -358,10 +358,10 @@ void CoreEventBroker::internal_subscribe(InternalSubID in_subid,TopicFilter cons NoReenter nr(me->inside); // no duplicates - bts_assert(me->internal_subscriptions.find(in_subid) == me->internal_subscriptions.end()); + bts_assert(me->internal_subs.find(in_subid) == me->internal_subs.end()); // add to internal sub list - auto &sf = me->internal_subscriptions[in_subid]; + auto &sf = me->internal_subs[in_subid]; sf.matches = f; sf.handler = cb; @@ -380,8 +380,8 @@ void CoreEventBroker::internal_unsubscribe(InternalSubID in_subid) NoReenter nr(me->inside); // must be a previously entered sub - auto it = me->internal_subscriptions.find(in_subid); - bts_assert( it != me->internal_subscriptions.end()); + auto it = me->internal_subs.find(in_subid); + bts_assert( it != me->internal_subs.end()); auto &matches = it->second.matches; // for each stream that matched this filter remove the corresponding internal sub diff --git a/src/server/sparkd/orderman2/mercury/Event.h b/src/server/sparkd/orderman2/mercury/Event.h new file mode 100644 index 000000000..0dcfcaed0 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Event.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/NoSynopsis.h" + +namespace bts { +namespace mercury { + +template +class Event +{ +public: + using Tag = TagT; + using SynopsisBuilder = SynopsisBuilderT; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/Executor.cpp b/src/server/sparkd/orderman2/mercury/Executor.cpp new file mode 100644 index 000000000..b7d42dbf9 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Executor.cpp @@ -0,0 +1,7 @@ +#include "Executor.h" + +namespace bts { +namespace mercury { + + +}} diff --git a/src/server/sparkd/orderman2/mercury/Executor.h b/src/server/sparkd/orderman2/mercury/Executor.h new file mode 100644 index 000000000..a73cf49c0 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Executor.h @@ -0,0 +1,53 @@ +#pragma once + +#include +#include + +#include "server/sparkd/orderman2/mercury/AsyncEventBroker.h" +#include "server/sparkd/orderman2/mercury/ActorPtr.h" +#include "server/sparkd/orderman2/mercury/Actor.h" + +namespace bts { +namespace mercury { + +class Executor +{ +public: + Executor(AsyncEventBroker &broker) : _broker(broker), _actors(),_active_count(0) {} + + ~Executor() { + for (auto actor : _actors) + _broker.post_action([actor,this]() { + actor->deactivate(); + _active_count--; + }); + + while(_active_count) + do_work(); + } + + void activate(ActorPtr const&actor) + { + _actors.push_back(actor); + _active_count++; + + _broker.post_action([actor,this]() {actor->activate(_broker);}); + } + + template + void spawn(Args&&... args) + { + activate(std::make_shared (std::forward(args)...)); + } + + void do_work() + {_broker.do_work();} + + +private: + AsyncEventBroker &_broker; + std::vector _actors; + std::atomic _active_count; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/NoSynopsis.h b/src/server/sparkd/orderman2/mercury/NoSynopsis.h new file mode 100644 index 000000000..f219443e5 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/NoSynopsis.h @@ -0,0 +1,19 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/ISynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/mercury_common.h" + +namespace bts { +namespace mercury { + +class NoSynopsis : public ISynopsisBuilder +{ +public: + EventPayload* get_synopsis() {return nullptr;} + void update(EventPayload const&) {}; + void reset() {}; +}; + + +}} diff --git a/src/server/sparkd/orderman2/mercury/PollEvent.h b/src/server/sparkd/orderman2/mercury/PollEvent.h new file mode 100644 index 000000000..ac29fa403 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/PollEvent.h @@ -0,0 +1,11 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/Event.h" + +namespace bts { +namespace mercury { + +class PollEvent : public Event {}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/Poller.cpp b/src/server/sparkd/orderman2/mercury/Poller.cpp new file mode 100644 index 000000000..9c1f96b72 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Poller.cpp @@ -0,0 +1,6 @@ +#include "Poller.h" + +namespace bts { +namespace mercury { + +}} diff --git a/src/server/sparkd/orderman2/mercury/Poller.h b/src/server/sparkd/orderman2/mercury/Poller.h new file mode 100644 index 000000000..24f6ffee2 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Poller.h @@ -0,0 +1,23 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/PollEvent.h" +#include "Actor.h" + +namespace bts { +namespace mercury { + +class Poller : public Actor +{ +public: + void init() override + { + auto stream = make_stream (broker_id()); + subscribe (broker_id(),[stream,this] (auto) { + publish(stream); + }); + publish(stream); + } +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/Topic.h b/src/server/sparkd/orderman2/mercury/Topic.h new file mode 100644 index 000000000..abf06ce99 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Topic.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include +#include "lib/utils/type_name.h" + +namespace bts { +namespace mercury { + +template +class Topic : public ITopic +{ +public: + using Tag = typename Event::Tag; + + Topic (const Tag &t) : _tag(t) {} + + SynopsisBuilderPtr make_synopsis_builder() const override { + return std::make_shared(); + } + + std::string to_str() const override { + return fmt::format ("{}/{}",std::string(utils::type_name()),tag()); + } + Tag const& tag() const {return _tag;} + +private: + typename Event::Tag _tag; + +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/Update.h b/src/server/sparkd/orderman2/mercury/Update.h new file mode 100644 index 000000000..f2ba47b18 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/Update.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/mercury_common.h" + +namespace bts { +namespace mercury { + +template +class Update { +public: + StreamID sid; + EventType event_type; + const Event* event; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/mercury_common.cpp b/src/server/sparkd/orderman2/mercury/mercury_common.cpp new file mode 100644 index 000000000..ed110b5f6 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/mercury_common.cpp @@ -0,0 +1,13 @@ +#include "mercury_common.h" + +namespace bts { +namespace mercury { + +std::atomic _sid(0); + +StreamID gen_stream_id() +{ + return StreamID(++_sid); +} + +}} diff --git a/src/server/sparkd/orderman2/mercury/mercury_common.h b/src/server/sparkd/orderman2/mercury/mercury_common.h index 2a9956c8d..6d98147f7 100644 --- a/src/server/sparkd/orderman2/mercury/mercury_common.h +++ b/src/server/sparkd/orderman2/mercury/mercury_common.h @@ -31,4 +31,7 @@ enum class EventType { END_SUB }; using InternalEventHandler = std::function; + +StreamID gen_stream_id(); + }} From 6316c28f571823a5a53fab4912baca0fdf222e10 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 2 Dec 2017 14:33:45 -0500 Subject: [PATCH 06/35] Refactor. --- src/lib/api/services/OrderService2.proto | 79 ++++++++------- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/orderman/doc/event_flow.pdf | Bin 0 -> 18094 bytes .../sparkd/orderman/doc/order_man_notes.org | 81 ++++++++++++++- .../sparkd/orderman2/actors/SecuritySrc.cpp | 93 ++++++++++++++++++ .../sparkd/orderman2/actors/SecuritySrc.h | 24 +++++ .../orderman2/events/NewSecuritiesEvent.h | 52 ++++++++++ src/server/sparkd/orderman2/mercury/Actor.cpp | 2 +- src/server/sparkd/orderman2/mercury/Actor.h | 17 +++- .../orderman2/mercury/CoreEventBroker.cpp | 2 +- src/server/sparkd/orderman2/mercury/Event.h | 5 +- .../sparkd/orderman2/mercury/IEventBroker.h | 2 +- .../sparkd/orderman2/mercury/PollEvent.h | 5 +- src/server/sparkd/orderman2/mercury/Poller.h | 10 +- src/server/sparkd/orderman2/mercury/Topic.h | 32 ------ .../{ => synopsys_policies}/CacheLast.h | 0 .../{ => synopsys_policies}/NoSynopsis.h | 0 .../orderman2/mercury/{ => topics}/ITopic.cpp | 0 .../orderman2/mercury/{ => topics}/ITopic.h | 0 .../sparkd/orderman2/mercury/topics/Topic.h | 57 +++++++++++ .../orderman2/server/OrderServiceServer2.cpp | 18 ++++ .../orderman2/server/OrderServiceServer2.h | 35 +++++++ 22 files changed, 429 insertions(+), 87 deletions(-) create mode 100644 src/server/sparkd/orderman/doc/event_flow.pdf create mode 100644 src/server/sparkd/orderman2/actors/SecuritySrc.cpp create mode 100644 src/server/sparkd/orderman2/actors/SecuritySrc.h create mode 100644 src/server/sparkd/orderman2/events/NewSecuritiesEvent.h delete mode 100644 src/server/sparkd/orderman2/mercury/Topic.h rename src/server/sparkd/orderman2/mercury/{ => synopsys_policies}/CacheLast.h (100%) rename src/server/sparkd/orderman2/mercury/{ => synopsys_policies}/NoSynopsis.h (100%) rename src/server/sparkd/orderman2/mercury/{ => topics}/ITopic.cpp (100%) rename src/server/sparkd/orderman2/mercury/{ => topics}/ITopic.h (100%) create mode 100644 src/server/sparkd/orderman2/mercury/topics/Topic.h create mode 100644 src/server/sparkd/orderman2/server/OrderServiceServer2.cpp create mode 100644 src/server/sparkd/orderman2/server/OrderServiceServer2.h diff --git a/src/lib/api/services/OrderService2.proto b/src/lib/api/services/OrderService2.proto index 47d201ce6..8846d6540 100644 --- a/src/lib/api/services/OrderService2.proto +++ b/src/lib/api/services/OrderService2.proto @@ -12,18 +12,18 @@ service OrderService { // service calls rpc create_order(Create) returns (Response); - rpc cancel_order(Update) returns (Response); - rpc update_order(Cancel) returns (Response); + rpc cancel_order(Cancel) returns (Response); + rpc update_order(Update) returns (Response); rpc crack_order(Crack) returns (Response); // streams - rpc orders (OrdersSub) returns (stream OrderState); + rpc orders (OrdersSub) returns (stream OrderRecord); rpc fills (FillsSub) returns (stream Fill); rpc gateway_status (GatewayStatusSub) returns (stream GatewayStatusUpdate); } // request types -message Create {OrderDef new_order = 1;} +message Create {OrderDefinition new_order = 1;} message Update {uint32 order_key = 1; double price = 2; uint32 quantity = 3;} message Cancel {uint32 order_key = 1;}; message Crack {uint32 order_key = 1;}; @@ -36,17 +36,21 @@ message OrdersSub {} message FillsSub {} message GatewayStatusSub {} -message OrderDef { - StdOrderParams std_params = 1; - CustomerOrderParams custom_params = 2; +message OrderDefinition { + StdDefinition std= 1; + ExtendedDefinition special= 2; } +message OrderRecord { + uint32 order_key = 1 [(bts.api.key)=true]; + uint32 parent_key = 2; + OrderDefinition def = 3; + OrderState state = 4; +} message OrderState { - OrderDef definition = 1; - uint32 order_key = 2[(bts.api.key)=true]; - StdOrderState std_state = 3; - CustomOrderState custom_state = 4; + StdState std = 1; + ExtendedState special = 2; } // only native orders have fills @@ -66,11 +70,9 @@ 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 StdOrderState { - uint32 parent_order_key = 2; +message StdState { google.protobuf.Timestamp timestamp = 3; StdOrderStatus status = 4; double price = 5; @@ -81,8 +83,8 @@ message StdOrderState { string last_msg = 10; } -message CustomOrderState { - oneof custom { +message ExtendedState { + oneof special { LimitOrderState limit = 1; MarketOrderState market = 2; StopMarketOrderState stop_market = 3; @@ -101,11 +103,11 @@ message IcebergOrderState {} message SpreaderOrderState {SpreaderChildKind child_kind = 1;} message TimeBoxOrderState {} -message StdOrderParams { +message StdDefinition { uint32 security_key = 1; api.Side side = 2; - double price = 3; - uint32 quantity = 4; + double initial_price = 3; + uint32 initial_quantity = 4; string login = 5; string account = 6; TimeInForce time_in_force = 7; @@ -114,39 +116,44 @@ message StdOrderParams { google.protobuf.Timestamp timestamp = 10; } -message CustomerOrderParams { - oneof custom { - LimitOrderParams limit = 1; - MarketOrderParams market = 2; - StopMarketOrderParams stop_market = 3; - StopLimitOrderParams stop_limit = 4; - IcebergOrderParams iceberg = 5; - SpreaderOrderParams spreader = 6; - TimeBoxOrderParams time_box = 7; +message ExtendedDefinition { + oneof extended { + LimitOrderDefinition limit = 1; + MarketOrderDefinition market = 2; + StopMarketOrderDefinition stop_market = 3; + StopLimitOrderDefinition stop_limit = 4; + IcebergOrderDefinition iceberg = 5; + SpreaderOrderDefinition spreader = 6; + TimeBoxOrderDefinition time_box = 7; } } -message LimitOrderParams {} -message MarketOrderParams {} -message StopMarketOrderParams {double stop_price = 1;} -message StopLimitOrderParams {double stop_price = 1;} -message IcebergOrderParams {double show_price = 1; CustomerOrderParams child = 2;} -message SpreaderOrderParams {api.Security security = 1; spark.ExecutionStrategy execution_strategy = 2;} -message TimeBoxOrderParams {google.protobuf.Timestamp start = 1; google.protobuf.Timestamp stop = 2;} +message LimitOrderDefinition {} +message MarketOrderDefinition {} +message StopMarketOrderDefinition {double stop_price = 1;} +message StopLimitOrderDefinition {double stop_price = 1;} +message IcebergOrderDefinition {double show_price = 1; OrderDefinition child = 2;} +message SpreaderOrderDefinition {api.Security security = 1; spark.ExecutionStrategy execution_strategy = 2;} +message TimeBoxOrderDefinition {google.protobuf.Timestamp start = 1; google.protobuf.Timestamp stop = 2;} enum StdOrderStatus { + // The order is has been constructed but not acted on. Inactive // orders can be abandoned without consequences. The UI should - // ignore orders in this state. + // hide orders in this state. STD_ORDER_STATUS_INACTIVE = 0; + // The order is currently working, i.e. its algorithm is operating. STD_ORDER_STATUS_ACTIVE = 1; + // The order has completed successfully and accomplished its // goal. This is a terminal state. STD_ORDER_STATUS_COMPLETED = 2; + // The order was terminated orderly before it had a chance to // complete. This is a terminal state. STD_ORDER_STATUS_CANCELED = 3; + // The order has encountered an unexpected condition from which it // cannot recover. This a terminal state. STD_ORDER_STATUS_ERROR = 4; diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 5ff33aae0..2443838bb 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/Actor.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/ITopic.cpp;orderman2/mercury/Poller.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/mercury_common.cpp;orderman2/orders/Order.cpp;orderman2/tests/fat_wrapper_tests.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/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckReturnStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/Actor.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/Poller.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.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/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckReturnStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/orderman/doc/event_flow.pdf b/src/server/sparkd/orderman/doc/event_flow.pdf new file mode 100644 index 0000000000000000000000000000000000000000..af25cadecad731b90e42e89fa111597da1d180fb GIT binary patch literal 18094 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 Fast_OM [label="xmgs"] + GW -> FillStore [label="xreport"] + SecFinder -> SecStore [label="raw_sec"] + SecStore -> Fast_OM [label="sec"] + SecStore -> Slow_OM [label="sec"] - + Fast_OM -> Slow_OM [label="ostate"] + Slow_OM -> Fast_OM [label="ocrud"] + MD -> Fast_OM + MD -> Slow_OM + Slow_OM -> OrderStore [label="ostate"] + Time -> Slow_OM + + UI -> Fast_OM [label="ocrud"] + Time -> Fast_OM + Fast_OM -> GW [label="fix"] + Fast_OM -> Fast_OM [label="ostate | ocrud"] + Fast_OM -> OrderStore [label="ostate"] + OrderStore -> UI [label="p_ostate"] + FillStore -> UI [label="p_fill_state"] +} +#+END_SRC +#+RESULTS: +[[file:event_flow.pdf]] +* order state, order def +OrderDef + uint32 security_key = 1; + api.Side side = 2; + double price = 3; + uint32 quantity = 4; + string login = 5; + string account = 6; + TimeInForce time_in_force = 7; + ManualOrderIndicator manual_order_indicator = 8; + CTICode cti_code = 9; + google.protobuf.Timestamp timestamp = 10; +OrderState + uint32 parent_order_key = 2; + google.protobuf.Timestamp timestamp = 3; + StdOrderStatus status = 4; + double price = 5; + uint32 quantity = 6; + uint32 filled_quantity=7; + double last_price = 8; + double avg_price = 9; + string last_msg = 10; diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp new file mode 100644 index 000000000..64fe9e0ef --- /dev/null +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp @@ -0,0 +1,93 @@ +#include "SecuritySrc.h" +#include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" +#include "server/sparkd/orderman2/mercury/PollEvent.h" +#include "server/sparkd/persistence/SqliteStore.h" +#include "lib/md/MDRecoverableConsumer.h" +#include "lib/utils/bts_chrono.h" + +#include + +namespace bts { +namespace orderman2 { + +auto const sec_ns = "securities"; + +struct SecuritySrc::PImpl +{ + PImpl() : + store(new persistence::SqliteStore("securities")), + md_consumer(), + known_securities(), + last_scan(), + new_securities_stream () + {} + + std::unique_ptr store; + md::MDRecoverableConsumer md_consumer; + std::unordered_map> known_securities; + TimeStamp last_scan; + mercury::Stream new_securities_stream; + std::vector to_publish; +}; + +SecuritySrc::SecuritySrc () : me (new PImpl()) {} + +void SecuritySrc::init() +{ + auto all = me->store->retrieve_all()[sec_ns]; + for (auto const &kvp : all) { + auto r = securities::from_str(kvp.second); + if (r.first) { + auto k = r.second.id(); + auto ptr = std::make_unique(r.second); + auto ptr_cpy = ptr.get(); + me->known_securities[k] = std::move(ptr); + me->to_publish.push_back(ptr_cpy); + } + else + LOG(Persistence,Error, + "Could not retrieve security with key {} from storage. " + "This security will be ignored " + "Security string is: {} ", kvp.first, kvp.second); + } + + me->md_consumer.on_security ([this] (api::Security const &sec, + md2::MDConsumerHandle ) + {cache_if_new(sec);}); + + me->new_securities_stream = make_stream(); + subscribe (broker_id(),[this] (auto) {on_scan_securities();}); +} + +void SecuritySrc::cache_if_new(api::Security const&sec) +{ + auto &ptr = me->known_securities[sec.id()]; + + if (!ptr) { + + // first time we see this security, copy and index it + ptr = std::make_unique(sec); + + // remember that we need to publish it + me->to_publish.push_back (ptr.get()); + + // persist it + auto ks = std::to_string(sec.id()); + auto vs = securities::to_str(sec); + me->store->insert(sec_ns,ks,vs); + } +} + +void SecuritySrc::on_scan_securities() +{ + auto now = Timer::now(); + if (sec_diff(now,me->last_scan) > 5) { + me->last_scan = now; + me->md_consumer.scan_securities (); + if (me->to_publish.size()) + mercury::Actor::publish(me->new_securities_stream, std::move(me->to_publish)); + } +} + +}} + diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.h b/src/server/sparkd/orderman2/actors/SecuritySrc.h new file mode 100644 index 000000000..7d8c30404 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.h @@ -0,0 +1,24 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/Actor.h" + +namespace bts { +namespace api { class Security;} +namespace orderman2 { + +class SecuritySrc : public mercury::Actor +{ +public: + SecuritySrc(); + void init() override; + +private: + struct PImpl; + void cache_if_new(api::Security const&sec); + void on_scan_securities(); + void publish(); + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h new file mode 100644 index 000000000..2c15d2a71 --- /dev/null +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -0,0 +1,52 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/Event.h" +#include "lib/domain_model/Security.h" + +namespace bts { +namespace orderman2 { + +class NewSecuritiesSynopsisBuider; + +class NewSecuritiesEvent : public mercury::Event +{ +public: + NewSecuritiesEvent() : securities() {} + NewSecuritiesEvent(std::vector&& secs) : securities(std::move(secs)) {} + + std::vector securities; +}; + +class NewSecuritiesSynopsisBuider : public mercury::ISynopsisBuilder +{ +public: + NewSecuritiesSynopsisBuider() : _synopsis(), _empty(true) + {reset();} + + mercury::EventPayload* get_synopsis() + { + if (!_empty) + return &_synopsis; + else + return nullptr; + } + + void update(mercury::EventPayload const&pl) { + auto const &update = pl.unwrap (); + auto &previous = _synopsis.unwrap().securities; + for (auto p : update.securities) + previous.push_back(p); + }; + + void reset() { + _empty = true; + _synopsis.wrap_in_place (); + }; + +private: + mercury::EventPayload _synopsis; + bool _empty; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/Actor.cpp b/src/server/sparkd/orderman2/mercury/Actor.cpp index 9e8b920ac..4261893a9 100644 --- a/src/server/sparkd/orderman2/mercury/Actor.cpp +++ b/src/server/sparkd/orderman2/mercury/Actor.cpp @@ -1,7 +1,7 @@ #include "Actor.h" #include "server/sparkd/orderman/md/Book.h" #include "lib/domain_model/common.h" -#include "server/sparkd/orderman2/mercury/CacheLast.h" +#include "server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/Actor.h b/src/server/sparkd/orderman2/mercury/Actor.h index 3ea439ba5..43251b28c 100644 --- a/src/server/sparkd/orderman2/mercury/Actor.h +++ b/src/server/sparkd/orderman2/mercury/Actor.h @@ -6,7 +6,7 @@ #include "lib/utils/bts_assert.h" #include "lib/utils/warn_ctrl.h" #include "server/sparkd/orderman2/mercury/AsyncEventBroker.h" -#include "server/sparkd/orderman2/mercury/Topic.h" +#include "server/sparkd/orderman2/mercury/topics/Topic.h" #include "server/sparkd/orderman2/mercury/Update.h" namespace bts { @@ -59,7 +59,7 @@ public: return _subscribe(filter,handler); } - template + template SubHandle subscribe(CB const &cb) { bts_assert(_broker); @@ -85,7 +85,7 @@ public: return _subscribe(filter,handler); } - + template SubHandle subscribe(F const &user_filter, CB const &cb) { @@ -134,6 +134,17 @@ public: return Stream {sid}; } + template + Stream make_stream() + { + bts_assert(_broker); + using TopicType = Topic; + auto topic = std::make_shared (); + auto sid = _broker->internal_advertise(topic); + _active_streams.insert(sid); + return Stream {sid}; + } + template void publish(Stream const&stream,Args&&... args) { diff --git a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp index a5dab851e..72fb68ae8 100644 --- a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp +++ b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp @@ -3,7 +3,7 @@ #include "lib/utils/Puid.h" #include "lib/utils/bts_assert.h" #include "server/sparkd/orderman2/mercury/SynopsisBuilder.h" -#include "server/sparkd/orderman2/mercury/ITopic.h" +#include "server/sparkd/orderman2/mercury/topics/ITopic.h" #include #include diff --git a/src/server/sparkd/orderman2/mercury/Event.h b/src/server/sparkd/orderman2/mercury/Event.h index 0dcfcaed0..87d7bcb54 100644 --- a/src/server/sparkd/orderman2/mercury/Event.h +++ b/src/server/sparkd/orderman2/mercury/Event.h @@ -1,16 +1,15 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/NoSynopsis.h" +#include "server/sparkd/orderman2/mercury/synopsys_policies/NoSynopsis.h" namespace bts { namespace mercury { -template +template class Event { public: - using Tag = TagT; using SynopsisBuilder = SynopsisBuilderT; }; diff --git a/src/server/sparkd/orderman2/mercury/IEventBroker.h b/src/server/sparkd/orderman2/mercury/IEventBroker.h index e05084b60..1a594fae0 100644 --- a/src/server/sparkd/orderman2/mercury/IEventBroker.h +++ b/src/server/sparkd/orderman2/mercury/IEventBroker.h @@ -2,7 +2,7 @@ #include #include "server/sparkd/orderman2/mercury/mercury_common.h" -#include "server/sparkd/orderman2/mercury/ITopic.h" +#include "server/sparkd/orderman2/mercury/topics/ITopic.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/PollEvent.h b/src/server/sparkd/orderman2/mercury/PollEvent.h index ac29fa403..1d178ad0c 100644 --- a/src/server/sparkd/orderman2/mercury/PollEvent.h +++ b/src/server/sparkd/orderman2/mercury/PollEvent.h @@ -6,6 +6,9 @@ namespace bts { namespace mercury { -class PollEvent : public Event {}; +struct PollEvent : public Event<> +{ + using Tag = EventBrokerID; +}; }} diff --git a/src/server/sparkd/orderman2/mercury/Poller.h b/src/server/sparkd/orderman2/mercury/Poller.h index 24f6ffee2..a59de0c54 100644 --- a/src/server/sparkd/orderman2/mercury/Poller.h +++ b/src/server/sparkd/orderman2/mercury/Poller.h @@ -12,11 +12,11 @@ class Poller : public Actor public: void init() override { - auto stream = make_stream (broker_id()); - subscribe (broker_id(),[stream,this] (auto) { - publish(stream); - }); - publish(stream); + // auto stream = make_stream (broker_id()); + // subscribe (broker_id(),[stream,this] (auto) { + // publish(stream); + // }); + // publish(stream); } }; diff --git a/src/server/sparkd/orderman2/mercury/Topic.h b/src/server/sparkd/orderman2/mercury/Topic.h deleted file mode 100644 index abf06ce99..000000000 --- a/src/server/sparkd/orderman2/mercury/Topic.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include -#include -#include "lib/utils/type_name.h" - -namespace bts { -namespace mercury { - -template -class Topic : public ITopic -{ -public: - using Tag = typename Event::Tag; - - Topic (const Tag &t) : _tag(t) {} - - SynopsisBuilderPtr make_synopsis_builder() const override { - return std::make_shared(); - } - - std::string to_str() const override { - return fmt::format ("{}/{}",std::string(utils::type_name()),tag()); - } - Tag const& tag() const {return _tag;} - -private: - typename Event::Tag _tag; - -}; - -}} diff --git a/src/server/sparkd/orderman2/mercury/CacheLast.h b/src/server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/CacheLast.h rename to src/server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h diff --git a/src/server/sparkd/orderman2/mercury/NoSynopsis.h b/src/server/sparkd/orderman2/mercury/synopsys_policies/NoSynopsis.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/NoSynopsis.h rename to src/server/sparkd/orderman2/mercury/synopsys_policies/NoSynopsis.h diff --git a/src/server/sparkd/orderman2/mercury/ITopic.cpp b/src/server/sparkd/orderman2/mercury/topics/ITopic.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/ITopic.cpp rename to src/server/sparkd/orderman2/mercury/topics/ITopic.cpp diff --git a/src/server/sparkd/orderman2/mercury/ITopic.h b/src/server/sparkd/orderman2/mercury/topics/ITopic.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/ITopic.h rename to src/server/sparkd/orderman2/mercury/topics/ITopic.h diff --git a/src/server/sparkd/orderman2/mercury/topics/Topic.h b/src/server/sparkd/orderman2/mercury/topics/Topic.h new file mode 100644 index 000000000..ab08ade88 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/topics/Topic.h @@ -0,0 +1,57 @@ +#pragma once + +#include +#include +#include "lib/utils/type_name.h" + +namespace bts { +namespace mercury { + +template< class... > +using void_t = void; + +template< class, class = void_t<> > +struct has_tag : std::false_type { }; + +template< class T > +struct has_tag> : std::true_type { }; + +template ::value> struct Topic2; + +template ::value> class Topic; + +template +class Topic : public ITopic +{ +public: + using Tag = typename EV::Tag; + + Topic (const Tag &t) : _tag(t) {} + + SynopsisBuilderPtr make_synopsis_builder() const override { + return std::make_shared(); + } + + std::string to_str() const override { + return fmt::format ("{}/{}",std::string(utils::type_name()),tag()); + } + Tag const& tag() const {return _tag;} + +private: + Tag _tag; +}; + +template +class Topic : public ITopic +{ +public: + SynopsisBuilderPtr make_synopsis_builder() const override { + return std::make_shared(); + } + + std::string to_str() const override { + return fmt::format ("{}",std::string(utils::type_name())); + } +}; + +}} diff --git a/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp b/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp new file mode 100644 index 000000000..96aa73cf8 --- /dev/null +++ b/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp @@ -0,0 +1,18 @@ +// #include "OrderServiceServer2.h" + +// namespace bts { +// namespace orderman2 { + +// struct OrderServiceServer2::PImpl +// { +// PImpl() +// {} +// }; + +// OrderServiceServer2::OrderServiceServer2 (bts::api::ServiceContext& ctx) : +// api::orderman2::OrderServiceBase(ctx), +// me (new PImpl()) +// { +// } + +// }} diff --git a/src/server/sparkd/orderman2/server/OrderServiceServer2.h b/src/server/sparkd/orderman2/server/OrderServiceServer2.h new file mode 100644 index 000000000..5d22bcf21 --- /dev/null +++ b/src/server/sparkd/orderman2/server/OrderServiceServer2.h @@ -0,0 +1,35 @@ +#pragma once + +#include +#include "lib/api/services/OrderService2.pb.h" +#include "lib/api/services/OrderService2.server.pb.h" + +namespace bts { +namespace orderman2 { + + +class OrderServiceServer2 : public api::orderman2::OrderServiceBase +{ +public: + OrderServiceServer2 (bts::api::ServiceContext& context); + ~OrderServiceServer2(); + + void create_order(const api::orderman2::Create& , + const std::function & ) override; + + void cancel_order(const api::orderman2::Cancel& , + const std::function & ) override; + + void update_order(const api::orderman2::Update& , + const std::function & ) override; + + void crack_order(const api::orderman2::Crack& , + const std::function & ) override; +private: + struct PImpl; + std::unique_ptr me; +}; + + + +}} From 6b87c2ea7809b4068057d4a92e12c6091cd51c43 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 2 Dec 2017 16:54:03 -0500 Subject: [PATCH 07/35] Refactor. --- .../orderman2/mercury/events/PollEvent.h | 14 ++++++ .../mercury/synopsys_policies/AppendVector.h | 43 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 src/server/sparkd/orderman2/mercury/events/PollEvent.h create mode 100644 src/server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h diff --git a/src/server/sparkd/orderman2/mercury/events/PollEvent.h b/src/server/sparkd/orderman2/mercury/events/PollEvent.h new file mode 100644 index 000000000..24d428338 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/events/PollEvent.h @@ -0,0 +1,14 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/Event.h" + +namespace bts { +namespace mercury { + +struct PollEvent : public Event +{ + using Tag = EventBrokerID; +}; + +}} diff --git a/src/server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h b/src/server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h new file mode 100644 index 000000000..934ff5050 --- /dev/null +++ b/src/server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h @@ -0,0 +1,43 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/mercury/ISynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/mercury_common.h" + +namespace bts { +namespace mercury { + +template +class AppendVector : public ISynopsisBuilder +{ +public: + AppendVector() : _synopsis(), _empty(true) {reset();} + + EventPayload* get_synopsis() + { + if (!_empty) + return &_synopsis; + else + return nullptr; + } + + void update(EventPayload const&pl) { + auto const &update = pl.unwrap (); + auto &previous = _synopsis.unwrap().vector(); + for (auto p : update.vector()) + previous.push_back(p); + }; + + void reset() + { + _empty = true; + _synopsis.wrap_in_place(); + } + +private: + EventPayload _synopsis; + bool _empty; +}; + + +}} From 8ccd3ee96daf378644280d23a51d9c1f72c80451 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 2 Dec 2017 16:54:35 -0500 Subject: [PATCH 08/35] Refactor. --- .../sparkd/orderman2/actors/SecuritySrc.cpp | 4 +- .../orderman2/events/NewSecuritiesEvent.h | 37 ++----------- src/server/sparkd/orderman2/mercury/Actor.cpp | 3 +- src/server/sparkd/orderman2/mercury/Actor.h | 55 ++++++++++--------- src/server/sparkd/orderman2/mercury/Event.h | 3 +- .../sparkd/orderman2/mercury/PollEvent.h | 14 ----- src/server/sparkd/orderman2/mercury/Poller.h | 2 +- .../sparkd/orderman2/mercury/topics/Topic.h | 4 ++ 8 files changed, 44 insertions(+), 78 deletions(-) delete mode 100644 src/server/sparkd/orderman2/mercury/PollEvent.h diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp index 64fe9e0ef..3d545809b 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp @@ -1,6 +1,6 @@ #include "SecuritySrc.h" #include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" -#include "server/sparkd/orderman2/mercury/PollEvent.h" +#include "server/sparkd/orderman2/mercury/events/PollEvent.h" #include "server/sparkd/persistence/SqliteStore.h" #include "lib/md/MDRecoverableConsumer.h" #include "lib/utils/bts_chrono.h" @@ -56,7 +56,7 @@ void SecuritySrc::init() {cache_if_new(sec);}); me->new_securities_stream = make_stream(); - subscribe (broker_id(),[this] (auto) {on_scan_securities();}); + subscribe (broker_id(),[this] (auto) {this->on_scan_securities();}); } void SecuritySrc::cache_if_new(api::Security const&sec) diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index 2c15d2a71..511f286ca 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -3,50 +3,25 @@ #include #include "server/sparkd/orderman2/mercury/Event.h" #include "lib/domain_model/Security.h" +#include "server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h" namespace bts { namespace orderman2 { class NewSecuritiesSynopsisBuider; -class NewSecuritiesEvent : public mercury::Event +class NewSecuritiesEvent : public mercury::Event { public: + using SynopsisBuilder = mercury::AppendVector; + NewSecuritiesEvent() : securities() {} NewSecuritiesEvent(std::vector&& secs) : securities(std::move(secs)) {} std::vector securities; + + auto const &vector() {return securities;} }; -class NewSecuritiesSynopsisBuider : public mercury::ISynopsisBuilder -{ -public: - NewSecuritiesSynopsisBuider() : _synopsis(), _empty(true) - {reset();} - - mercury::EventPayload* get_synopsis() - { - if (!_empty) - return &_synopsis; - else - return nullptr; - } - - void update(mercury::EventPayload const&pl) { - auto const &update = pl.unwrap (); - auto &previous = _synopsis.unwrap().securities; - for (auto p : update.securities) - previous.push_back(p); - }; - - void reset() { - _empty = true; - _synopsis.wrap_in_place (); - }; - -private: - mercury::EventPayload _synopsis; - bool _empty; -}; }} diff --git a/src/server/sparkd/orderman2/mercury/Actor.cpp b/src/server/sparkd/orderman2/mercury/Actor.cpp index 4261893a9..c6dfbe3bb 100644 --- a/src/server/sparkd/orderman2/mercury/Actor.cpp +++ b/src/server/sparkd/orderman2/mercury/Actor.cpp @@ -2,13 +2,14 @@ #include "server/sparkd/orderman/md/Book.h" #include "lib/domain_model/common.h" #include "server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h" +#include "server/sparkd/orderman2/mercury/Event.h" namespace bts { namespace mercury { class Book{}; -class BookUpdate { +class BookUpdate : public Event { public: using Tag = SecurityKey; using SynopsisBuilder = CacheLast; diff --git a/src/server/sparkd/orderman2/mercury/Actor.h b/src/server/sparkd/orderman2/mercury/Actor.h index 43251b28c..69c1e572a 100644 --- a/src/server/sparkd/orderman2/mercury/Actor.h +++ b/src/server/sparkd/orderman2/mercury/Actor.h @@ -12,9 +12,10 @@ namespace bts { namespace mercury { -template class Stream +template class Stream { public: + static_assert(std::is_base_of::value, "Only types derived from Event can be used in streams"); StreamID sid; }; @@ -29,12 +30,12 @@ public: virtual void init() = 0; virtual void finit() {}; - template - SubHandle subscribe(typename Event::Tag const &tag, CB const &cb) + template + SubHandle subscribe(typename EV::Tag const &tag, CB const &cb) { bts_assert(_broker); - using TopicType = Topic; - using UpdateType = Update; + using TopicType = Topic; + using UpdateType = Update; auto self = shared_from_this(); TopicFilter filter = [tag,self](const ITopic&t) { @@ -51,7 +52,7 @@ public: return; if (payload) - cb(UpdateType{sid,type, &(payload->unwrap())}); + cb(UpdateType{sid,type, &(payload->unwrap())}); else cb(UpdateType{sid,type,nullptr}); }; @@ -59,12 +60,12 @@ public: return _subscribe(filter,handler); } - template + template SubHandle subscribe(CB const &cb) { bts_assert(_broker); - using TopicType = Topic; - using UpdateType = Update; + using TopicType = Topic; + using UpdateType = Update; auto self = shared_from_this(); TopicFilter filter = [self](const ITopic&t) { @@ -78,7 +79,7 @@ public: return; if (payload) - cb(UpdateType{sid,type, &(payload->unwrap())}); + cb(UpdateType{sid,type, &(payload->unwrap())}); else cb(UpdateType{sid,type,nullptr}); }; @@ -86,12 +87,12 @@ public: return _subscribe(filter,handler); } - template + template SubHandle subscribe(F const &user_filter, CB const &cb) { bts_assert(_broker); - using TopicType = Topic; - using UpdateType = Update; + using TopicType = Topic; + using UpdateType = Update; auto self = shared_from_this(); TopicFilter filter = [self,user_filter](const ITopic&t) { @@ -108,7 +109,7 @@ public: return; if (payload) - cb(UpdateType{sid,type, &(payload->unwrap())}); + cb(UpdateType{sid,type, &(payload->unwrap())}); else cb(UpdateType{sid,type,nullptr}); }; @@ -123,37 +124,37 @@ public: _active_subs.erase(id); } - template - Stream make_stream(typename Event::Tag const& tag) + template + Stream make_stream(typename EV::Tag const& tag) { bts_assert(_broker); - using TopicType = Topic; + using TopicType = Topic; auto topic = std::make_shared (tag); auto sid = _broker->internal_advertise(topic); _active_streams.insert(sid); - return Stream {sid}; + return Stream {sid}; } - template - Stream make_stream() + template + Stream make_stream() { bts_assert(_broker); - using TopicType = Topic; + using TopicType = Topic; auto topic = std::make_shared (); auto sid = _broker->internal_advertise(topic); _active_streams.insert(sid); - return Stream {sid}; + return Stream {sid}; } - template - void publish(Stream const&stream,Args&&... args) + template + void publish(Stream const&stream,Args&&... args) { bts_assert(_broker); - _broker->internal_notify(stream.sid,std::forward(args)...); + _broker->internal_notify(stream.sid,std::forward(args)...); } - template - void destroy_stream(Stream const&stream) + template + void destroy_stream(Stream const&stream) { bts_assert(_broker); _active_streams.erase(stream.sid); diff --git a/src/server/sparkd/orderman2/mercury/Event.h b/src/server/sparkd/orderman2/mercury/Event.h index 87d7bcb54..11f0c0a63 100644 --- a/src/server/sparkd/orderman2/mercury/Event.h +++ b/src/server/sparkd/orderman2/mercury/Event.h @@ -6,11 +6,10 @@ namespace bts { namespace mercury { -template class Event { public: - using SynopsisBuilder = SynopsisBuilderT; + using SynopsisBuilder = NoSynopsis; }; }} diff --git a/src/server/sparkd/orderman2/mercury/PollEvent.h b/src/server/sparkd/orderman2/mercury/PollEvent.h deleted file mode 100644 index 1d178ad0c..000000000 --- a/src/server/sparkd/orderman2/mercury/PollEvent.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include -#include "server/sparkd/orderman2/mercury/Event.h" - -namespace bts { -namespace mercury { - -struct PollEvent : public Event<> -{ - using Tag = EventBrokerID; -}; - -}} diff --git a/src/server/sparkd/orderman2/mercury/Poller.h b/src/server/sparkd/orderman2/mercury/Poller.h index a59de0c54..1d596f04f 100644 --- a/src/server/sparkd/orderman2/mercury/Poller.h +++ b/src/server/sparkd/orderman2/mercury/Poller.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/PollEvent.h" +#include "server/sparkd/orderman2/mercury/events/PollEvent.h" #include "Actor.h" namespace bts { diff --git a/src/server/sparkd/orderman2/mercury/topics/Topic.h b/src/server/sparkd/orderman2/mercury/topics/Topic.h index ab08ade88..0b70eeb33 100644 --- a/src/server/sparkd/orderman2/mercury/topics/Topic.h +++ b/src/server/sparkd/orderman2/mercury/topics/Topic.h @@ -7,6 +7,8 @@ namespace bts { namespace mercury { +class Event; + template< class... > using void_t = void; @@ -24,6 +26,7 @@ template class Topic : public ITopic { public: + static_assert(std::is_base_of::value, "Only types derived from Event can be used in topics"); using Tag = typename EV::Tag; Topic (const Tag &t) : _tag(t) {} @@ -45,6 +48,7 @@ template class Topic : public ITopic { public: + static_assert(std::is_base_of::value, "Only types derived from Event can be used in topics"); SynopsisBuilderPtr make_synopsis_builder() const override { return std::make_shared(); } From 753134cbc552c2fa05bc2927bd3ba50ac350b369 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sun, 3 Dec 2017 15:41:38 -0500 Subject: [PATCH 09/35] Upgraded docker container --- docker/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux b/docker/linux index d4a32d325..51007176f 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit d4a32d32592c688c3a1f042750fd3323bcdfd38a +Subproject commit 51007176f8c2542e790fec2de9630969398451ce From 533132b4c1f68fb16fd9673df4c127a6af0dcfba Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sun, 3 Dec 2017 20:46:51 +0000 Subject: [PATCH 10/35] Merged --- src/lib/CMakeDeps.cmake | 2 +- src/server/sparkd/CMakeDeps.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index af27ebc3c..522e720d1 100644 --- 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/AccountService.proto;api/services/ApiUnitTestService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OrderService2.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/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.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;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/download.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/AccountService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OrderService2.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/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.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;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/download.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/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 2443838bb..4be5d5cf9 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/Actor.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/Poller.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.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/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckReturnStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/Actor.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/Poller.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file From bd5bb0716b0c4d1cf19c0ffc4efae5f3d5d0116d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Dec 2017 12:00:39 -0500 Subject: [PATCH 11/35] Refactor --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/main.cpp | 1 - src/server/sparkd/orderman/doc/event_flow.pdf | Bin 18094 -> 17650 bytes .../sparkd/orderman/doc/order_man_notes.org | 54 +++++++----------- .../sparkd/orderman2/actors/SecuritySrc.h | 2 +- .../orderman2/events/NewSecuritiesEvent.h | 2 +- .../sparkd/orderman2/mercury/Executor.h | 4 +- .../orderman2/mercury/{ => actors}/Actor.cpp | 6 +- .../orderman2/mercury/{ => actors}/Actor.h | 0 .../orderman2/mercury/{ => actors}/ActorPtr.h | 0 .../orderman2/mercury/{ => actors}/Poller.cpp | 0 .../orderman2/mercury/{ => actors}/Poller.h | 0 .../orderman2/mercury/{ => events}/Event.h | 0 .../orderman2/mercury/events/PollEvent.h | 2 +- 14 files changed, 29 insertions(+), 44 deletions(-) rename src/server/sparkd/orderman2/mercury/{ => actors}/Actor.cpp (91%) rename src/server/sparkd/orderman2/mercury/{ => actors}/Actor.h (100%) rename src/server/sparkd/orderman2/mercury/{ => actors}/ActorPtr.h (100%) rename src/server/sparkd/orderman2/mercury/{ => actors}/Poller.cpp (100%) rename src/server/sparkd/orderman2/mercury/{ => actors}/Poller.h (100%) rename src/server/sparkd/orderman2/mercury/{ => events}/Event.h (100%) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 4be5d5cf9..56b11349d 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/Actor.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/Poller.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/actors/Actor.cpp;orderman2/mercury/actors/Poller.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 61139cd7e..78357a13c 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -18,7 +18,6 @@ int main(int argc, char **argv) { using namespace bts; os::set_thread_name("main"); utils::init_spark_lib(); - BEGIN_CMD; REGISTER(Test); REGISTER(Help); diff --git a/src/server/sparkd/orderman/doc/event_flow.pdf b/src/server/sparkd/orderman/doc/event_flow.pdf index af25cadecad731b90e42e89fa111597da1d180fb..74b79d94a092af4cdca636f64dc29cb7374d7d5a 100644 GIT binary patch delta 16185 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 E0D5#PZ2$lO delta 16554 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 Fast_OM [label="xmgs"] - GW -> FillStore [label="xreport"] - SecFinder -> SecStore [label="raw_sec"] - SecStore -> Fast_OM [label="sec"] - SecStore -> Slow_OM [label="sec"] - Fast_OM -> Slow_OM [label="ostate"] - Slow_OM -> Fast_OM [label="ocrud"] - MD -> Fast_OM - MD -> Slow_OM - Slow_OM -> OrderStore [label="ostate"] - Time -> Slow_OM - - UI -> Fast_OM [label="ocrud"] - Time -> Fast_OM - Fast_OM -> GW [label="fix"] - Fast_OM -> Fast_OM [label="ostate | ocrud"] - Fast_OM -> OrderStore [label="ostate"] - - OrderStore -> UI [label="p_ostate"] - FillStore -> UI [label="p_fill_state"] + SecSrc -> GW [label=psec] + SecSrc -> OrderStore [label=psec] + SecSrc -> FastOM [label=psec] + GW -> FillStore [label=xmsgs] + GW -> FastOM [label=xmsgs] + FastOM -> GW [label=fix] + FastOM -> OrderStore [label=oupdate] + OrderStore -> FastOM [label=rec_orders] + OrderStore -> UI [label=orecs] + FillStore-> UI [label=frecs] + UI -> FastOM [label="crud"] + MDSrc -> FastOM [label="md"] } #+END_SRC diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.h b/src/server/sparkd/orderman2/actors/SecuritySrc.h index 7d8c30404..99df04d9c 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.h +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/Actor.h" +#include "server/sparkd/orderman2/mercury/actors/Actor.h" namespace bts { namespace api { class Security;} diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index 511f286ca..f71ee5cc0 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/Event.h" +#include "server/sparkd/orderman2/mercury/events/Event.h" #include "lib/domain_model/Security.h" #include "server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h" diff --git a/src/server/sparkd/orderman2/mercury/Executor.h b/src/server/sparkd/orderman2/mercury/Executor.h index a73cf49c0..600912cb9 100644 --- a/src/server/sparkd/orderman2/mercury/Executor.h +++ b/src/server/sparkd/orderman2/mercury/Executor.h @@ -4,8 +4,8 @@ #include #include "server/sparkd/orderman2/mercury/AsyncEventBroker.h" -#include "server/sparkd/orderman2/mercury/ActorPtr.h" -#include "server/sparkd/orderman2/mercury/Actor.h" +#include "server/sparkd/orderman2/mercury/actors/ActorPtr.h" +#include "server/sparkd/orderman2/mercury/actors/Actor.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/Actor.cpp b/src/server/sparkd/orderman2/mercury/actors/Actor.cpp similarity index 91% rename from src/server/sparkd/orderman2/mercury/Actor.cpp rename to src/server/sparkd/orderman2/mercury/actors/Actor.cpp index c6dfbe3bb..e7df1da17 100644 --- a/src/server/sparkd/orderman2/mercury/Actor.cpp +++ b/src/server/sparkd/orderman2/mercury/actors/Actor.cpp @@ -2,17 +2,17 @@ #include "server/sparkd/orderman/md/Book.h" #include "lib/domain_model/common.h" #include "server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h" -#include "server/sparkd/orderman2/mercury/Event.h" +#include "server/sparkd/orderman2/mercury/events/Event.h" namespace bts { namespace mercury { class Book{}; -class BookUpdate : public Event { -public: +struct BookUpdate : Event { using Tag = SecurityKey; using SynopsisBuilder = CacheLast; + BookUpdate(Book const &b) : book (b) {} Book book; }; diff --git a/src/server/sparkd/orderman2/mercury/Actor.h b/src/server/sparkd/orderman2/mercury/actors/Actor.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/Actor.h rename to src/server/sparkd/orderman2/mercury/actors/Actor.h diff --git a/src/server/sparkd/orderman2/mercury/ActorPtr.h b/src/server/sparkd/orderman2/mercury/actors/ActorPtr.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/ActorPtr.h rename to src/server/sparkd/orderman2/mercury/actors/ActorPtr.h diff --git a/src/server/sparkd/orderman2/mercury/Poller.cpp b/src/server/sparkd/orderman2/mercury/actors/Poller.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/Poller.cpp rename to src/server/sparkd/orderman2/mercury/actors/Poller.cpp diff --git a/src/server/sparkd/orderman2/mercury/Poller.h b/src/server/sparkd/orderman2/mercury/actors/Poller.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/Poller.h rename to src/server/sparkd/orderman2/mercury/actors/Poller.h diff --git a/src/server/sparkd/orderman2/mercury/Event.h b/src/server/sparkd/orderman2/mercury/events/Event.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/Event.h rename to src/server/sparkd/orderman2/mercury/events/Event.h diff --git a/src/server/sparkd/orderman2/mercury/events/PollEvent.h b/src/server/sparkd/orderman2/mercury/events/PollEvent.h index 24d428338..2c68703fa 100644 --- a/src/server/sparkd/orderman2/mercury/events/PollEvent.h +++ b/src/server/sparkd/orderman2/mercury/events/PollEvent.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/Event.h" +#include "server/sparkd/orderman2/mercury/events/Event.h" namespace bts { namespace mercury { From b04ec71146361b36ed9b898d55b6495cdde1be5d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Dec 2017 12:10:48 -0500 Subject: [PATCH 12/35] Refactor --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/orderman2/events/NewSecuritiesEvent.h | 2 +- src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp | 2 +- src/server/sparkd/orderman2/mercury/actors/Actor.cpp | 2 +- src/server/sparkd/orderman2/mercury/events/Event.h | 2 +- .../mercury/{synopsys_policies => synopsys}/AppendVector.h | 4 ++-- .../mercury/{synopsys_policies => synopsys}/CacheLast.h | 4 ++-- .../{ISynopsisBuilder.h => synopsys/ISynopsysBuilder.h} | 4 ++-- .../mercury/{synopsys_policies => synopsys}/NoSynopsis.h | 4 ++-- .../orderman2/mercury/{ => synopsys}/SynopsisBuilder.cpp | 0 .../sparkd/orderman2/mercury/{ => synopsys}/SynopsisBuilder.h | 0 src/server/sparkd/orderman2/mercury/topics/ITopic.h | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename src/server/sparkd/orderman2/mercury/{synopsys_policies => synopsys}/AppendVector.h (86%) rename src/server/sparkd/orderman2/mercury/{synopsys_policies => synopsys}/CacheLast.h (81%) rename src/server/sparkd/orderman2/mercury/{ISynopsisBuilder.h => synopsys/ISynopsysBuilder.h} (75%) rename src/server/sparkd/orderman2/mercury/{synopsys_policies => synopsys}/NoSynopsis.h (69%) rename src/server/sparkd/orderman2/mercury/{ => synopsys}/SynopsisBuilder.cpp (100%) rename src/server/sparkd/orderman2/mercury/{ => synopsys}/SynopsisBuilder.h (100%) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 56b11349d..b6280807d 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/actors/Actor.cpp;orderman2/mercury/actors/Poller.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/actors/Actor.cpp;orderman2/mercury/actors/Poller.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/synopsys/SynopsisBuilder.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index f71ee5cc0..5da7e696d 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -3,7 +3,7 @@ #include #include "server/sparkd/orderman2/mercury/events/Event.h" #include "lib/domain_model/Security.h" -#include "server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h" +#include "server/sparkd/orderman2/mercury/synopsys/AppendVector.h" namespace bts { namespace orderman2 { diff --git a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp index 72fb68ae8..fed6a12e7 100644 --- a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp +++ b/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp @@ -2,7 +2,7 @@ #include "lib/utils/Puid.h" #include "lib/utils/bts_assert.h" -#include "server/sparkd/orderman2/mercury/SynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" #include "server/sparkd/orderman2/mercury/topics/ITopic.h" #include diff --git a/src/server/sparkd/orderman2/mercury/actors/Actor.cpp b/src/server/sparkd/orderman2/mercury/actors/Actor.cpp index e7df1da17..6c49d4029 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Actor.cpp +++ b/src/server/sparkd/orderman2/mercury/actors/Actor.cpp @@ -1,7 +1,7 @@ #include "Actor.h" #include "server/sparkd/orderman/md/Book.h" #include "lib/domain_model/common.h" -#include "server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h" +#include "server/sparkd/orderman2/mercury/synopsys/CacheLast.h" #include "server/sparkd/orderman2/mercury/events/Event.h" namespace bts { diff --git a/src/server/sparkd/orderman2/mercury/events/Event.h b/src/server/sparkd/orderman2/mercury/events/Event.h index 11f0c0a63..8b6790a3b 100644 --- a/src/server/sparkd/orderman2/mercury/events/Event.h +++ b/src/server/sparkd/orderman2/mercury/events/Event.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys_policies/NoSynopsis.h" +#include "server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h b/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h similarity index 86% rename from src/server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h rename to src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h index 934ff5050..f62812a40 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h @@ -1,14 +1,14 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/ISynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" #include "server/sparkd/orderman2/mercury/mercury_common.h" namespace bts { namespace mercury { template -class AppendVector : public ISynopsisBuilder +class AppendVector : public ISynopsysBuilder { public: AppendVector() : _synopsis(), _empty(true) {reset();} diff --git a/src/server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h b/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h similarity index 81% rename from src/server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h rename to src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h index 9b0cfac47..5222d95d7 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h @@ -1,14 +1,14 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/ISynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" #include "server/sparkd/orderman2/mercury/mercury_common.h" namespace bts { namespace mercury { template -class CacheLast : public ISynopsisBuilder +class CacheLast : public ISynopsysBuilder { public: CacheLast() : _synopsis(), _empty(true) {} diff --git a/src/server/sparkd/orderman2/mercury/ISynopsisBuilder.h b/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h similarity index 75% rename from src/server/sparkd/orderman2/mercury/ISynopsisBuilder.h rename to src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h index e96ab19e3..02fd20a2b 100644 --- a/src/server/sparkd/orderman2/mercury/ISynopsisBuilder.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h @@ -6,7 +6,7 @@ namespace bts { namespace mercury { -class ISynopsisBuilder +class ISynopsysBuilder { public: EventPayload* get_synopsis() {return nullptr;} @@ -14,6 +14,6 @@ public: void reset() {}; }; -using SynopsisBuilderPtr = std::shared_ptr ; +using SynopsisBuilderPtr = std::shared_ptr ; }} diff --git a/src/server/sparkd/orderman2/mercury/synopsys_policies/NoSynopsis.h b/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h similarity index 69% rename from src/server/sparkd/orderman2/mercury/synopsys_policies/NoSynopsis.h rename to src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h index f219443e5..1a245ccb3 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys_policies/NoSynopsis.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h @@ -1,13 +1,13 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/ISynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" #include "server/sparkd/orderman2/mercury/mercury_common.h" namespace bts { namespace mercury { -class NoSynopsis : public ISynopsisBuilder +class NoSynopsis : public ISynopsysBuilder { public: EventPayload* get_synopsis() {return nullptr;} diff --git a/src/server/sparkd/orderman2/mercury/SynopsisBuilder.cpp b/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/SynopsisBuilder.cpp rename to src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.cpp diff --git a/src/server/sparkd/orderman2/mercury/SynopsisBuilder.h b/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/SynopsisBuilder.h rename to src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h diff --git a/src/server/sparkd/orderman2/mercury/topics/ITopic.h b/src/server/sparkd/orderman2/mercury/topics/ITopic.h index 240f1b449..e70ec197a 100644 --- a/src/server/sparkd/orderman2/mercury/topics/ITopic.h +++ b/src/server/sparkd/orderman2/mercury/topics/ITopic.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/ISynopsisBuilder.h" +#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" namespace bts { namespace mercury { From ed2f42f91a47709a3892955161588a25178aafd8 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Dec 2017 12:32:37 -0500 Subject: [PATCH 13/35] refacor --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Benchmark.cpp | 18 +++++++++--------- .../sparkd/orderman2/mercury/actors/Actor.h | 4 ++-- .../sparkd/orderman2/mercury/actors/Poller.h | 10 +++++----- .../mercury/{ => broker}/AsyncEventBroker.cpp | 0 .../mercury/{ => broker}/AsyncEventBroker.h | 6 +++--- .../mercury/{ => broker}/CoreEventBroker.cpp | 0 .../mercury/{ => broker}/CoreEventBroker.h | 2 +- .../mercury/{ => broker}/IEventBroker.cpp | 0 .../mercury/{ => broker}/IEventBroker.h | 2 +- .../orderman2/mercury/{ => events}/Update.h | 2 +- .../mercury/{ => mercury_utils}/Executor.cpp | 0 .../mercury/{ => mercury_utils}/Executor.h | 2 +- .../mercury/{ => mercury_utils}/FatWrapper.h | 2 +- .../{ => mercury_utils}/mercury_common.cpp | 0 .../{ => mercury_utils}/mercury_common.h | 4 ++-- .../orderman2/mercury/synopsys/AppendVector.h | 2 +- .../orderman2/mercury/synopsys/CacheLast.h | 2 +- .../mercury/synopsys/ISynopsysBuilder.h | 2 +- .../orderman2/mercury/synopsys/NoSynopsis.h | 2 +- .../mercury/synopsys/SynopsisBuilder.h | 2 +- .../orderman2/tests/fat_wrapper_tests.cpp | 14 +++++++------- 22 files changed, 39 insertions(+), 39 deletions(-) rename src/server/sparkd/orderman2/mercury/{ => broker}/AsyncEventBroker.cpp (100%) rename src/server/sparkd/orderman2/mercury/{ => broker}/AsyncEventBroker.h (98%) rename src/server/sparkd/orderman2/mercury/{ => broker}/CoreEventBroker.cpp (100%) rename src/server/sparkd/orderman2/mercury/{ => broker}/CoreEventBroker.h (94%) rename src/server/sparkd/orderman2/mercury/{ => broker}/IEventBroker.cpp (100%) rename src/server/sparkd/orderman2/mercury/{ => broker}/IEventBroker.h (90%) rename src/server/sparkd/orderman2/mercury/{ => events}/Update.h (71%) rename src/server/sparkd/orderman2/mercury/{ => mercury_utils}/Executor.cpp (100%) rename src/server/sparkd/orderman2/mercury/{ => mercury_utils}/Executor.h (93%) rename src/server/sparkd/orderman2/mercury/{ => mercury_utils}/FatWrapper.h (99%) rename src/server/sparkd/orderman2/mercury/{ => mercury_utils}/mercury_common.cpp (100%) rename src/server/sparkd/orderman2/mercury/{ => mercury_utils}/mercury_common.h (88%) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index b6280807d..60ee2ffef 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/actors/Actor.cpp;orderman2/mercury/actors/Poller.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/synopsys/SynopsisBuilder.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/actors/Actor.cpp;orderman2/mercury/actors/Poller.cpp;orderman2/mercury/broker/AsyncEventBroker.cpp;orderman2/mercury/broker/CoreEventBroker.cpp;orderman2/mercury/broker/IEventBroker.cpp;orderman2/mercury/mercury_utils/Executor.cpp;orderman2/mercury/mercury_utils/mercury_common.cpp;orderman2/mercury/synopsys/SynopsisBuilder.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index dec3a62d4..33cae9dbd 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -6,8 +6,8 @@ #include "server/sparkd/orderman/persistence/gen_order_id.h" #include "lib/api/services/OrderService.pb.h" #include "lib/utils/Uuid.h" -#include "server/sparkd/orderman2/mercury/FatWrapper.h" -#include "server/sparkd/orderman2/mercury/CoreEventBroker.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/orderman2/mercury/broker/CoreEventBroker.h" #include #include @@ -419,12 +419,12 @@ struct Notify { mercury::EventBrokerID id; mercury::SubID suid; mercury::StreamID sid; - mercury::FatWrapper<80> payload; + utils::FatWrapper<80> payload; }; static void queue_notification(benchmark::State &state) { - std::array,1> queue; + std::array,1> queue; for (auto _ : state) { auto &n = queue[0].wrap_in_place (); n.id = mercury::EventBrokerID(1); @@ -440,7 +440,7 @@ BENCHMARK(queue_notification); static void queue_notification2(benchmark::State &state) { - std::array,2> queue; + std::array,2> queue; auto &n = queue[0].wrap_in_place (); n.id = mercury::EventBrokerID(1); n.suid = mercury::SubID(1); @@ -483,7 +483,7 @@ BENCHMARK(moody_camel_queue); static void moody_camel_fat_push(benchmark::State &state) { - using Msg = mercury::FatWrapper<80> ; + using Msg = utils::FatWrapper<80> ; using Q = moodycamel::ConcurrentQueue ; Q queue; @@ -516,7 +516,7 @@ static void boost_lockless_stack(benchmark::State &state) } BENCHMARK(boost_lockless_stack); -using Msg = mercury::FatWrapper<80> ; +using Msg = utils::FatWrapper<80> ; struct PPQueue { std::atomic_flag _mutex = ATOMIC_FLAG_INIT; @@ -636,7 +636,7 @@ struct InternalUnsubscription { template static void lambda_alloc_copy(benchmark::State &state) { - mercury::FatWrapper<128> fw; + utils::FatWrapper<128> fw; using Action = std::function; T t; @@ -656,7 +656,7 @@ BENCHMARK_TEMPLATE(lambda_alloc_copy,InternalUnsubscription); template static void simple_alloc_copy(benchmark::State &state) { - mercury::FatWrapper<128> fw; + utils::FatWrapper<128> fw; for (auto _ : state) { benchmark::DoNotOptimize(fw.wrap_in_place()); } diff --git a/src/server/sparkd/orderman2/mercury/actors/Actor.h b/src/server/sparkd/orderman2/mercury/actors/Actor.h index 69c1e572a..4bc0276cf 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Actor.h +++ b/src/server/sparkd/orderman2/mercury/actors/Actor.h @@ -5,9 +5,9 @@ #include "lib/utils/bts_assert.h" #include "lib/utils/warn_ctrl.h" -#include "server/sparkd/orderman2/mercury/AsyncEventBroker.h" +#include "server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h" #include "server/sparkd/orderman2/mercury/topics/Topic.h" -#include "server/sparkd/orderman2/mercury/Update.h" +#include "server/sparkd/orderman2/mercury/events/Update.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/actors/Poller.h b/src/server/sparkd/orderman2/mercury/actors/Poller.h index 1d596f04f..5bfd248f8 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Poller.h +++ b/src/server/sparkd/orderman2/mercury/actors/Poller.h @@ -12,11 +12,11 @@ class Poller : public Actor public: void init() override { - // auto stream = make_stream (broker_id()); - // subscribe (broker_id(),[stream,this] (auto) { - // publish(stream); - // }); - // publish(stream); + auto stream = make_stream (broker_id()); + subscribe (broker_id(),[stream,this] (auto) { + this->publish(stream); + }); + publish(stream); } }; diff --git a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.cpp b/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/AsyncEventBroker.cpp rename to src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.cpp diff --git a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h b/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h similarity index 98% rename from src/server/sparkd/orderman2/mercury/AsyncEventBroker.h rename to src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h index 57cf96d85..439441072 100644 --- a/src/server/sparkd/orderman2/mercury/AsyncEventBroker.h +++ b/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h @@ -7,8 +7,8 @@ #include #include -#include "server/sparkd/orderman2/mercury/FatWrapper.h" -#include "server/sparkd/orderman2/mercury/CoreEventBroker.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/orderman2/mercury/broker/CoreEventBroker.h" namespace bts { namespace mercury { @@ -99,7 +99,7 @@ public: private: struct BrokerMsg { - FatWrapper<127-8-4> wrapper; + utils::FatWrapper<127-8-4> wrapper; void (*handle_msg) (AsyncEventBroker*self,BrokerMsg*m); bool is_external; }; diff --git a/src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp b/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/CoreEventBroker.cpp rename to src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.cpp diff --git a/src/server/sparkd/orderman2/mercury/CoreEventBroker.h b/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h similarity index 94% rename from src/server/sparkd/orderman2/mercury/CoreEventBroker.h rename to src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h index 3686bb762..9732deda2 100644 --- a/src/server/sparkd/orderman2/mercury/CoreEventBroker.h +++ b/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/IEventBroker.h" +#include "server/sparkd/orderman2/mercury/broker/IEventBroker.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/IEventBroker.cpp b/src/server/sparkd/orderman2/mercury/broker/IEventBroker.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/IEventBroker.cpp rename to src/server/sparkd/orderman2/mercury/broker/IEventBroker.cpp diff --git a/src/server/sparkd/orderman2/mercury/IEventBroker.h b/src/server/sparkd/orderman2/mercury/broker/IEventBroker.h similarity index 90% rename from src/server/sparkd/orderman2/mercury/IEventBroker.h rename to src/server/sparkd/orderman2/mercury/broker/IEventBroker.h index 1a594fae0..c2a498a0b 100644 --- a/src/server/sparkd/orderman2/mercury/IEventBroker.h +++ b/src/server/sparkd/orderman2/mercury/broker/IEventBroker.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_common.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" #include "server/sparkd/orderman2/mercury/topics/ITopic.h" namespace bts { diff --git a/src/server/sparkd/orderman2/mercury/Update.h b/src/server/sparkd/orderman2/mercury/events/Update.h similarity index 71% rename from src/server/sparkd/orderman2/mercury/Update.h rename to src/server/sparkd/orderman2/mercury/events/Update.h index f2ba47b18..bd8d5b8ba 100644 --- a/src/server/sparkd/orderman2/mercury/Update.h +++ b/src/server/sparkd/orderman2/mercury/events/Update.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_common.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/Executor.cpp b/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/Executor.cpp rename to src/server/sparkd/orderman2/mercury/mercury_utils/Executor.cpp diff --git a/src/server/sparkd/orderman2/mercury/Executor.h b/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h similarity index 93% rename from src/server/sparkd/orderman2/mercury/Executor.h rename to src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h index 600912cb9..315ad4828 100644 --- a/src/server/sparkd/orderman2/mercury/Executor.h +++ b/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h @@ -3,7 +3,7 @@ #include #include -#include "server/sparkd/orderman2/mercury/AsyncEventBroker.h" +#include "server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h" #include "server/sparkd/orderman2/mercury/actors/ActorPtr.h" #include "server/sparkd/orderman2/mercury/actors/Actor.h" diff --git a/src/server/sparkd/orderman2/mercury/FatWrapper.h b/src/server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h similarity index 99% rename from src/server/sparkd/orderman2/mercury/FatWrapper.h rename to src/server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h index 4814a2820..88e8b0503 100644 --- a/src/server/sparkd/orderman2/mercury/FatWrapper.h +++ b/src/server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h @@ -6,7 +6,7 @@ #include "lib/utils/bts_assert.h" namespace bts { -namespace mercury { +namespace utils { template void fat_wrapper_copy(std::array *dst, diff --git a/src/server/sparkd/orderman2/mercury/mercury_common.cpp b/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/mercury_common.cpp rename to src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.cpp diff --git a/src/server/sparkd/orderman2/mercury/mercury_common.h b/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h similarity index 88% rename from src/server/sparkd/orderman2/mercury/mercury_common.h rename to src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h index 6d98147f7..15ec6c56b 100644 --- a/src/server/sparkd/orderman2/mercury/mercury_common.h +++ b/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h @@ -3,7 +3,7 @@ #include #include #include -#include "server/sparkd/orderman2/mercury/FatWrapper.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" #include "lib/utils/ValueWrapper.h" namespace bts { @@ -17,7 +17,7 @@ using IEventBrokerPtr = std::shared_ptr ; using StreamID = utils::ValueWrapper; using SubID = utils::ValueWrapper; -using EventPayload = FatWrapper<80>; +using EventPayload = utils::FatWrapper<80>; using InternalSubID = utils::ValueWrapper; diff --git a/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h b/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h index f62812a40..b94e9038f 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h @@ -2,7 +2,7 @@ #include #include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_common.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h b/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h index 5222d95d7..a0db9e2c1 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h @@ -2,7 +2,7 @@ #include #include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_common.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h b/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h index 02fd20a2b..35b0d8ba7 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_common.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h b/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h index 1a245ccb3..a0bff728f 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h @@ -2,7 +2,7 @@ #include #include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_common.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h b/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h index b0ce12837..b75428ab0 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h +++ b/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_common.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp b/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp index 71870aec8..1baa9866f 100644 --- a/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp +++ b/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp @@ -1,4 +1,4 @@ -#include "server/sparkd/orderman2/mercury/FatWrapper.h" +#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" #include namespace bts { @@ -14,12 +14,12 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") SECTION("fat_wrapper_works_small") { - FatWrapper <128> fw; + utils::FatWrapper <128> fw; A a {"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); - FatWrapper<128> fw2; + utils::FatWrapper<128> fw2; fw2 = fw; REQUIRE(a == fw2.unwrap()); @@ -29,12 +29,12 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") SECTION("fat_wrapper_works_big") { - FatWrapper <32> fw; + utils::FatWrapper <32> fw; A a {"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); - FatWrapper<32> fw2; + utils::FatWrapper<32> fw2; fw2 = fw; REQUIRE(a == fw2.unwrap()); @@ -44,8 +44,8 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") SECTION("empty_can_be_copied") { - FatWrapper <64> fw; - FatWrapper <64> fw2; + utils::FatWrapper <64> fw; + utils::FatWrapper <64> fw2; fw2=fw; } } From dbc7ba5598914143134bdfbc65b89a6e0e4e47dc Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Dec 2017 12:36:53 -0500 Subject: [PATCH 14/35] Refactor. --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Benchmark.cpp | 4 ++-- src/server/sparkd/{orderman2 => }/mercury/actors/Actor.cpp | 4 ++-- src/server/sparkd/{orderman2 => }/mercury/actors/Actor.h | 6 +++--- src/server/sparkd/{orderman2 => }/mercury/actors/ActorPtr.h | 0 src/server/sparkd/{orderman2 => }/mercury/actors/Poller.cpp | 0 src/server/sparkd/{orderman2 => }/mercury/actors/Poller.h | 2 +- .../{orderman2 => }/mercury/broker/AsyncEventBroker.cpp | 0 .../{orderman2 => }/mercury/broker/AsyncEventBroker.h | 4 ++-- .../{orderman2 => }/mercury/broker/CoreEventBroker.cpp | 4 ++-- .../sparkd/{orderman2 => }/mercury/broker/CoreEventBroker.h | 2 +- .../sparkd/{orderman2 => }/mercury/broker/IEventBroker.cpp | 0 .../sparkd/{orderman2 => }/mercury/broker/IEventBroker.h | 4 ++-- src/server/sparkd/{orderman2 => }/mercury/events/Event.h | 2 +- .../sparkd/{orderman2 => }/mercury/events/PollEvent.h | 2 +- src/server/sparkd/{orderman2 => }/mercury/events/Update.h | 2 +- .../{orderman2 => }/mercury/mercury_utils/Executor.cpp | 0 .../sparkd/{orderman2 => }/mercury/mercury_utils/Executor.h | 6 +++--- .../{orderman2 => }/mercury/mercury_utils/FatWrapper.h | 0 .../mercury/mercury_utils/mercury_common.cpp | 0 .../{orderman2 => }/mercury/mercury_utils/mercury_common.h | 2 +- .../sparkd/{orderman2 => }/mercury/synopsys/AppendVector.h | 4 ++-- .../sparkd/{orderman2 => }/mercury/synopsys/CacheLast.h | 4 ++-- .../{orderman2 => }/mercury/synopsys/ISynopsysBuilder.h | 2 +- .../sparkd/{orderman2 => }/mercury/synopsys/NoSynopsis.h | 4 ++-- .../{orderman2 => }/mercury/synopsys/SynopsisBuilder.cpp | 0 .../{orderman2 => }/mercury/synopsys/SynopsisBuilder.h | 2 +- src/server/sparkd/{orderman2 => }/mercury/topics/ITopic.cpp | 0 src/server/sparkd/{orderman2 => }/mercury/topics/ITopic.h | 2 +- src/server/sparkd/{orderman2 => }/mercury/topics/Topic.h | 0 src/server/sparkd/orderman2/actors/SecuritySrc.cpp | 2 +- src/server/sparkd/orderman2/actors/SecuritySrc.h | 2 +- src/server/sparkd/orderman2/events/NewSecuritiesEvent.h | 4 ++-- src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp | 2 +- 34 files changed, 37 insertions(+), 37 deletions(-) rename src/server/sparkd/{orderman2 => }/mercury/actors/Actor.cpp (88%) rename src/server/sparkd/{orderman2 => }/mercury/actors/Actor.h (96%) rename src/server/sparkd/{orderman2 => }/mercury/actors/ActorPtr.h (100%) rename src/server/sparkd/{orderman2 => }/mercury/actors/Poller.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/actors/Poller.h (85%) rename src/server/sparkd/{orderman2 => }/mercury/broker/AsyncEventBroker.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/broker/AsyncEventBroker.h (98%) rename src/server/sparkd/{orderman2 => }/mercury/broker/CoreEventBroker.cpp (99%) rename src/server/sparkd/{orderman2 => }/mercury/broker/CoreEventBroker.h (94%) rename src/server/sparkd/{orderman2 => }/mercury/broker/IEventBroker.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/broker/IEventBroker.h (82%) rename src/server/sparkd/{orderman2 => }/mercury/events/Event.h (67%) rename src/server/sparkd/{orderman2 => }/mercury/events/PollEvent.h (70%) rename src/server/sparkd/{orderman2 => }/mercury/events/Update.h (71%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/Executor.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/Executor.h (83%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/FatWrapper.h (100%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/mercury_common.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/mercury_common.h (92%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/AppendVector.h (82%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/CacheLast.h (77%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/ISynopsysBuilder.h (79%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/NoSynopsis.h (62%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/SynopsisBuilder.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/SynopsisBuilder.h (72%) rename src/server/sparkd/{orderman2 => }/mercury/topics/ITopic.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/topics/ITopic.h (81%) rename src/server/sparkd/{orderman2 => }/mercury/topics/Topic.h (100%) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 60ee2ffef..6b4d0f038 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/actors/Actor.cpp;orderman2/mercury/actors/Poller.cpp;orderman2/mercury/broker/AsyncEventBroker.cpp;orderman2/mercury/broker/CoreEventBroker.cpp;orderman2/mercury/broker/IEventBroker.cpp;orderman2/mercury/mercury_utils/Executor.cpp;orderman2/mercury/mercury_utils/mercury_common.cpp;orderman2/mercury/synopsys/SynopsisBuilder.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 33cae9dbd..2c389e8b1 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -6,8 +6,8 @@ #include "server/sparkd/orderman/persistence/gen_order_id.h" #include "lib/api/services/OrderService.pb.h" #include "lib/utils/Uuid.h" -#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" -#include "server/sparkd/orderman2/mercury/broker/CoreEventBroker.h" +#include "server/sparkd/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/mercury/broker/CoreEventBroker.h" #include #include diff --git a/src/server/sparkd/orderman2/mercury/actors/Actor.cpp b/src/server/sparkd/mercury/actors/Actor.cpp similarity index 88% rename from src/server/sparkd/orderman2/mercury/actors/Actor.cpp rename to src/server/sparkd/mercury/actors/Actor.cpp index 6c49d4029..ee1f3ab35 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Actor.cpp +++ b/src/server/sparkd/mercury/actors/Actor.cpp @@ -1,8 +1,8 @@ #include "Actor.h" #include "server/sparkd/orderman/md/Book.h" #include "lib/domain_model/common.h" -#include "server/sparkd/orderman2/mercury/synopsys/CacheLast.h" -#include "server/sparkd/orderman2/mercury/events/Event.h" +#include "server/sparkd/mercury/synopsys/CacheLast.h" +#include "server/sparkd/mercury/events/Event.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/actors/Actor.h b/src/server/sparkd/mercury/actors/Actor.h similarity index 96% rename from src/server/sparkd/orderman2/mercury/actors/Actor.h rename to src/server/sparkd/mercury/actors/Actor.h index 4bc0276cf..f8be58a7f 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Actor.h +++ b/src/server/sparkd/mercury/actors/Actor.h @@ -5,9 +5,9 @@ #include "lib/utils/bts_assert.h" #include "lib/utils/warn_ctrl.h" -#include "server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h" -#include "server/sparkd/orderman2/mercury/topics/Topic.h" -#include "server/sparkd/orderman2/mercury/events/Update.h" +#include "server/sparkd/mercury/broker/AsyncEventBroker.h" +#include "server/sparkd/mercury/topics/Topic.h" +#include "server/sparkd/mercury/events/Update.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/actors/ActorPtr.h b/src/server/sparkd/mercury/actors/ActorPtr.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/actors/ActorPtr.h rename to src/server/sparkd/mercury/actors/ActorPtr.h diff --git a/src/server/sparkd/orderman2/mercury/actors/Poller.cpp b/src/server/sparkd/mercury/actors/Poller.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/actors/Poller.cpp rename to src/server/sparkd/mercury/actors/Poller.cpp diff --git a/src/server/sparkd/orderman2/mercury/actors/Poller.h b/src/server/sparkd/mercury/actors/Poller.h similarity index 85% rename from src/server/sparkd/orderman2/mercury/actors/Poller.h rename to src/server/sparkd/mercury/actors/Poller.h index 5bfd248f8..228b2b1ba 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Poller.h +++ b/src/server/sparkd/mercury/actors/Poller.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/events/PollEvent.h" +#include "server/sparkd/mercury/events/PollEvent.h" #include "Actor.h" namespace bts { diff --git a/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.cpp b/src/server/sparkd/mercury/broker/AsyncEventBroker.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.cpp rename to src/server/sparkd/mercury/broker/AsyncEventBroker.cpp diff --git a/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h b/src/server/sparkd/mercury/broker/AsyncEventBroker.h similarity index 98% rename from src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h rename to src/server/sparkd/mercury/broker/AsyncEventBroker.h index 439441072..8b92e3f58 100644 --- a/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h +++ b/src/server/sparkd/mercury/broker/AsyncEventBroker.h @@ -7,8 +7,8 @@ #include #include -#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" -#include "server/sparkd/orderman2/mercury/broker/CoreEventBroker.h" +#include "server/sparkd/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/mercury/broker/CoreEventBroker.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.cpp b/src/server/sparkd/mercury/broker/CoreEventBroker.cpp similarity index 99% rename from src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.cpp rename to src/server/sparkd/mercury/broker/CoreEventBroker.cpp index fed6a12e7..3016fd00f 100644 --- a/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.cpp +++ b/src/server/sparkd/mercury/broker/CoreEventBroker.cpp @@ -2,8 +2,8 @@ #include "lib/utils/Puid.h" #include "lib/utils/bts_assert.h" -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/topics/ITopic.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/topics/ITopic.h" #include #include diff --git a/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h b/src/server/sparkd/mercury/broker/CoreEventBroker.h similarity index 94% rename from src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h rename to src/server/sparkd/mercury/broker/CoreEventBroker.h index 9732deda2..67247c132 100644 --- a/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h +++ b/src/server/sparkd/mercury/broker/CoreEventBroker.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/broker/IEventBroker.h" +#include "server/sparkd/mercury/broker/IEventBroker.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/broker/IEventBroker.cpp b/src/server/sparkd/mercury/broker/IEventBroker.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/broker/IEventBroker.cpp rename to src/server/sparkd/mercury/broker/IEventBroker.cpp diff --git a/src/server/sparkd/orderman2/mercury/broker/IEventBroker.h b/src/server/sparkd/mercury/broker/IEventBroker.h similarity index 82% rename from src/server/sparkd/orderman2/mercury/broker/IEventBroker.h rename to src/server/sparkd/mercury/broker/IEventBroker.h index c2a498a0b..34dadaf05 100644 --- a/src/server/sparkd/orderman2/mercury/broker/IEventBroker.h +++ b/src/server/sparkd/mercury/broker/IEventBroker.h @@ -1,8 +1,8 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" -#include "server/sparkd/orderman2/mercury/topics/ITopic.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/topics/ITopic.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/events/Event.h b/src/server/sparkd/mercury/events/Event.h similarity index 67% rename from src/server/sparkd/orderman2/mercury/events/Event.h rename to src/server/sparkd/mercury/events/Event.h index 8b6790a3b..42cefc162 100644 --- a/src/server/sparkd/orderman2/mercury/events/Event.h +++ b/src/server/sparkd/mercury/events/Event.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h" +#include "server/sparkd/mercury/synopsys/NoSynopsis.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/events/PollEvent.h b/src/server/sparkd/mercury/events/PollEvent.h similarity index 70% rename from src/server/sparkd/orderman2/mercury/events/PollEvent.h rename to src/server/sparkd/mercury/events/PollEvent.h index 2c68703fa..6c337c54f 100644 --- a/src/server/sparkd/orderman2/mercury/events/PollEvent.h +++ b/src/server/sparkd/mercury/events/PollEvent.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/events/Event.h" +#include "server/sparkd/mercury/events/Event.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/events/Update.h b/src/server/sparkd/mercury/events/Update.h similarity index 71% rename from src/server/sparkd/orderman2/mercury/events/Update.h rename to src/server/sparkd/mercury/events/Update.h index bd8d5b8ba..d6be5f158 100644 --- a/src/server/sparkd/orderman2/mercury/events/Update.h +++ b/src/server/sparkd/mercury/events/Update.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.cpp b/src/server/sparkd/mercury/mercury_utils/Executor.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/mercury_utils/Executor.cpp rename to src/server/sparkd/mercury/mercury_utils/Executor.cpp diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h b/src/server/sparkd/mercury/mercury_utils/Executor.h similarity index 83% rename from src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h rename to src/server/sparkd/mercury/mercury_utils/Executor.h index 315ad4828..1f009f15f 100644 --- a/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h +++ b/src/server/sparkd/mercury/mercury_utils/Executor.h @@ -3,9 +3,9 @@ #include #include -#include "server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h" -#include "server/sparkd/orderman2/mercury/actors/ActorPtr.h" -#include "server/sparkd/orderman2/mercury/actors/Actor.h" +#include "server/sparkd/mercury/broker/AsyncEventBroker.h" +#include "server/sparkd/mercury/actors/ActorPtr.h" +#include "server/sparkd/mercury/actors/Actor.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h b/src/server/sparkd/mercury/mercury_utils/FatWrapper.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h rename to src/server/sparkd/mercury/mercury_utils/FatWrapper.h diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.cpp b/src/server/sparkd/mercury/mercury_utils/mercury_common.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.cpp rename to src/server/sparkd/mercury/mercury_utils/mercury_common.cpp diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h b/src/server/sparkd/mercury/mercury_utils/mercury_common.h similarity index 92% rename from src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h rename to src/server/sparkd/mercury/mercury_utils/mercury_common.h index 15ec6c56b..a789705e5 100644 --- a/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h +++ b/src/server/sparkd/mercury/mercury_utils/mercury_common.h @@ -3,7 +3,7 @@ #include #include #include -#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/mercury/mercury_utils/FatWrapper.h" #include "lib/utils/ValueWrapper.h" namespace bts { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h b/src/server/sparkd/mercury/synopsys/AppendVector.h similarity index 82% rename from src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h rename to src/server/sparkd/mercury/synopsys/AppendVector.h index b94e9038f..9e9d64210 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h +++ b/src/server/sparkd/mercury/synopsys/AppendVector.h @@ -1,8 +1,8 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h b/src/server/sparkd/mercury/synopsys/CacheLast.h similarity index 77% rename from src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h rename to src/server/sparkd/mercury/synopsys/CacheLast.h index a0db9e2c1..26b17caf3 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h +++ b/src/server/sparkd/mercury/synopsys/CacheLast.h @@ -1,8 +1,8 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h b/src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h similarity index 79% rename from src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h rename to src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h index 35b0d8ba7..a7869142f 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h +++ b/src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h b/src/server/sparkd/mercury/synopsys/NoSynopsis.h similarity index 62% rename from src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h rename to src/server/sparkd/mercury/synopsys/NoSynopsis.h index a0bff728f..5eb4ea0de 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h +++ b/src/server/sparkd/mercury/synopsys/NoSynopsis.h @@ -1,8 +1,8 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.cpp b/src/server/sparkd/mercury/synopsys/SynopsisBuilder.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.cpp rename to src/server/sparkd/mercury/synopsys/SynopsisBuilder.cpp diff --git a/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h b/src/server/sparkd/mercury/synopsys/SynopsisBuilder.h similarity index 72% rename from src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h rename to src/server/sparkd/mercury/synopsys/SynopsisBuilder.h index b75428ab0..ca94eef11 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h +++ b/src/server/sparkd/mercury/synopsys/SynopsisBuilder.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/topics/ITopic.cpp b/src/server/sparkd/mercury/topics/ITopic.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/topics/ITopic.cpp rename to src/server/sparkd/mercury/topics/ITopic.cpp diff --git a/src/server/sparkd/orderman2/mercury/topics/ITopic.h b/src/server/sparkd/mercury/topics/ITopic.h similarity index 81% rename from src/server/sparkd/orderman2/mercury/topics/ITopic.h rename to src/server/sparkd/mercury/topics/ITopic.h index e70ec197a..4f70ffbdc 100644 --- a/src/server/sparkd/orderman2/mercury/topics/ITopic.h +++ b/src/server/sparkd/mercury/topics/ITopic.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/topics/Topic.h b/src/server/sparkd/mercury/topics/Topic.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/topics/Topic.h rename to src/server/sparkd/mercury/topics/Topic.h diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp index 3d545809b..f12a7da59 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp @@ -1,6 +1,6 @@ #include "SecuritySrc.h" #include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" -#include "server/sparkd/orderman2/mercury/events/PollEvent.h" +#include "server/sparkd/mercury/events/PollEvent.h" #include "server/sparkd/persistence/SqliteStore.h" #include "lib/md/MDRecoverableConsumer.h" #include "lib/utils/bts_chrono.h" diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.h b/src/server/sparkd/orderman2/actors/SecuritySrc.h index 99df04d9c..3f28d8462 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.h +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/actors/Actor.h" +#include "server/sparkd/mercury/actors/Actor.h" namespace bts { namespace api { class Security;} diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index 5da7e696d..907495745 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -1,9 +1,9 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/events/Event.h" +#include "server/sparkd/mercury/events/Event.h" #include "lib/domain_model/Security.h" -#include "server/sparkd/orderman2/mercury/synopsys/AppendVector.h" +#include "server/sparkd/mercury/synopsys/AppendVector.h" namespace bts { namespace orderman2 { diff --git a/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp b/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp index 1baa9866f..effad2b46 100644 --- a/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp +++ b/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp @@ -1,4 +1,4 @@ -#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/mercury/mercury_utils/FatWrapper.h" #include namespace bts { From 38b5ebecc4c4e1b3b248cac431f1a821525cb738 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 5 Dec 2017 11:37:14 -0500 Subject: [PATCH 15/35] Added FIX gw. --- .../sparkd/mercury/events/TimerEvent.cpp | 5 + src/server/sparkd/mercury/events/TimerEvent.h | 17 ++ .../mercury/synopsys/AccumulateVector.h | 43 ++++ .../orderman2/actors/ExecutionGateway.cpp | 195 ++++++++++++++++++ .../orderman2/actors/ExecutionGateway.h | 38 ++++ .../orderman2/events/CancelRejectEvent.cpp | 6 + .../orderman2/events/CancelRejectEvent.h | 27 +++ .../events/GatewayStatusChangeEvent.h | 18 ++ .../events/NewExecutionReportEvent.cpp | 7 + .../events/NewExecutionReportEvent.h | 55 +++++ .../sparkd/orderman2/events/OutFIXMsgEvent.h | 21 ++ .../orderman2_utils/fix_order_codec.cpp | 1 + .../orderman2_utils/fix_order_codec.h | 49 +++++ .../orderman2_utils/orderman2_common.h | 73 +++++++ 14 files changed, 555 insertions(+) create mode 100644 src/server/sparkd/mercury/events/TimerEvent.cpp create mode 100644 src/server/sparkd/mercury/events/TimerEvent.h create mode 100644 src/server/sparkd/mercury/synopsys/AccumulateVector.h create mode 100644 src/server/sparkd/orderman2/actors/ExecutionGateway.cpp create mode 100644 src/server/sparkd/orderman2/actors/ExecutionGateway.h create mode 100644 src/server/sparkd/orderman2/events/CancelRejectEvent.cpp create mode 100644 src/server/sparkd/orderman2/events/CancelRejectEvent.h create mode 100644 src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h create mode 100644 src/server/sparkd/orderman2/events/NewExecutionReportEvent.cpp create mode 100644 src/server/sparkd/orderman2/events/NewExecutionReportEvent.h create mode 100644 src/server/sparkd/orderman2/events/OutFIXMsgEvent.h create mode 100644 src/server/sparkd/orderman2/orderman2_utils/fix_order_codec.cpp create mode 100644 src/server/sparkd/orderman2/orderman2_utils/fix_order_codec.h create mode 100644 src/server/sparkd/orderman2/orderman2_utils/orderman2_common.h diff --git a/src/server/sparkd/mercury/events/TimerEvent.cpp b/src/server/sparkd/mercury/events/TimerEvent.cpp new file mode 100644 index 000000000..7e865274d --- /dev/null +++ b/src/server/sparkd/mercury/events/TimerEvent.cpp @@ -0,0 +1,5 @@ +#include "TimerEvent.h" + +namespace bts { +namespace mercury { +}} diff --git a/src/server/sparkd/mercury/events/TimerEvent.h b/src/server/sparkd/mercury/events/TimerEvent.h new file mode 100644 index 000000000..4ed374f14 --- /dev/null +++ b/src/server/sparkd/mercury/events/TimerEvent.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include "server/sparkd/mercury/events/Event.h" +#include "lib/utils/bts_chrono.h" + +namespace bts { +namespace mercury { + +class TimerEvent : public Event +{ +public: + TimeStamp ts; + TimeStampStr ts_str; +}; + +}} diff --git a/src/server/sparkd/mercury/synopsys/AccumulateVector.h b/src/server/sparkd/mercury/synopsys/AccumulateVector.h new file mode 100644 index 000000000..cc4dd5bc1 --- /dev/null +++ b/src/server/sparkd/mercury/synopsys/AccumulateVector.h @@ -0,0 +1,43 @@ +#pragma once + +#include +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" + +namespace bts { +namespace mercury { + +template +class AccumulateVector : public ISynopsysBuilder +{ +public: + AccumulateVector() : _synopsis(), _empty(true) {reset();} + + EventPayload* get_synopsis() + { + if (!_empty) + return &_synopsis; + else + return nullptr; + } + + void update(EventPayload const&pl) { + auto const &update = pl.unwrap (); + auto &previous = _synopsis.unwrap().vector(); + for (auto p : update.vector()) + previous.push_back(p); + }; + + void reset() + { + _empty = true; + _synopsis.wrap_in_place(); + } + +private: + EventPayload _synopsis; + bool _empty; +}; + + +}} diff --git a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp new file mode 100644 index 000000000..4880e2913 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp @@ -0,0 +1,195 @@ +#include "ExecutionGateway.h" +#include "server/sparkd/jetfix/codec/MessageDefinitions.h" +#include "server/sparkd/jetfix/gateway/JetFIXGateway.h" +#include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" +#include "server/sparkd/orderman2/orderman2_utils/fix_order_codec.h" +#include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" +#include "server/sparkd/orderman2/events/GatewayStatusChangeEvent.h" +#include "server/sparkd/mercury/events/PollEvent.h" +#include "server/sparkd/orderman2/events/CancelRejectEvent.h" +#include "lib/utils/TimeStamp.h" + +#include "lib/logging/logging.h" + +#include + +namespace bts { +namespace orderman2 { + +using namespace jetfix; + +using JFGw = JetFIXGateway; + +struct ExecutionGateway::PImpl +{ + PImpl(config::JetFIX::Connection const&cfg) : + gw(cfg), + exe_report_pool (), + state(State::WAITNG_FOR_SECURITIES), + securities(), + exe_report_stream(), + gw_status_change_stream(), + cancel_reject_stream(), + gw_name(cfg.name()) + {} + + JFGw gw; + boost::object_pool exe_report_pool; + State state; + std::unordered_map securities; + mercury::Stream exe_report_stream; + mercury::Stream gw_status_change_stream; + mercury::Stream cancel_reject_stream; + GatewayName gw_name; +}; + +ExecutionGateway::ExecutionGateway (config::JetFIX::Connection const&cfg) : me (new PImpl(cfg)) {} +ExecutionGateway::~ExecutionGateway () {} + +void ExecutionGateway::init() +{ + me->state = State::WAITNG_FOR_SECURITIES; + subscribe([this] (auto const&sec_update) {on_securities(sec_update);}); +} + +void ExecutionGateway::on_securities(const mercury::Update &update) +{ + if (update.event) { + + for (auto sec_ptr : update.event->securities) + me->securities[sec_ptr->id()] = sec_ptr; + + if (me->state == State::WAITNG_FOR_SECURITIES) { + + // got our security synopsis, ready to start the GW + me->state = State::READY; + + // subscribe to gateway events + me->gw.on() = [this] (auto const&msg) {on_exe_report(msg);}; + me->gw.on() = [this] (auto const&msg) {on_cancel_reject(msg);}; + me->gw.on_ready() = [this] () {on_connection_status_change(true);}; + me->gw.on_disconnect() = [this] () {on_connection_status_change(false);}; + me->gw.on() = [this] (auto const&m) {on_business_reject(m);}; + me->gw.on() = [this] (auto const&m) {on_session_reject(m);}; + + // stream of execution reports + me->exe_report_stream = make_stream(me->gw_name); + + // stream for gateway status + me->gw_status_change_stream = make_stream(me->gw_name); + + // stream for cancel rejects + me->cancel_reject_stream = make_stream (me->gw_name); + + // start the gateway + me->gw.start(); + + // start polling + subscribe (broker_id(), [this] (auto const&) {on_poll();}); + } + } +} + +void ExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &msg) +{ + OrderKey ok; + SecurityKey sk; + decode_clorid(msg.get(),&ok, &sk); + + auto sec = me->securities[sk.value()]; + + if (!sec) + LOG(OrderMan,Error, + "Received execution report for an unknown security {}. Will not be " + " able to process this report. This is likely a bug that could lead to" + " lost fills. Please investigate.",sk.value()); + else { + // ignore leg fills, we care only about the actual security fill + if (msg.has() && msg.get() == 2) + return; + + std::string reject_msg; + if (msg.has()) + reject_msg = msg.get(); + + // allocate from our pool + auto data = me->exe_report_pool.construct(); + + // copy data from fix msg to our structure + str_to(msg.get(),&data->account_name); + str_to(msg.get(),&data->operator_id); + data->order_key = ok; + data->security = sec; + data->side = api::Side(msg.get()); + data->time_in_force = api::orderman2::TimeInForce(msg.get()); + data->order_type = api::orderman2::NativeOrderType(msg.get()); + data->exec_type = api::orderman2::ExecType(msg.get()); + data->order_status = api::orderman2::NativeOrderStatus(msg.get()); + data->manual_order_indicator = msg.get() ? + api::orderman2::MANUAL_ORDER_INDICATOR_YES : + api::orderman2::MANUAL_ORDER_INDICATOR_YES ; + str_to(msg.get(),&data->exchange_order_id); + data->price = securities::decode_exchange_price(*sec,Price (msg.get())); + data->order_quantity = Quantity(msg.get()); + data->filled_quantity = Quantity(msg.get()); + data->last_shares = msg.has()? Quantity(msg.get()):Quantity(0); + data->last_price = msg.has()? + securities::decode_exchange_price(*sec,Price(msg.get())) : Price(0); + data->avg_price = msg.has()? + securities::decode_exchange_price(*sec,Price(msg.get())) : Price(0); + str_to(msg.get(),&data->exchange_fill_id); + str_to(msg.get(),&data->transact_time); + data->reject_msg = reject_msg; + + publish(me->exe_report_stream,data); + } +} + +void ExecutionGateway::on_cancel_reject(const jetfix::fix::CancelRejectMsg &msg) +{ + OrderKey ok; + SecurityKey sk; + decode_clorid(msg.get(),&ok, &sk); + + std::string reject_msg; + if (msg.has()) + reject_msg = msg.get(); + else if (msg.has()) + reject_msg = fmt::format ("Order cancel was rejected with error code {}", msg.get()); + publish(me->cancel_reject_stream,ok,reject_msg); +} + +void ExecutionGateway::on_connection_status_change(bool is_connected) +{ + publish(me->gw_status_change_stream,is_connected); +} + +void ExecutionGateway::on_business_reject(jetfix::fix::BusinessMessageRejectMsg const&m) +{ + LOG(OrderMan,Error,"Unexpected business reject in {} gateway . Reason: {}. This should be investigated", + me->gw_name.value(), m.has() ? m.get() : std::string ("Unknown")); +} + +void ExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const&m) +{ + LOG(OrderMan,Error,"Unexpected reject message in {} gateway . Reason: {}. This should be investigated", + me->gw_name.value(), m.has() ? m.get() : std::string ("Unknown")); +} + +void ExecutionGateway::on_poll() +{me->gw.dispatch_events();} + +void ExecutionGateway::on_outgoing_fix( mercury::Update const&msg) +{ + if (msg.event) { + auto const &m = *msg.event; + LOG(Latency,Info, "Gateway {} {}", m.cid,utils::TimeStamp::now().to_uint64()); + me->gw.send(m.cid, m.msg); + } +} + +}} + diff --git a/src/server/sparkd/orderman2/actors/ExecutionGateway.h b/src/server/sparkd/orderman2/actors/ExecutionGateway.h new file mode 100644 index 000000000..6e92d60ac --- /dev/null +++ b/src/server/sparkd/orderman2/actors/ExecutionGateway.h @@ -0,0 +1,38 @@ +#pragma once + +#include +#include "lib/config/protos/jetfix.pb.h" +#include "server/sparkd/mercury/actors/Actor.h" +#include "server/sparkd/jetfix/codec/MessageDefinitions.h" +#include "server/sparkd/mercury/events/Update.h" +#include "server/sparkd/orderman2/events/OutFIXMsgEvent.h" + +namespace bts { +namespace mercury { class PollEvent;} +namespace orderman2 { +class NewSecuritiesEvent; + +class ExecutionGateway : public mercury::Actor +{ +public: + ExecutionGateway(config::JetFIX::Connection const&); + ~ExecutionGateway(); + void init() override; + +private: + enum class State {WAITNG_FOR_SECURITIES,READY}; + struct PImpl; + std::unique_ptr me; + + void on_securities(const mercury::Update &); + void on_exe_report(jetfix::fix::ExecutionReportMsg const&); + void on_cancel_reject(jetfix::fix::CancelRejectMsg const&); + void on_connection_status_change(bool connected); + void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const&); + void on_session_reject(jetfix::fix::RejectMsg const&); + void on_poll(); + void on_outgoing_fix(const mercury::Update &); +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/CancelRejectEvent.cpp b/src/server/sparkd/orderman2/events/CancelRejectEvent.cpp new file mode 100644 index 000000000..817c5fbf2 --- /dev/null +++ b/src/server/sparkd/orderman2/events/CancelRejectEvent.cpp @@ -0,0 +1,6 @@ +#include "CancelRejectEvent.h" + +namespace bts { +namespace orderman2 { + +}} diff --git a/src/server/sparkd/orderman2/events/CancelRejectEvent.h b/src/server/sparkd/orderman2/events/CancelRejectEvent.h new file mode 100644 index 000000000..9a28c97d0 --- /dev/null +++ b/src/server/sparkd/orderman2/events/CancelRejectEvent.h @@ -0,0 +1,27 @@ +#pragma once + +#include + +#include "lib/api/services/OrderService2.pb.h" +#include "lib/domain_model/common.h" +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { + +class CancelRejectEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + + CancelRejectEvent (OrderKey order_key, std::string const &rej) : + order_key(order_key), reject_msg(rej) + {} + + OrderKey order_key; + std::string reject_msg; +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h b/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h new file mode 100644 index 000000000..135eff26a --- /dev/null +++ b/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h @@ -0,0 +1,18 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/synopsys/CacheLast.h" + +namespace bts { +namespace orderman2 { + +class GatewayStatusChangeEvent : public mercury::Event { +public: + using Tag = GatewayName; + using SynopsisBuilder = mercury::CacheLast; + GatewayStatusChangeEvent(bool c) : is_connected(c) {} + bool is_connected; +}; + +}} diff --git a/src/server/sparkd/orderman2/events/NewExecutionReportEvent.cpp b/src/server/sparkd/orderman2/events/NewExecutionReportEvent.cpp new file mode 100644 index 000000000..fac8e8747 --- /dev/null +++ b/src/server/sparkd/orderman2/events/NewExecutionReportEvent.cpp @@ -0,0 +1,7 @@ +#include "NewExecutionReportEvent.h" + +namespace bts { +namespace orderman2 { + + +}} diff --git a/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h b/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h new file mode 100644 index 000000000..9e6f9f9e1 --- /dev/null +++ b/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h @@ -0,0 +1,55 @@ +#pragma once + + +#include "lib/api/services/OrderService2.pb.h" +#include "lib/domain_model/common.h" +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" +#include +#include "server/sparkd/mercury/events/Event.h" +#include "server/sparkd/mercury/synopsys/AccumulateVector.h" + +#include + +namespace bts { +namespace orderman2 { + +class NewExecutionReportEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + using SynopsysBuilder = mercury::AccumulateVector; + + struct Data { + AccountName account_name; + OperatorID operator_id; + OrderKey order_key; + api::Security const*security; + api::Side side; + api::orderman2::TimeInForce time_in_force; + api::orderman2::NativeOrderType order_type; + api::orderman2::ExecType exec_type; + api::orderman2::NativeOrderStatus order_status; + api::orderman2::ManualOrderIndicator manual_order_indicator; + ExchangeOrderID exchange_order_id; + Price price; + Quantity order_quantity; + Quantity filled_quantity; + Quantity last_shares; + Price last_price; + Price avg_price; + ExchangeFillID exchange_fill_id; + mercury::TimeStampStr transact_time; + std::string reject_msg; + }; + boost::container::small_vector data; + + boost::container::small_vector_base &vector() {return data;} + + NewExecutionReportEvent(const Data*dt) : data() {data.push_back(dt);} + NewExecutionReportEvent() : data() {} +}; + + +}} + diff --git a/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h b/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h new file mode 100644 index 000000000..9025ccfd3 --- /dev/null +++ b/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h @@ -0,0 +1,21 @@ +#pragma once +#include "server/sparkd/jetfix/common/OutFIXPtr.h" +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { + +class OutFIXMsgEvent : public mercury::Event { +public: + using Tag = GatewayName; + + OutFIXMsgEvent (TickToTradeCorID cid, jetfix::OutFIXPtr const&fix) : + cid(cid), msg(fix) + {} + + TickToTradeCorID cid; + jetfix::OutFIXPtr msg; +}; + +}} diff --git a/src/server/sparkd/orderman2/orderman2_utils/fix_order_codec.cpp b/src/server/sparkd/orderman2/orderman2_utils/fix_order_codec.cpp new file mode 100644 index 000000000..1122e6661 --- /dev/null +++ b/src/server/sparkd/orderman2/orderman2_utils/fix_order_codec.cpp @@ -0,0 +1 @@ +#include "fix_order_codec.h" diff --git a/src/server/sparkd/orderman2/orderman2_utils/fix_order_codec.h b/src/server/sparkd/orderman2/orderman2_utils/fix_order_codec.h new file mode 100644 index 000000000..d3c2c6bc7 --- /dev/null +++ b/src/server/sparkd/orderman2/orderman2_utils/fix_order_codec.h @@ -0,0 +1,49 @@ +#pragma once + +#include +#include + +#include "orderman2_common.h" +#include "server/sparkd/jetfix/codec/i32_toa.h" +#include "server/sparkd/jetfix/codec/MessageDefinitions.h" +#include "lib/utils/bts_assert.h" + +namespace bts { +namespace api {class Security;} + +namespace orderman2 { + +constexpr int clordid_sz() {return 20;} +constexpr int price_sz() {return 20;} +constexpr int quantity_sz() {return 6;} + +inline void encode_clorid(OrderKey ok, SecurityKey sk,std::string *out) { + u32_toa(sk.value(),&((*out)[0]),clordid_sz()/2); + u32_toa(ok.value(),&((*out)[clordid_sz()/2]),clordid_sz()/2); +} + +inline void decode_clorid(std::string const&in, OrderKey *ok, SecurityKey *sk) +{ + bts_assert(in.size() == clordid_sz()); + char buffer[clordid_sz()/2+1]; + buffer[clordid_sz()/2] = 0; + + std::memcpy(buffer,&in[0],clordid_sz()/2); + *sk = SecurityKey(std::atoi(buffer)); + + std::memcpy(buffer,&in[clordid_sz()/2],clordid_sz()/2); + *ok = OrderKey(std::atoi(buffer)); +} + +template +OrderKey get_order_key(MSG const &msg) +{ + + bts_assert(msg.template has ()); + OrderKey result; + SecurityKey dummy; + decode_clorid(msg.template get(),&result,&dummy); + return result; +} + +}} diff --git a/src/server/sparkd/orderman2/orderman2_utils/orderman2_common.h b/src/server/sparkd/orderman2/orderman2_utils/orderman2_common.h new file mode 100644 index 000000000..7de7e2bf3 --- /dev/null +++ b/src/server/sparkd/orderman2/orderman2_utils/orderman2_common.h @@ -0,0 +1,73 @@ +#pragma once + +#include +#include +#include +#include + +#include "lib/utils/ValueWrapper.h" +#include "lib/domain_model/common.h" +#include "lib/utils/bts_assert.h" + +namespace bts { +namespace api {class Security;} +namespace orderman2 { +using OrderKey = utils::ValueWrapper; +using OperatorID = utils::ValueWrapper>; +using AccountName = utils::ValueWrapper>; +using GatewayName = utils::ValueWrapper; +using ExchangeFillID = utils::ValueWrapper>; +using ExchangeOrderID = utils::ValueWrapper>; +using OrderTimeStamp = utils::ValueWrapper> ; +using SecurityPtr = const api::Security *; +using TickToTradeCorID = uint16_t; +const uint16_t NullTickToTradeCorID = 0; + +template void to_array(std::string const&str,std::array*out ) +{ + auto &result = *out; + bts_assert(str.size() <= N); + memset(&result[0],' ', N); + memcpy(&result[0],str.data(),str.size()); +} + +template void to_str(std::array const&in ,std::string *out) +{ + auto &result = *out; + result.resize(N); + memcpy(&result[0],in.data(),N); +} + +template +T to(std::string const&str) +{ + T result; + to_array(str,&result.value()); + return result; +} + +template +void str_to(std::string const&str,T* out) +{ + to_array(str,&out->value()); +} + +template +inline std::string to_str (T const&t) +{ + std::string result; + to_str(t.value(),&result); + return result; +} + +template +std::pair to_trim_str(std::array const&in) +{ + for (auto i = (size_t) 0; i < N; i++) + if (in[i] == ' ') + return std::make_pair (&in[0],i); + return std::make_pair (&in[0],N); +} + +}} + From 4afe973eb2a1bab5244b10808a095500720cf412 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 5 Dec 2017 11:37:32 -0500 Subject: [PATCH 16/35] Added FIX gw. --- src/lib/api/services/OrderService2.proto | 32 ++++++++++++++ src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Benchmark.cpp | 5 ++- src/server/sparkd/main.cpp | 1 + src/server/sparkd/mercury/actors/Actor.h | 5 ++- src/server/sparkd/mercury/events/Event.h | 1 + src/server/sparkd/mercury/events/PollEvent.h | 3 +- .../mercury/mercury_utils/mercury_common.h | 2 + .../sparkd/mercury/synopsys/AppendVector.h | 43 ------------------- .../sparkd/orderman/doc/order_man_notes.org | 37 ++++++---------- src/server/sparkd/orderman2/common/OrderKey.h | 10 ----- .../orderman2/events/NewSecuritiesEvent.h | 4 +- .../sparkd/orderman2/factory/OrderFactory.h | 2 +- src/server/sparkd/orderman2/orders/Order.h | 2 +- 14 files changed, 64 insertions(+), 85 deletions(-) delete mode 100644 src/server/sparkd/mercury/synopsys/AppendVector.h delete mode 100644 src/server/sparkd/orderman2/common/OrderKey.h diff --git a/src/lib/api/services/OrderService2.proto b/src/lib/api/services/OrderService2.proto index 8846d6540..f1472e07a 100644 --- a/src/lib/api/services/OrderService2.proto +++ b/src/lib/api/services/OrderService2.proto @@ -1,6 +1,7 @@ syntax="proto3"; package bts.api.orderman2; option csharp_namespace="bts.api.orderman2"; +option cc_enable_arenas = true; import "lib/api/apioptions.proto"; import "lib/domain_model/Security.proto"; @@ -210,6 +211,37 @@ enum NativeOrderStatus NATIVE_ORDER_STATUS_ORDER_NOT_FOUND = 89; } +enum NativeOrderType +{ + NATIVE_ORDER_TYPE_UNDEFINED = 0 ; + NATIVE_ORDER_TYPE_MARKET = 49 ; // 1 + NATIVE_ORDER_TYPE_LIMIT = 50 ; // 2 + NATIVE_ORDER_TYPE_STOP = 51 ; // 3 + NATIVE_ORDER_TYPE_STOP_LIMIT = 52 ; // 4 + NATIVE_ORDER_TYPE_MARKET_LIMIT = 75 ; // K +} + +enum ExecType +{ + EXEC_TYPE_UNDEFINED = 0 ; + EXEC_TYPE_NEW = 48 ; + EXEC_TYPE_PARTIAL_FILL = 49 ; + EXEC_TYPE_FILL = 50 ; + EXEC_TYPE_DONE = 51 ; + EXEC_TYPE_CANCELED = 52 ; + EXEC_TYPE_REPLACED = 53 ; + EXEC_TYPE_PENDING_CANCEL = 54 ; + EXEC_TYPE_STOPPED = 55 ; + EXEC_TYPE_REJECTED = 56 ; + EXEC_TYPE_SUSPENDED = 57 ; + EXEC_TYPE_PENDING_NEW = 65 ; + EXEC_TYPE_CALCULATED = 66 ; + EXEC_TYPE_EXPIRED = 67 ; + EXEC_TYPE_RESTATED = 68 ; + EXEC_TYPE_PENDING_REPLACE = 69 ; + EXEC_TYPE_CANCEL_ACK = 72 ; +} + enum SpreaderChildKind { SPREADER_CHILD_KIND_UNDEFINED = 0; SPREADER_CHILD_KIND_SPREADER_HEDGING = 1; diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 6b4d0f038..a24e089b7 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 2c389e8b1..1ea692882 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -8,6 +8,8 @@ #include "lib/utils/Uuid.h" #include "server/sparkd/mercury/mercury_utils/FatWrapper.h" #include "server/sparkd/mercury/broker/CoreEventBroker.h" +#include "lib/api/services/OrderService2.server.pb.h" +#include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" #include #include @@ -678,7 +680,8 @@ static void get_thread_id(benchmark::State &state) } } BENCHMARK(get_thread_id); - + + std::string Benchmark::help() { return "Run micro-benchmarks"; } } } diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 78357a13c..71cea8d67 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -16,6 +16,7 @@ int main(int argc, char **argv) { using namespace bts; + os::set_thread_name("main"); utils::init_spark_lib(); BEGIN_CMD; diff --git a/src/server/sparkd/mercury/actors/Actor.h b/src/server/sparkd/mercury/actors/Actor.h index f8be58a7f..14cc1459e 100644 --- a/src/server/sparkd/mercury/actors/Actor.h +++ b/src/server/sparkd/mercury/actors/Actor.h @@ -26,7 +26,8 @@ public: using SubHandle = InternalSubID; Actor() : _broker(nullptr),_active_streams(),_active_subs() {} - + virtual ~Actor() {} + virtual void init() = 0; virtual void finit() {}; @@ -60,7 +61,7 @@ public: return _subscribe(filter,handler); } - template + template SubHandle subscribe(CB const &cb) { bts_assert(_broker); diff --git a/src/server/sparkd/mercury/events/Event.h b/src/server/sparkd/mercury/events/Event.h index 42cefc162..0bc7187bf 100644 --- a/src/server/sparkd/mercury/events/Event.h +++ b/src/server/sparkd/mercury/events/Event.h @@ -2,6 +2,7 @@ #include #include "server/sparkd/mercury/synopsys/NoSynopsis.h" +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/mercury/events/PollEvent.h b/src/server/sparkd/mercury/events/PollEvent.h index 6c337c54f..49a08b97f 100644 --- a/src/server/sparkd/mercury/events/PollEvent.h +++ b/src/server/sparkd/mercury/events/PollEvent.h @@ -6,8 +6,9 @@ namespace bts { namespace mercury { -struct PollEvent : public Event +class PollEvent : public Event { +public: using Tag = EventBrokerID; }; diff --git a/src/server/sparkd/mercury/mercury_utils/mercury_common.h b/src/server/sparkd/mercury/mercury_utils/mercury_common.h index a789705e5..996cc7eae 100644 --- a/src/server/sparkd/mercury/mercury_utils/mercury_common.h +++ b/src/server/sparkd/mercury/mercury_utils/mercury_common.h @@ -34,4 +34,6 @@ using InternalEventHandler = std::function> ; + }} diff --git a/src/server/sparkd/mercury/synopsys/AppendVector.h b/src/server/sparkd/mercury/synopsys/AppendVector.h deleted file mode 100644 index 9e9d64210..000000000 --- a/src/server/sparkd/mercury/synopsys/AppendVector.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include -#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/mercury/mercury_utils/mercury_common.h" - -namespace bts { -namespace mercury { - -template -class AppendVector : public ISynopsysBuilder -{ -public: - AppendVector() : _synopsis(), _empty(true) {reset();} - - EventPayload* get_synopsis() - { - if (!_empty) - return &_synopsis; - else - return nullptr; - } - - void update(EventPayload const&pl) { - auto const &update = pl.unwrap (); - auto &previous = _synopsis.unwrap().vector(); - for (auto p : update.vector()) - previous.push_back(p); - }; - - void reset() - { - _empty = true; - _synopsis.wrap_in_place(); - } - -private: - EventPayload _synopsis; - bool _empty; -}; - - -}} diff --git a/src/server/sparkd/orderman/doc/order_man_notes.org b/src/server/sparkd/orderman/doc/order_man_notes.org index 4f2c7b28e..b47b5abad 100644 --- a/src/server/sparkd/orderman/doc/order_man_notes.org +++ b/src/server/sparkd/orderman/doc/order_man_notes.org @@ -373,7 +373,6 @@ CheckSum = 151 10=151 - Strategies - Mean Reversion - * Event Flow #+begin_src dot :file event_flow.pdf :cmdline -Kdot -Tpdf digraph G { @@ -419,25 +418,17 @@ digraph G { #+RESULTS: [[file:event_flow.pdf]] -* order state, order def -OrderDef - uint32 security_key = 1; - api.Side side = 2; - double price = 3; - uint32 quantity = 4; - string login = 5; - string account = 6; - TimeInForce time_in_force = 7; - ManualOrderIndicator manual_order_indicator = 8; - CTICode cti_code = 9; - google.protobuf.Timestamp timestamp = 10; -OrderState - uint32 parent_order_key = 2; - google.protobuf.Timestamp timestamp = 3; - StdOrderStatus status = 4; - double price = 5; - uint32 quantity = 6; - uint32 filled_quantity=7; - double last_price = 8; - double avg_price = 9; - string last_msg = 10; +* Better even broker: +** unbundle events from topics and synopsis. +- develop Channels = Channel +- probably subscription would be made on the channel but the cb would + only mention the event. should be possible to view the tag on the callback +** automatic singleton subscriptions +- where a sub maps to exactly one stream at a time +** differentiate between routing nodes and local nodes +- so that we do not need routing when there is a direct link to + another node +** allow for merging of channels + + + diff --git a/src/server/sparkd/orderman2/common/OrderKey.h b/src/server/sparkd/orderman2/common/OrderKey.h deleted file mode 100644 index 16ee4b03e..000000000 --- a/src/server/sparkd/orderman2/common/OrderKey.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "lib/utils/ValueWrapper.h" - -namespace bts { -namespace orderman2 { -using OrderKey = utils::ValueWrapper; -}} - - diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index 907495745..ccc138e92 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -3,7 +3,7 @@ #include #include "server/sparkd/mercury/events/Event.h" #include "lib/domain_model/Security.h" -#include "server/sparkd/mercury/synopsys/AppendVector.h" +#include "server/sparkd/mercury/synopsys/AccumulateVector.h" namespace bts { namespace orderman2 { @@ -13,7 +13,7 @@ class NewSecuritiesSynopsisBuider; class NewSecuritiesEvent : public mercury::Event { public: - using SynopsisBuilder = mercury::AppendVector; + using SynopsisBuilder = mercury::AccumulateVector; NewSecuritiesEvent() : securities() {} NewSecuritiesEvent(std::vector&& secs) : securities(std::move(secs)) {} diff --git a/src/server/sparkd/orderman2/factory/OrderFactory.h b/src/server/sparkd/orderman2/factory/OrderFactory.h index d3dfcf4e6..13b4608ee 100644 --- a/src/server/sparkd/orderman2/factory/OrderFactory.h +++ b/src/server/sparkd/orderman2/factory/OrderFactory.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/common/OrderKey.h" +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" // fwds namespace bts { diff --git a/src/server/sparkd/orderman2/orders/Order.h b/src/server/sparkd/orderman2/orders/Order.h index 4d6d5ec48..98e35780e 100644 --- a/src/server/sparkd/orderman2/orders/Order.h +++ b/src/server/sparkd/orderman2/orders/Order.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/common/OrderKey.h" +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include "lib/domain_model/common.h" // fwds From 199a7a2da3e7020e9eb7c2dd256a4323e2a96a1e Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 6 Dec 2017 16:07:54 -0500 Subject: [PATCH 17/35] Made generated API C++ a bit more readeable. --- src/lib/api/public/ApiServer.h | 2 ++ src/lib/api/service_compiler/templates/cpp/server.pb.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/api/public/ApiServer.h b/src/lib/api/public/ApiServer.h index e50be4d3a..6608c1481 100644 --- a/src/lib/api/public/ApiServer.h +++ b/src/lib/api/public/ApiServer.h @@ -15,6 +15,8 @@ namespace bts { namespace api { +template using Response = std::function; + class ServiceContext; class BTS_EXPORT ApiServer { diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index bf871d788..e582225e0 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -36,7 +36,9 @@ protected: {{cap name}}Publisher make_{{name}}_publisher(const {{input_type}}& qualifier) const; {{else}} // {{comment}} - virtual void {{name}}(const {{input_type}}& request, const std::function& reply) = 0; + virtual void {{name}}( + const {{input_type}}& request, + const api::Response<{{output_type_cpp}}>& reply) = 0; {{/if}} {{/each}} From fd2a42246856021b11647ea48cbd4d34ba4da6aa Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 7 Dec 2017 12:31:46 -0500 Subject: [PATCH 18/35] Orderman2 --- src/lib/api/services/OrderService2.proto | 107 ++++++++---------- src/lib/domain_model/common.h | 3 + src/lib/utils/SpinLock.h | 23 ++++ src/lib/utils/ValueWrapper.h | 12 ++ src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Benchmark.cpp | 45 +++++++- src/server/sparkd/cmds/Run.cpp | 3 +- .../sparkd/mercury/broker/AsyncEventBroker.h | 5 +- .../sparkd/mercury/mercury_utils/Executor.h | 4 +- src/server/sparkd/orderman/doc/event_flow.pdf | Bin 17650 -> 0 bytes .../sparkd/orderman/tests/tests_common.h | 12 +- .../orderman2/actors/ExecutionGateway.cpp | 21 ++-- .../sparkd/orderman2/actors/OrderManager.cpp | 51 +++++++++ .../sparkd/orderman2/actors/OrderManager.h | 34 ++++++ .../sparkd/orderman2/actors/SecuritySrc.cpp | 1 + .../sparkd/orderman2/actors/SecuritySrc.h | 1 + .../sparkd/orderman2/doc/event_flow.pdf | Bin 0 -> 18731 bytes .../doc/order_man_notes.org | 60 ++++------ .../sparkd/orderman2/factory/OrderBuilder.cpp | 7 -- .../sparkd/orderman2/factory/OrderBuilder.h | 28 ----- .../sparkd/orderman2/factory/OrderFactory.cpp | 7 -- .../sparkd/orderman2/factory/OrderFactory.h | 31 ----- .../order_factory/IOrderBuilderFactory.h | 16 +++ .../orderman2/order_factory/IOrderFactory.h | 28 +++++ .../orderman2/order_factory/OrderBuilder.h | 11 ++ .../orderman2/order_factory/OrderFactory.cpp | 93 +++++++++++++++ .../orderman2/order_factory/OrderFactory.h | 31 +++++ .../sparkd/orderman2/orders/LimitOrder.h | 21 ++++ src/server/sparkd/orderman2/orders/Order.cpp | 52 --------- src/server/sparkd/orderman2/orders/Order.h | 47 ++++---- .../orderman2/server/OrderServiceServer2.cpp | 94 ++++++++++++--- .../orderman2/server/OrderServiceServer2.h | 19 ++-- src/server/sparkd/securities/ISecurityDB.h | 4 +- src/server/sparkd/securities/MapSecurityDB.h | 23 ++++ 34 files changed, 599 insertions(+), 297 deletions(-) create mode 100644 src/lib/utils/SpinLock.h delete mode 100644 src/server/sparkd/orderman/doc/event_flow.pdf create mode 100644 src/server/sparkd/orderman2/actors/OrderManager.cpp create mode 100644 src/server/sparkd/orderman2/actors/OrderManager.h create mode 100644 src/server/sparkd/orderman2/doc/event_flow.pdf rename src/server/sparkd/{orderman => orderman2}/doc/order_man_notes.org (95%) delete mode 100644 src/server/sparkd/orderman2/factory/OrderBuilder.cpp delete mode 100644 src/server/sparkd/orderman2/factory/OrderBuilder.h delete mode 100644 src/server/sparkd/orderman2/factory/OrderFactory.cpp delete mode 100644 src/server/sparkd/orderman2/factory/OrderFactory.h create mode 100644 src/server/sparkd/orderman2/order_factory/IOrderBuilderFactory.h create mode 100644 src/server/sparkd/orderman2/order_factory/IOrderFactory.h create mode 100644 src/server/sparkd/orderman2/order_factory/OrderBuilder.h create mode 100644 src/server/sparkd/orderman2/order_factory/OrderFactory.cpp create mode 100644 src/server/sparkd/orderman2/order_factory/OrderFactory.h create mode 100644 src/server/sparkd/orderman2/orders/LimitOrder.h create mode 100644 src/server/sparkd/securities/MapSecurityDB.h diff --git a/src/lib/api/services/OrderService2.proto b/src/lib/api/services/OrderService2.proto index f1472e07a..64792d512 100644 --- a/src/lib/api/services/OrderService2.proto +++ b/src/lib/api/services/OrderService2.proto @@ -38,20 +38,57 @@ message FillsSub {} message GatewayStatusSub {} message OrderDefinition { - StdDefinition std= 1; - ExtendedDefinition special= 2; + // standard order elements + uint32 security_key = 1; + api.Side side = 2; + double initial_price = 3; + uint32 initial_quantity = 4; + string login = 5; + string account = 6; + TimeInForce time_in_force = 7; + ManualOrderIndicator manual_order_indicator = 8; + CTICode cti_code = 9; + + oneof custom { + LimitOrderDefinition limit = 10; + MarketOrderDefinition market = 11; + StopMarketOrderDefinition stop_market = 12; + StopLimitOrderDefinition stop_limit = 13; + IcebergOrderDefinition iceberg = 14; + SpreaderOrderDefinition spreader = 15; + TimeBoxOrderDefinition time_box = 16; + } } message OrderRecord { - uint32 order_key = 1 [(bts.api.key)=true]; + uint32 key = 1 [(bts.api.key)=true]; uint32 parent_key = 2; + OrderDefinition def = 3; OrderState state = 4; } message OrderState { - StdState std = 1; - ExtendedState special = 2; + + // standard order state + OrderStatus status = 1; + double price = 2; + uint32 quantity = 3; + uint32 filled_quantity=4; + double last_price = 5; + double avg_price = 6; + string last_msg = 7; + google.protobuf.Timestamp last_change = 8; + + oneof custom { + LimitOrderState limit = 9; + MarketOrderState market = 10; + StopMarketOrderState stop_market = 11; + StopLimitOrderState stop_limit = 12; + IcebergOrderState iceberg = 13; + SpreaderOrderState spreader = 14; + TimeBoxOrderState time_box = 15; + } } // only native orders have fills @@ -73,29 +110,6 @@ message GatewayStatusUpdate { string gateway_name = 3 [(bts.api.key)=true]; } -message StdState { - google.protobuf.Timestamp timestamp = 3; - StdOrderStatus status = 4; - double price = 5; - uint32 quantity = 6; - uint32 filled_quantity=7; - double last_price = 8; - double avg_price = 9; - string last_msg = 10; -} - -message ExtendedState { - oneof special { - LimitOrderState limit = 1; - MarketOrderState market = 2; - StopMarketOrderState stop_market = 3; - StopLimitOrderState stop_limit = 4; - IcebergOrderState iceberg = 5; - SpreaderOrderState spreader = 6; - TimeBoxOrderState time_box = 7; - } -} - message LimitOrderState {NativeOrderStatus native_status = 1;} message MarketOrderState {NativeOrderStatus native_status = 1;} message StopMarketOrderState {NativeOrderStatus native_status = 1;} @@ -104,31 +118,6 @@ message IcebergOrderState {} message SpreaderOrderState {SpreaderChildKind child_kind = 1;} message TimeBoxOrderState {} -message StdDefinition { - uint32 security_key = 1; - api.Side side = 2; - double initial_price = 3; - uint32 initial_quantity = 4; - string login = 5; - string account = 6; - TimeInForce time_in_force = 7; - ManualOrderIndicator manual_order_indicator = 8; - CTICode cti_code = 9; - google.protobuf.Timestamp timestamp = 10; -} - -message ExtendedDefinition { - oneof extended { - LimitOrderDefinition limit = 1; - MarketOrderDefinition market = 2; - StopMarketOrderDefinition stop_market = 3; - StopLimitOrderDefinition stop_limit = 4; - IcebergOrderDefinition iceberg = 5; - SpreaderOrderDefinition spreader = 6; - TimeBoxOrderDefinition time_box = 7; - } -} - message LimitOrderDefinition {} message MarketOrderDefinition {} message StopMarketOrderDefinition {double stop_price = 1;} @@ -137,27 +126,27 @@ message IcebergOrderDefinition {double show_price = 1; OrderDefinition child = 2 message SpreaderOrderDefinition {api.Security security = 1; spark.ExecutionStrategy execution_strategy = 2;} message TimeBoxOrderDefinition {google.protobuf.Timestamp start = 1; google.protobuf.Timestamp stop = 2;} -enum StdOrderStatus { +enum OrderStatus { // The order is has been constructed but not acted on. Inactive // orders can be abandoned without consequences. The UI should // hide orders in this state. - STD_ORDER_STATUS_INACTIVE = 0; + ORDER_STATUS_INACTIVE = 0; // The order is currently working, i.e. its algorithm is operating. - STD_ORDER_STATUS_ACTIVE = 1; + ORDER_STATUS_ACTIVE = 1; // The order has completed successfully and accomplished its // goal. This is a terminal state. - STD_ORDER_STATUS_COMPLETED = 2; + ORDER_STATUS_COMPLETED = 2; // The order was terminated orderly before it had a chance to // complete. This is a terminal state. - STD_ORDER_STATUS_CANCELED = 3; + ORDER_STATUS_CANCELED = 3; // The order has encountered an unexpected condition from which it // cannot recover. This a terminal state. - STD_ORDER_STATUS_ERROR = 4; + ORDER_STATUS_ERROR = 4; } enum TimeInForce { diff --git a/src/lib/domain_model/common.h b/src/lib/domain_model/common.h index 933528f3a..2f474c0c1 100644 --- a/src/lib/domain_model/common.h +++ b/src/lib/domain_model/common.h @@ -7,6 +7,9 @@ namespace bts { using SecurityKey = utils::ValueWrapper; + + + using Price = utils::ValueWrapper; using Quantity = utils::ValueWrapper; using UserLogin = utils::ValueWrapper; diff --git a/src/lib/utils/SpinLock.h b/src/lib/utils/SpinLock.h new file mode 100644 index 000000000..e124a2bbf --- /dev/null +++ b/src/lib/utils/SpinLock.h @@ -0,0 +1,23 @@ +#pragma once + +#include + +namespace bts { +namespace utils { + +class SpinLock +{ +public: + void lock() { + while (_mutex.test_and_set(std::memory_order_acquire)); + } + void unlock() { + _mutex.clear(std::memory_order_release); + } + +private: + std::atomic_flag _mutex = ATOMIC_FLAG_INIT; +}; + +}} + diff --git a/src/lib/utils/ValueWrapper.h b/src/lib/utils/ValueWrapper.h index 433384376..6c8b8692b 100644 --- a/src/lib/utils/ValueWrapper.h +++ b/src/lib/utils/ValueWrapper.h @@ -39,3 +39,15 @@ std::ostream& operator<<(std::ostream &s, ValueWrapper const&v) } }} + +namespace std { +template +struct hash> +{ + std::size_t operator()(const bts::utils::ValueWrapper & k) const + { + return hash()(k.value()); + } +}; + +} diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index a24e089b7..cd36ea3e2 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/OrderManager.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 1ea692882..a95b99491 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -9,7 +9,9 @@ #include "server/sparkd/mercury/mercury_utils/FatWrapper.h" #include "server/sparkd/mercury/broker/CoreEventBroker.h" #include "lib/api/services/OrderService2.server.pb.h" +#include "lib/utils/SpinLock.h" #include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" +#include "server/sparkd/orderman/native_orders/NativeOrderFIXData.h" #include #include @@ -199,6 +201,17 @@ static void spin_lock_unlock(benchmark::State &state) { BENCHMARK(spin_lock_unlock); +static void bts_spinlock_lock_unlock(benchmark::State &state) { + int i = 0; + utils::SpinLock l; + for (auto _ : state) { + std::lock_guard g(l); + benchmark::DoNotOptimize(i++); + } +} +BENCHMARK(bts_spinlock_lock_unlock); + + struct IntId { IntId() { @@ -681,8 +694,38 @@ static void get_thread_id(benchmark::State &state) } BENCHMARK(get_thread_id); +static void native_order_fix_data_create(benchmark::State &state) +{ + auto sz = state.range(0); + for (auto _ : state) { + auto p = new uint8_t[sz]; + delete [] p; + benchmark::DoNotOptimize(p); + } +} +BENCHMARK(native_order_fix_data_create)->Range(8,8<<14); -std::string Benchmark::help() { return "Run micro-benchmarks"; } +static void native_order_fix_data_create2(benchmark::State &state) +{ + for (auto _ : state) { + auto p = new orderman::NativeOrderFIXData(); + delete p; + benchmark::DoNotOptimize(p); + } +} +BENCHMARK(native_order_fix_data_create2); + +static void native_order_fix_data_fragment(benchmark::State &state) +{ + for (auto _ : state) { + auto p = new jetfix::FIXFragment(); + delete p; + benchmark::DoNotOptimize(p); + } +} +BENCHMARK(native_order_fix_data_fragment); + +std::string Benchmark::help() { return "Run micro-benchmarks. Use --benchmark_filter=regex to run only specific benchmarks."; } } } diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index b3e4ee555..2c5565b3c 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -15,7 +15,7 @@ #include "server/sparkd/md/run_md.h" #include "server/sparkd/orderman/service/OrderServiceServer.h" #include "server/sparkd/exchange_sim/ExchangeSim.h" -#include "server/sparkd/exchange_sim/ExchangeSim.h" +#include "server/sparkd/orderman2/server/OrderServiceServer2.h" #include "lib/md/relay/QueryServer.h" @@ -39,6 +39,7 @@ int Run::execute(std::vector const &) account::AccountServiceServer account_server(sc); md::run_market_datapublishers(); md::QueryServerPtr md_query_server(md::run_query_server(sc)); + orderman2::OrderServiceServer2 order_service_server(sc); orderman::OrderServiceServer order_server(sc); std::thread([]() { diff --git a/src/server/sparkd/mercury/broker/AsyncEventBroker.h b/src/server/sparkd/mercury/broker/AsyncEventBroker.h index 8b92e3f58..7bbc82b25 100644 --- a/src/server/sparkd/mercury/broker/AsyncEventBroker.h +++ b/src/server/sparkd/mercury/broker/AsyncEventBroker.h @@ -88,13 +88,16 @@ public: post_external_msg(on_unadvertisement,id(),sid); } - void do_work() + bool do_work() { BrokerMsg *m; if (_queue.try_dequeue(m)) { m->handle_msg(this,m); free_msg(m); + return true; } + else + return false; } private: diff --git a/src/server/sparkd/mercury/mercury_utils/Executor.h b/src/server/sparkd/mercury/mercury_utils/Executor.h index 1f009f15f..8fbdba247 100644 --- a/src/server/sparkd/mercury/mercury_utils/Executor.h +++ b/src/server/sparkd/mercury/mercury_utils/Executor.h @@ -40,8 +40,8 @@ public: activate(std::make_shared (std::forward(args)...)); } - void do_work() - {_broker.do_work();} + bool do_work() + {return _broker.do_work();} private: diff --git a/src/server/sparkd/orderman/doc/event_flow.pdf b/src/server/sparkd/orderman/doc/event_flow.pdf deleted file mode 100644 index 74b79d94a092af4cdca636f64dc29cb7374d7d5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17650 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

)f}yGugsd7EK( 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 secs; - - api::Security const *resolve(SecurityKey const&k) override - {return secs[k];} - - SecurityMap retrieve_all() const override - {return secs;} - MySecDB (const std::vector& legs) { for (auto it = legs.begin(); it != legs.end(); it++) @@ -410,4 +400,4 @@ double gen_rand (double min, double max) double f = (double)rand() / RAND_MAX; return min + f * (max - min); } -}} \ No newline at end of file +}} diff --git a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp index 4880e2913..bdcf719c5 100644 --- a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp +++ b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp @@ -52,7 +52,7 @@ ExecutionGateway::~ExecutionGateway () {} void ExecutionGateway::init() { me->state = State::WAITNG_FOR_SECURITIES; - subscribe([this] (auto const&sec_update) {on_securities(sec_update);}); + subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); } void ExecutionGateway::on_securities(const mercury::Update &update) @@ -63,17 +63,19 @@ void ExecutionGateway::on_securities(const mercury::Update & me->securities[sec_ptr->id()] = sec_ptr; if (me->state == State::WAITNG_FOR_SECURITIES) { + LOG(OrderMan,Warn,"Received first set of {} securities. Proceeding with initialization", + update.event->securities.size()); // got our security synopsis, ready to start the GW me->state = State::READY; // subscribe to gateway events - me->gw.on() = [this] (auto const&msg) {on_exe_report(msg);}; - me->gw.on() = [this] (auto const&msg) {on_cancel_reject(msg);}; - me->gw.on_ready() = [this] () {on_connection_status_change(true);}; - me->gw.on_disconnect() = [this] () {on_connection_status_change(false);}; - me->gw.on() = [this] (auto const&m) {on_business_reject(m);}; - me->gw.on() = [this] (auto const&m) {on_session_reject(m);}; + me->gw.on() = [this] (auto const&msg) {this->on_exe_report(msg);}; + me->gw.on() = [this] (auto const&msg) {this->on_cancel_reject(msg);}; + me->gw.on_ready() = [this] () {this->on_connection_status_change(true);}; + me->gw.on_disconnect() = [this] () {this->on_connection_status_change(false);}; + me->gw.on() = [this] (auto const&m) {this->on_business_reject(m);}; + me->gw.on() = [this] (auto const&m) {this->on_session_reject(m);}; // stream of execution reports me->exe_report_stream = make_stream(me->gw_name); @@ -88,7 +90,7 @@ void ExecutionGateway::on_securities(const mercury::Update & me->gw.start(); // start polling - subscribe (broker_id(), [this] (auto const&) {on_poll();}); + subscribe (broker_id(), [this] (auto const&) {this->on_poll();}); } } } @@ -164,6 +166,9 @@ void ExecutionGateway::on_cancel_reject(const jetfix::fix::CancelRejectMsg &msg) void ExecutionGateway::on_connection_status_change(bool is_connected) { + LOG(OrderMan,Info,"Connection state of {} changed to {}", + me->gw_name.value(), is_connected? std::string("connected") : std::string("disconnected")); + publish(me->gw_status_change_stream,is_connected); } diff --git a/src/server/sparkd/orderman2/actors/OrderManager.cpp b/src/server/sparkd/orderman2/actors/OrderManager.cpp new file mode 100644 index 000000000..cfcbb6e20 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/OrderManager.cpp @@ -0,0 +1,51 @@ +#include "OrderManager.h" +#include "server/sparkd/orderman2/order_factory/OrderFactory.h" +#include "server/sparkd/securities/ISecurityDB.h" +#include "server/sparkd/securities/MapSecurityDB.h" +#include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" + +#include + +namespace bts { +namespace orderman2 { + +enum class OrderManager::State {WAITING_FOR_SECURITIES, READY}; + +struct OrderManager::PImpl +{ + PImpl() : state (State::WAITING_FOR_SECURITIES), + sec_db(), + orders(), + order_factory(sec_db) + {} + + State state; + securities::MapSecurityDB sec_db; + std::unordered_map orders; + OrderFactory order_factory; +}; + +OrderManager::OrderManager () : me (new PImpl()) {} +OrderManager::~OrderManager () {} + +void OrderManager::init() +{ + me->state = State::WAITING_FOR_SECURITIES; + subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); +} + +void OrderManager::on_securities(const mercury::Update &update) +{ + if (update.event) { + + // update our security db + for (auto sec_ptr : update.event->securities) + me->sec_db.securities[SecurityKey(sec_ptr->id())] = sec_ptr; + + // start processing orders + if (me->state == State::WAITING_FOR_SECURITIES) { + } + } +} + +}} diff --git a/src/server/sparkd/orderman2/actors/OrderManager.h b/src/server/sparkd/orderman2/actors/OrderManager.h new file mode 100644 index 000000000..50457735d --- /dev/null +++ b/src/server/sparkd/orderman2/actors/OrderManager.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include "server/sparkd/mercury/actors/Actor.h" + +// fwd +namespace bts { +namespace orderman2 {class NewSecuritiesEvent;} +} + +namespace bts { +namespace orderman2 { + +// Maintains resources shared by orders, such as: +// - a pool of fix buffers (OutFIXPtr) +// - an order factory (OrderFactory) +// - a security database (SecurityDB) +// - an actor base class, which allows orders to publish and subscribe events + +class OrderManager : public mercury::Actor +{ +public: + OrderManager(); + ~OrderManager(); + void init() override; + +private: + void on_securities(const mercury::Update &update); + enum class State; + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp index f12a7da59..c56d18398 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp @@ -31,6 +31,7 @@ struct SecuritySrc::PImpl }; SecuritySrc::SecuritySrc () : me (new PImpl()) {} +SecuritySrc::~SecuritySrc(){} void SecuritySrc::init() { diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.h b/src/server/sparkd/orderman2/actors/SecuritySrc.h index 3f28d8462..0c45f727b 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.h +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.h @@ -11,6 +11,7 @@ class SecuritySrc : public mercury::Actor { public: SecuritySrc(); + ~SecuritySrc(); void init() override; private: diff --git a/src/server/sparkd/orderman2/doc/event_flow.pdf b/src/server/sparkd/orderman2/doc/event_flow.pdf new file mode 100644 index 0000000000000000000000000000000000000000..7732f471bfb905ea80167204bc7c7df9ef8cae56 GIT binary patch literal 18731 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 literal 0 HcmV?d00001 diff --git a/src/server/sparkd/orderman/doc/order_man_notes.org b/src/server/sparkd/orderman2/doc/order_man_notes.org similarity index 95% rename from src/server/sparkd/orderman/doc/order_man_notes.org rename to src/server/sparkd/orderman2/doc/order_man_notes.org index b47b5abad..bca6c1b11 100644 --- a/src/server/sparkd/orderman/doc/order_man_notes.org +++ b/src/server/sparkd/orderman2/doc/order_man_notes.org @@ -296,27 +296,18 @@ ExpireDate = 20161102 432=20161102 CheckSum = 151 10=151 * Open Issues -- Shell has ugly menus - Self match protection - fill mitigation - should cancel on disconnect be on - handling of business reject - handling of reject - garbage collection of orders -- separate fill maintenance -- storage shouldn't be under PersistenceService +- garbage collection of fills +- need spread leg fills for limits - need to get a handle on transact time -- probably best design is to flatten order, making copies cheaper - consider including restatement reason -- Compile newer cgdb -- Add all source paths to gdb init -- Publish gdb init - see if handling of cancel rejects is any good -- batch handling of orders, batch handling of fills -- better event_grid - - simpler wiring - - less indirection in dispatch - - consider passing lambdas around +- impossible to shutdown orderservice at the moment * Reference - 10.96.25.35 | thing | cost | note | @@ -378,18 +369,10 @@ CheckSum = 151 10=151 digraph G { bgcolor="transparent"; - SecSrc - GW - OrderStore - FastOM - FillStore - MDSrc - UI - subgraph cluster_fast { label="Fast Core"; GW - FastOM + OMan MDSrc } @@ -399,26 +382,30 @@ digraph G { SecSrc UI OrderStore + AsyncOFactory } - SecSrc -> GW [label=psec] - SecSrc -> OrderStore [label=psec] - SecSrc -> FastOM [label=psec] - GW -> FillStore [label=xmsgs] - GW -> FastOM [label=xmsgs] - FastOM -> GW [label=fix] - FastOM -> OrderStore [label=oupdate] - OrderStore -> FastOM [label=rec_orders] - OrderStore -> UI [label=orecs] - FillStore-> UI [label=frecs] - UI -> FastOM [label="crud"] - MDSrc -> FastOM [label="md"] + AsyncOFactory -> OMan [label=new_o] + OMan -> AsyncOFactory [label=req_new_o] + SecSrc -> GW [label=psec] + SecSrc -> OrderStore [label=psec] + SecSrc -> OMan [label=psec] + GW -> FillStore [label=xmsgs] + GW -> OMan [label=xmsgs] + OMan -> GW [label=fix] + OMan -> OrderStore [label=oupdate] + OrderStore -> OMan [label=rec_orders] + OrderStore -> UI [label=orecs] + FillStore-> UI [label=frecs] + UI -> OMan [label="crud"] + MDSrc -> OMan [label="md"] } #+END_SRC #+RESULTS: [[file:event_flow.pdf]] -* Better even broker: + +* Better event broker: ** unbundle events from topics and synopsis. - develop Channels = Channel - probably subscription would be made on the channel but the cb would @@ -428,7 +415,10 @@ digraph G { ** differentiate between routing nodes and local nodes - so that we do not need routing when there is a direct link to another node -** allow for merging of channels +** allow for composability of channels +- merging +- joining +* Com diff --git a/src/server/sparkd/orderman2/factory/OrderBuilder.cpp b/src/server/sparkd/orderman2/factory/OrderBuilder.cpp deleted file mode 100644 index a8b637c2a..000000000 --- a/src/server/sparkd/orderman2/factory/OrderBuilder.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "OrderBuilder.h" - -namespace bts { -namespace orderman2 { - - -}} diff --git a/src/server/sparkd/orderman2/factory/OrderBuilder.h b/src/server/sparkd/orderman2/factory/OrderBuilder.h deleted file mode 100644 index 1751fc217..000000000 --- a/src/server/sparkd/orderman2/factory/OrderBuilder.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include - -// fwds -namespace bts { -namespace api {namespace orderman2 {class OrderDef;}} -namespace orderman2 {class Order; class OrderFactory;} -} -// end fwds - -namespace bts { -namespace orderman2 { - -class OrderBuilder -{ -public: - OrderBuilder(); - Order& operator()(); - ~OrderBuilder(); -private: - friend class OrderFactory; - void do_work(); - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/server/sparkd/orderman2/factory/OrderFactory.cpp b/src/server/sparkd/orderman2/factory/OrderFactory.cpp deleted file mode 100644 index 6588366b7..000000000 --- a/src/server/sparkd/orderman2/factory/OrderFactory.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "OrderFactory.h" - -namespace bts { -namespace orderman2 { - - -}} diff --git a/src/server/sparkd/orderman2/factory/OrderFactory.h b/src/server/sparkd/orderman2/factory/OrderFactory.h deleted file mode 100644 index 13b4608ee..000000000 --- a/src/server/sparkd/orderman2/factory/OrderFactory.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include -#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" - -// fwds -namespace bts { -namespace api {namespace orderman2 {class OrderDef;}} -namespace orderman2 {class Order; class OrderBuilder;} -} -// end fwds - -namespace bts { -namespace orderman2 { - -// Builds orders based on their definition. Orders are automatically -// persisted and given a durable id. This class is safe for concurrent -// use. -class OrderFactory -{ -public: - OrderFactory(); - Order& make(api::orderman2::OrderDef const&def,OrderKey parent); - OrderBuilder& make_builder(api::orderman2::OrderDef const&def,OrderKey parent, size_t reserve_sz); - ~OrderFactory(); -private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/server/sparkd/orderman2/order_factory/IOrderBuilderFactory.h b/src/server/sparkd/orderman2/order_factory/IOrderBuilderFactory.h new file mode 100644 index 000000000..1278ee15b --- /dev/null +++ b/src/server/sparkd/orderman2/order_factory/IOrderBuilderFactory.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/order_factory/OrderBuilder.h" + +namespace bts { +namespace orderman2 { + +class IOrderBuilderFactory +{ +public: + virtual OrderBuilder make_builder(api::orderman::OrderDefinition const&,size_t reserve) = 0; + virtual ~IOrderBuilderFactory(); +}; + +}} diff --git a/src/server/sparkd/orderman2/order_factory/IOrderFactory.h b/src/server/sparkd/orderman2/order_factory/IOrderFactory.h new file mode 100644 index 000000000..c7ec3d8b4 --- /dev/null +++ b/src/server/sparkd/orderman2/order_factory/IOrderFactory.h @@ -0,0 +1,28 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" + +// fwd +namespace bts { +namespace orderman2 {class Order; } +namespace api { +namespace orderman2 { +class OrderDefinition; +class OrderRecord; +}}} +// end fwd + +namespace bts { +namespace orderman2 { + +inline OrderKey null_order_key() {return OrderKey(0);} + +class IOrderFactory +{ +public: + Order &create (api::orderman2::OrderDefinition const&def) {return create (null_order_key(),def);} + virtual Order &create (OrderKey parent,api::orderman2::OrderDefinition const&) = 0; +}; + +}} diff --git a/src/server/sparkd/orderman2/order_factory/OrderBuilder.h b/src/server/sparkd/orderman2/order_factory/OrderBuilder.h new file mode 100644 index 000000000..8af331da4 --- /dev/null +++ b/src/server/sparkd/orderman2/order_factory/OrderBuilder.h @@ -0,0 +1,11 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" + +namespace bts { +namespace orderman2 { + +using OrderBuilder = std::function; + +}} diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp new file mode 100644 index 000000000..94780df92 --- /dev/null +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp @@ -0,0 +1,93 @@ +#include "OrderFactory.h" +#include "lib/utils/SpinLock.h" +#include "lib/utils/Puid.h" +#include "lib/utils/bts_assert.h" +#include "server/sparkd/orderman2/orders/Order.h" +#include "lib/api/services/OrderService2.pb.h" +#include "server/sparkd/orderman2/orders/LimitOrder.h" + +#include +#include + +namespace bts { +namespace orderman2 { + +static utils::SpinLock id_gen_lock; +static uint32_t current_oid = 0; +static uint32_t remaining_in_batch = 0; +const auto gen_batch_size = 1000; + +OrderKey gen_order_id() +{ + std::lock_guard g(id_gen_lock); + if (remaining_in_batch) { + remaining_in_batch--; + return OrderKey(++current_oid); + } + else { + auto next = utils::gen_id("order_id"); + bts_assert(next < std::numeric_limits::max()); + remaining_in_batch = gen_batch_size; + current_oid = next; + return OrderKey(++current_oid) ; // cannot get a 0 + } +} + +struct OrderFactory::PImpl +{ + PImpl(securities::ISecurityDB &db) : my_orders(), sec_db(db) {} + + std::vector> my_orders; + securities::ISecurityDB &sec_db; +}; + +OrderFactory::OrderFactory (securities::ISecurityDB &db) : me (new PImpl(db)) {} +OrderFactory::~OrderFactory () {} + +Order &OrderFactory::create (OrderKey parent,api::orderman2::OrderDefinition const&def) +{ + auto &order = allocate(def); + order.pre_create(gen_order_id(), parent,me->sec_db,*this); + return order; +} + +Order &OrderFactory::allocate (api::orderman2::OrderDefinition const&def) +{ + using namespace bts::api::orderman2; + + me->my_orders.emplace_back(); + auto &order_ptr = me->my_orders.back(); + + switch (def.custom_case()) { + case OrderDefinition::kLimit: + order_ptr.reset (new LimitOrder()); + break; + case OrderDefinition::kMarket: + bts_assert(false); + break; + case OrderDefinition::kStopMarket: + bts_assert(false); + break; + case OrderDefinition::kStopLimit: + bts_assert(false); + break; + case OrderDefinition::kIceberg: + bts_assert(false); + break; + case OrderDefinition::kSpreader: + bts_assert(false); + break; + case OrderDefinition::kTimeBox: + bts_assert(false); + break; + case OrderDefinition::CUSTOM_NOT_SET: + bts_assert(false); + break; + } + + return *order_ptr; +} + + +}} + diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.h b/src/server/sparkd/orderman2/order_factory/OrderFactory.h new file mode 100644 index 000000000..20efbe1bb --- /dev/null +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.h @@ -0,0 +1,31 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/order_factory/IOrderFactory.h" + +// fwd +namespace bts { +namespace securities {class ISecurityDB;} +namespace orderman2 {class Order;} +namespace api {namespace orderman2 {class OrderDefinition;class OrderRecord;}}} +// end fwd + +namespace bts { +namespace orderman2 { + +class OrderFactory : public IOrderFactory +{ +public: + OrderFactory(securities::ISecurityDB &db); + ~OrderFactory(); + + Order &create (OrderKey parent,api::orderman2::OrderDefinition const&) override; + Order &recover(api::orderman2::OrderRecord const&); + +private: + Order &allocate (api::orderman2::OrderDefinition const&); + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.h b/src/server/sparkd/orderman2/orders/LimitOrder.h new file mode 100644 index 000000000..ace6816bd --- /dev/null +++ b/src/server/sparkd/orderman2/orders/LimitOrder.h @@ -0,0 +1,21 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/orders/Order.h" + +namespace bts { +namespace orderman2 { + +class LimitOrder : public Order +{ +public: + void create(api::orderman2::OrderDefinition const&); + void recover(api::orderman2::OrderRecord const&); + void activate(); + void update(Price price, Quantity qty); + void crack(); + void cancel(); + api::orderman2::OrderState const& state(); +}; + +}} diff --git a/src/server/sparkd/orderman2/orders/Order.cpp b/src/server/sparkd/orderman2/orders/Order.cpp index d3678aeea..5b6b8464c 100644 --- a/src/server/sparkd/orderman2/orders/Order.cpp +++ b/src/server/sparkd/orderman2/orders/Order.cpp @@ -3,58 +3,6 @@ namespace bts { namespace orderman2 { -class A {}; -class B {}; -class C {}; -class D {}; -class E {}; -class F {}; - -using Events = std::tuple ; - -template struct Handler {void on(){}}; - -template -struct Handler : public Handler -{ - using Handler::on; - virtual void on(const H&) {}; -}; - -template class T, typename> -struct instantiate_with_same_args { }; - -template< - template class T, - template class U, - typename... Ts - > -struct instantiate_with_same_args> -{ - using type = T; -}; - -using Handlers = instantiate_with_same_args::type; - - -struct FOrder : protected Handlers -{}; - -template -struct EventHandler { - virtual void on(EV const&) {} -}; - - -template -struct MultiHandler : public EventHandler... -{ -}; - -using MH = MultiHandler; -MH a; - - struct Order::PImpl { PImpl() diff --git a/src/server/sparkd/orderman2/orders/Order.h b/src/server/sparkd/orderman2/orders/Order.h index 98e35780e..6de672ca1 100644 --- a/src/server/sparkd/orderman2/orders/Order.h +++ b/src/server/sparkd/orderman2/orders/Order.h @@ -2,47 +2,42 @@ #include #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" -#include "lib/domain_model/common.h" -// fwds +// fwd namespace bts { +namespace securities {class ISecurityDB;} +namespace orderman2 {class ISecurityDB; class IOrderFactory;} namespace api { -class Security; -namespace orderman2 {class OrderDef; class StdOrderState; class CustomOrderState;} -} -namespace orderman2 {class Order; class OrderBuilder;} -} -// end fwds +namespace orderman2 { +class OrderDefinition; +class OrderRecord; +class OrderState; +}}} namespace bts { namespace orderman2 { +class ISecurityDB; + class Order { public: Order(); - OrderKey key(); - OrderKey parent(); - - void activate(); - void update(Price p, Quantity q); - void crack(); - void cancel(); - virtual ~Order(); + virtual void create(api::orderman2::OrderDefinition const&) = 0; + virtual void recover(api::orderman2::OrderRecord const&) = 0; -protected: - Order& make_child_order(api::orderman2::OrderDef const&def); - OrderBuilder& make_child_builder(api::orderman2::OrderDef const&def,size_t reserve_sz); - api::Security const *resolve_security(SecurityKey const&k) ; - void report_state(api::orderman2::StdOrderState const&,api::orderman2::CustomOrderState const&) ; - - virtual void on_activate() = 0; - virtual void on_update(Price p, Quantity q) = 0; - virtual void on_crack() = 0 ; - virtual void on_cancel() = 0; + virtual void activate() = 0; + virtual void update(Price price, Quantity qty) = 0; + virtual void crack() = 0; + virtual void cancel() = 0; + virtual api::orderman2::OrderState const& state() = 0; private: + friend class OrderFactory; + void pre_create(OrderKey id, OrderKey parent, securities::ISecurityDB &db,IOrderFactory &); + void pre_activate(ISecurityDB &db,IOrderFactory &); + struct PImpl; std::unique_ptr me; }; diff --git a/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp b/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp index 96aa73cf8..9f7ce0a0a 100644 --- a/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp +++ b/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp @@ -1,18 +1,84 @@ -// #include "OrderServiceServer2.h" +#include "OrderServiceServer2.h" +#include "server/sparkd/mercury/mercury_utils/Executor.h" +#include "server/sparkd/mercury/broker/AsyncEventBroker.h" +#include "server/sparkd/orderman2/actors/SecuritySrc.h" +#include "server/sparkd/mercury/actors/Poller.h" +#include "lib/utils/bts_chrono.h" +#include "server/sparkd/orderman2/actors/ExecutionGateway.h" +#include "lib/config/config.h" +#include "lib/config/protos/jetfix.pb.h" -// namespace bts { -// namespace orderman2 { +namespace bts { +namespace orderman2 { -// struct OrderServiceServer2::PImpl -// { -// PImpl() -// {} -// }; +config::JetFIX::Connection get_connection() +{ + auto &all_connections = config::get().connection(); + auto selected_connection = config::get().connection_name(); + for (auto const&c : all_connections) + if (c.name() == selected_connection) + return c; + bts_assert(false); + return config::JetFIX::Connection(); +} -// OrderServiceServer2::OrderServiceServer2 (bts::api::ServiceContext& ctx) : -// api::orderman2::OrderServiceBase(ctx), -// me (new PImpl()) -// { -// } +struct OrderServiceServer2::PImpl +{ + PImpl() : + fast_broker(std::make_shared()), + slow_broker(std::make_shared()), + fast_exe(*fast_broker), + slow_exe(*slow_broker), + fast_thread(), + slow_thread() + {} + std::shared_ptr fast_broker; + std::shared_ptr slow_broker; + mercury::Executor fast_exe; + mercury::Executor slow_exe; + std::thread fast_thread; + std::thread slow_thread; +}; -// }} +OrderServiceServer2::OrderServiceServer2 (bts::api::ServiceContext& ctx) : + api::orderman2::OrderServiceBase(ctx), + me (new PImpl()) +{ + me->fast_broker->add_neighbour(me->slow_broker); + me->slow_broker->add_neighbour(me->fast_broker); + + me->fast_thread = std::thread([this] () { + me->fast_exe.spawn (); + me->fast_exe.spawn (get_connection()); + while(true) + me->fast_exe.do_work(); + }); + + me->slow_thread = std::thread([this] () { + me->slow_exe.spawn (); + me->slow_exe.spawn (); + + while (true) + if (!me->slow_exe.do_work()) + std::this_thread::sleep_for(10ms); + }); +} + +OrderServiceServer2::~OrderServiceServer2() +{ + bts_assert(false); // this is badly broken at the moment +} + +void OrderServiceServer2::create_order(const api::orderman2::Create&, + const api::Response&) {} + +void OrderServiceServer2::cancel_order(const api::orderman2::Cancel&, + const api::Response&) {} + +void OrderServiceServer2::update_order(const api::orderman2::Update&, + const api::Response&) {} + +void OrderServiceServer2::crack_order(const api::orderman2::Crack&, + const api::Response& ) {} + +}} diff --git a/src/server/sparkd/orderman2/server/OrderServiceServer2.h b/src/server/sparkd/orderman2/server/OrderServiceServer2.h index 5d22bcf21..b31251187 100644 --- a/src/server/sparkd/orderman2/server/OrderServiceServer2.h +++ b/src/server/sparkd/orderman2/server/OrderServiceServer2.h @@ -14,17 +14,14 @@ public: OrderServiceServer2 (bts::api::ServiceContext& context); ~OrderServiceServer2(); - void create_order(const api::orderman2::Create& , - const std::function & ) override; - - void cancel_order(const api::orderman2::Cancel& , - const std::function & ) override; - - void update_order(const api::orderman2::Update& , - const std::function & ) override; - - void crack_order(const api::orderman2::Crack& , - const std::function & ) override; + void create_order(const api::orderman2::Create&, + const api::Response&) override; + void cancel_order(const api::orderman2::Cancel&, + const api::Response&) override; + void update_order(const api::orderman2::Update&, + const api::Response&) override; + void crack_order(const api::orderman2::Crack&, + const api::Response& ) override; private: struct PImpl; std::unique_ptr me; diff --git a/src/server/sparkd/securities/ISecurityDB.h b/src/server/sparkd/securities/ISecurityDB.h index 9be3926de..8c674544c 100644 --- a/src/server/sparkd/securities/ISecurityDB.h +++ b/src/server/sparkd/securities/ISecurityDB.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include "lib/domain_model/common.h" namespace bts { @@ -13,7 +13,7 @@ class ISecurityDB public: virtual ~ISecurityDB() {}; virtual api::Security const *resolve(SecurityKey const&k) = 0; - using SecurityMap = std::map ; + using SecurityMap = std::unordered_map ; virtual SecurityMap retrieve_all() const = 0; }; diff --git a/src/server/sparkd/securities/MapSecurityDB.h b/src/server/sparkd/securities/MapSecurityDB.h new file mode 100644 index 000000000..fe0a1c19a --- /dev/null +++ b/src/server/sparkd/securities/MapSecurityDB.h @@ -0,0 +1,23 @@ +#pragma once + +#include +#include +#include "server/sparkd/securities/ISecurityDB.h" + +namespace bts { +namespace securities { + +struct MapSecurityDB : public securities::ISecurityDB +{ + api::Security const *resolve(SecurityKey const&k) override { + auto it = securities.find(k); + if (it != securities.end()) + return it->second; + else + return nullptr; + } + SecurityMap retrieve_all() const override {return securities;} + SecurityMap securities; +}; + +}} From f0458d9f7eae6c2fdee579da66dea6b0b5f51645 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 8 Dec 2017 14:28:37 -0500 Subject: [PATCH 19/35] Replicating externals is not so bad. --- tools/replicator/replicate_to_windows_vm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/replicator/replicate_to_windows_vm.py b/tools/replicator/replicate_to_windows_vm.py index e009f16c6..59b0a0658 100644 --- a/tools/replicator/replicate_to_windows_vm.py +++ b/tools/replicator/replicate_to_windows_vm.py @@ -8,7 +8,6 @@ root = $SOURCE root = socket://localhost:8080/$TARGET ignore = Path build ignore = Path .git -ignore = Path externals ignore = Path cmake-build-debug ignore = Path .idea ignore = Path docker From a2442baf6c57b87a9b1e32cacbe0166b77619386 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 8 Dec 2017 18:37:34 -0500 Subject: [PATCH 20/35] Orderman2 --- .gitignore | 1 + src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Benchmark.cpp | 12 ++ src/server/sparkd/main.cpp | 15 ++ .../sparkd/orderman2/actors/OrderManager.cpp | 139 +++++++++++++----- .../sparkd/orderman2/actors/OrderManager.h | 9 +- .../sparkd/orderman2/doc/order_man_notes.org | 16 +- .../orderman2/events/ActivateOrderEvent.h | 20 +++ .../orderman2/events/CancelOrderEvent.h | 20 +++ .../sparkd/orderman2/events/CrackOrderEvent.h | 20 +++ .../orderman2/events/StoredOrderEvent.h | 21 +++ .../orderman2/events/UpdateOrderEvent.h | 28 ++++ .../orderman2/order_factory/OrderFactory.cpp | 11 +- .../sparkd/orderman2/orders/LimitOrder.cpp | 9 ++ .../sparkd/orderman2/orders/LimitOrder.h | 20 ++- src/server/sparkd/orderman2/orders/Order.h | 10 +- tools/config/KEVIN.location | 2 + 17 files changed, 300 insertions(+), 55 deletions(-) create mode 100644 src/server/sparkd/orderman2/events/ActivateOrderEvent.h create mode 100644 src/server/sparkd/orderman2/events/CancelOrderEvent.h create mode 100644 src/server/sparkd/orderman2/events/CrackOrderEvent.h create mode 100644 src/server/sparkd/orderman2/events/StoredOrderEvent.h create mode 100644 src/server/sparkd/orderman2/events/UpdateOrderEvent.h create mode 100644 src/server/sparkd/orderman2/orders/LimitOrder.cpp create mode 100644 tools/config/KEVIN.location diff --git a/.gitignore b/.gitignore index cdb810783..28d0ac524 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +nohup.out build/ cmake-build-debug/ .idea/ diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index cd36ea3e2..df03a0d91 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/OrderManager.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/OrderManager.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index a95b99491..9eb7deb51 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -25,6 +25,7 @@ #include #include #include +#include namespace bts { namespace cmd { @@ -725,6 +726,17 @@ static void native_order_fix_data_fragment(benchmark::State &state) } BENCHMARK(native_order_fix_data_fragment); +static void small_vec(benchmark::State &state) +{ + auto i = 0; + for (auto _ : state) { + boost::container::small_vector vec; + vec.emplace_back(i++); + benchmark::DoNotOptimize(vec[0]); + } +} +BENCHMARK(small_vec); + std::string Benchmark::help() { return "Run micro-benchmarks. Use --benchmark_filter=regex to run only specific benchmarks."; } } } diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 71cea8d67..01caf9c82 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -14,7 +14,22 @@ #include "server/sparkd/cmds/TestCeloxica.h" #include "server/sparkd/cmds/TestOrderman.h" +#include + +template +void f() +{ + std::cout << N << ": " << sizeof (boost::container::small_vector) << "\n"; +} + int main(int argc, char **argv) { + f<1> (); + f<2> (); + f<4> (); + f<8> (); + f<16> (); + f<32> (); + using namespace bts; os::set_thread_name("main"); diff --git a/src/server/sparkd/orderman2/actors/OrderManager.cpp b/src/server/sparkd/orderman2/actors/OrderManager.cpp index cfcbb6e20..0ab0d4024 100644 --- a/src/server/sparkd/orderman2/actors/OrderManager.cpp +++ b/src/server/sparkd/orderman2/actors/OrderManager.cpp @@ -1,51 +1,110 @@ -#include "OrderManager.h" -#include "server/sparkd/orderman2/order_factory/OrderFactory.h" -#include "server/sparkd/securities/ISecurityDB.h" -#include "server/sparkd/securities/MapSecurityDB.h" -#include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" +// #include "OrderManager.h" +// #include "server/sparkd/orderman2/order_factory/OrderFactory.h" +// #include "server/sparkd/securities/ISecurityDB.h" +// #include "server/sparkd/securities/MapSecurityDB.h" +// #include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" +// #include "server/sparkd/orderman2/events/StoredOrderEvent.h" +// #include "server/sparkd/orderman2/events/ActivateOrderEvent.h" +// #include "server/sparkd/orderman2/events/UpdateOrderEvent.h" +// #include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" -#include +// #include -namespace bts { -namespace orderman2 { +// namespace bts { +// namespace orderman2 { -enum class OrderManager::State {WAITING_FOR_SECURITIES, READY}; +// enum +// class OrderManager::State {WAIT_SEC, WAIT_ORDER_RECOVERY, READY } ; -struct OrderManager::PImpl -{ - PImpl() : state (State::WAITING_FOR_SECURITIES), - sec_db(), - orders(), - order_factory(sec_db) - {} +// struct OrderManager::PImpl +// { +// PImpl(config::JetFIX::Connection const &cfg) : +// state (State::WAIT_SEC), +// sec_db(), +// orders(), +// order_factory(sec_db), +// stored_order_sub(), +// cfg(cfg), +// gw_name(GatewayName(cfg.name())) +// {} - State state; - securities::MapSecurityDB sec_db; - std::unordered_map orders; - OrderFactory order_factory; -}; +// State state; +// securities::MapSecurityDB sec_db; +// std::unordered_map orders; +// OrderFactory order_factory; +// mercury::Actor::SubHandle stored_order_sub; +// const config::JetFIX::Connection cfg; +// const GatewayName gw_name; +// }; -OrderManager::OrderManager () : me (new PImpl()) {} -OrderManager::~OrderManager () {} +// OrderManager::OrderManager (config::JetFIX::Connection const&cfg) : me (new PImpl(cfg)) {} +// OrderManager::~OrderManager () {} -void OrderManager::init() -{ - me->state = State::WAITING_FOR_SECURITIES; - subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); -} +// void OrderManager::init() +// { +// me->state = State::WAIT_SEC; +// subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); +// } -void OrderManager::on_securities(const mercury::Update &update) -{ - if (update.event) { +// void OrderManager::on_securities(const mercury::Update &update) +// { +// if (update.event) { - // update our security db - for (auto sec_ptr : update.event->securities) - me->sec_db.securities[SecurityKey(sec_ptr->id())] = sec_ptr; +// // update our security db +// for (auto sec_ptr : update.event->securities) +// me->sec_db.securities[SecurityKey(sec_ptr->id())] = sec_ptr; - // start processing orders - if (me->state == State::WAITING_FOR_SECURITIES) { - } - } -} +// if (me->state == State::WAIT_SEC) { + +// // obtain recovered orders +// me->state = State::WAIT_ORDER_RECOVERY; +// me->stored_order_sub = +// subscribe (me->gw_name, +// [this] (auto const&orders) +// {this->on_order_recovery(orders);}); +// } +// } +// } -}} +// void OrderManager::on_order_recovery(const mercury::Update &update) +// { +// if (update.event) +// if (me->state == State::WAIT_ORDER_RECOVERY) { + +// // Got the first batch of persisted orders which has to match +// // the orders stored on disk +// for (auto &order_rec : update.event->orders) { +// auto order = me->order_factory.recover(order_rec); +// me->orders[order.key()] = order; +// order.pre_activate(me->sec_db, me->order_factory); +// order.activate(); +// } + +// // don't need to monitor persisted orders anymore, all the +// // orders we care about will be pass through this class +// unsubscribe(me->stored_order_sub); + +// // Now we are ready to subscribe to the execution gateway +// // events. Since we know all the orders that were stored in +// // disk we will be able to match any execution reports we +// // might get to persisted orders. Had we subscribed to +// // gatewat events earlier we wouldn't be able to tell wheter +// // an order was already stored in disk or not when we +// // received an execution report for it. Given that we know +// // for sure that we have all the persisted orders, anything +// // we can't match will signify that we crashed after we sent +// // an order to the gateway but before we were able to persist +// // it. In that case we will do our best to recover the order +// // from the execution report. +// subscribe (me->gw_name, +// [this] (auto const&ev) { +// on_execution_report(ev); +// }); +// } +// } + +// void OrderManager::on_execution_report(const mercury::Update &update) +// { +// } + +// }} diff --git a/src/server/sparkd/orderman2/actors/OrderManager.h b/src/server/sparkd/orderman2/actors/OrderManager.h index 50457735d..6b529336a 100644 --- a/src/server/sparkd/orderman2/actors/OrderManager.h +++ b/src/server/sparkd/orderman2/actors/OrderManager.h @@ -2,10 +2,13 @@ #include #include "server/sparkd/mercury/actors/Actor.h" +#include "lib/config/protos/jetfix.pb.h" // fwd namespace bts { namespace orderman2 {class NewSecuritiesEvent;} +namespace orderman2 {class NewExecutionReportEvent;} +namespace orderman2 {class StoredOrderEvent;} } namespace bts { @@ -20,12 +23,14 @@ namespace orderman2 { class OrderManager : public mercury::Actor { public: - OrderManager(); + OrderManager(config::JetFIX::Connection const&); ~OrderManager(); void init() override; private: - void on_securities(const mercury::Update &update); + void on_securities(const mercury::Update &); + void on_order_recovery(const mercury::Update &); + void on_execution_report(const mercury::Update &); enum class State; struct PImpl; std::unique_ptr me; diff --git a/src/server/sparkd/orderman2/doc/order_man_notes.org b/src/server/sparkd/orderman2/doc/order_man_notes.org index bca6c1b11..5047ac37d 100644 --- a/src/server/sparkd/orderman2/doc/order_man_notes.org +++ b/src/server/sparkd/orderman2/doc/order_man_notes.org @@ -409,16 +409,28 @@ digraph G { ** unbundle events from topics and synopsis. - develop Channels = Channel - probably subscription would be made on the channel but the cb would - only mention the event. should be possible to view the tag on the callback + only mention the event. should be possible to view the tag on the + callback +- note that this does not give you any new capabilities, perhaps just + clarifies the terminology. Right now an event is effectively a + channel. If there are events with the same payload but different + kinds of tags or synopsis policies that can be captured by simply + abstracting the payload type and creating new events. +- perhaps stream = is a better abstraction +- perhaps update = array. that would provide easier support + for synopsis policy == replay all ** automatic singleton subscriptions - where a sub maps to exactly one stream at a time ** differentiate between routing nodes and local nodes - so that we do not need routing when there is a direct link to another node +- perhaps we need the notion of a subnet and a default gateway like in tcp ** allow for composability of channels - merging - joining -* Com +** force declaration of consumed and produced event types +** automatic persistence of events might be a good one too +** provide facilities for RPC diff --git a/src/server/sparkd/orderman2/events/ActivateOrderEvent.h b/src/server/sparkd/orderman2/events/ActivateOrderEvent.h new file mode 100644 index 000000000..8c2cbea19 --- /dev/null +++ b/src/server/sparkd/orderman2/events/ActivateOrderEvent.h @@ -0,0 +1,20 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { + +class ActivateOrderEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + ActivateOrderEvent (Order &o) : order (&i(o)) {} + Order* order; +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/CancelOrderEvent.h b/src/server/sparkd/orderman2/events/CancelOrderEvent.h new file mode 100644 index 000000000..c004bf952 --- /dev/null +++ b/src/server/sparkd/orderman2/events/CancelOrderEvent.h @@ -0,0 +1,20 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { + +class CancelOrderEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + CancelOrderEvent (Order &o) : order (&i(o)) {} + Order* order; +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/CrackOrderEvent.h b/src/server/sparkd/orderman2/events/CrackOrderEvent.h new file mode 100644 index 000000000..200b0d89f --- /dev/null +++ b/src/server/sparkd/orderman2/events/CrackOrderEvent.h @@ -0,0 +1,20 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { + +class CrackOrderEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + CrackOrderEvent(Order &o) : order (&i(o)) {} + Order* order; +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/StoredOrderEvent.h b/src/server/sparkd/orderman2/events/StoredOrderEvent.h new file mode 100644 index 000000000..9f6e51e2e --- /dev/null +++ b/src/server/sparkd/orderman2/events/StoredOrderEvent.h @@ -0,0 +1,21 @@ +#pragma once + +#include +#include +#include "server/sparkd/mercury/synopsys/AccumulateVector.h" +#include "lib/api/services/OrderService2.pb.h" + +namespace bts { +namespace orderman2 { + +class StoredOrderEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + using SynopsysBuilder = mercury::AccumulateVector; + + boost::container::small_vector orders; + boost::container::small_vector_base &vector() {return orders;} +}; + +}} diff --git a/src/server/sparkd/orderman2/events/UpdateOrderEvent.h b/src/server/sparkd/orderman2/events/UpdateOrderEvent.h new file mode 100644 index 000000000..1a8fb72ab --- /dev/null +++ b/src/server/sparkd/orderman2/events/UpdateOrderEvent.h @@ -0,0 +1,28 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { + +class UpdateOrderEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + + UpdateOrderEvent (Order &o, Price p, Quantity q) : + order (&i(o)), + price(p), + quantity(q) + {} + + Order* order; + Price price; + Quantity quantity; +}; + +}} + diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp index 94780df92..899bcd3eb 100644 --- a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp @@ -47,7 +47,16 @@ OrderFactory::~OrderFactory () {} Order &OrderFactory::create (OrderKey parent,api::orderman2::OrderDefinition const&def) { auto &order = allocate(def); - order.pre_create(gen_order_id(), parent,me->sec_db,*this); + order.pre_init(gen_order_id(), parent,me->sec_db,*this); + order.create(def); + return order; +} + +Order &OrderFactory::recover(api::orderman2::OrderRecord const&rec) +{ + auto &order = allocate(rec.def()); + order.pre_init(OrderKey(rec.key()),OrderKey(rec.parent_key()),me->sec_db,*this); + order.recover(rec); return order; } diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.cpp b/src/server/sparkd/orderman2/orders/LimitOrder.cpp new file mode 100644 index 000000000..02c9ab133 --- /dev/null +++ b/src/server/sparkd/orderman2/orders/LimitOrder.cpp @@ -0,0 +1,9 @@ +#include "LimitOrder.h" + +namespace bts { +namespace orderman2 { + +LimitOrder::~LimitOrder() {} + + +}} diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.h b/src/server/sparkd/orderman2/orders/LimitOrder.h index ace6816bd..3b19dd21d 100644 --- a/src/server/sparkd/orderman2/orders/LimitOrder.h +++ b/src/server/sparkd/orderman2/orders/LimitOrder.h @@ -2,6 +2,7 @@ #include #include "server/sparkd/orderman2/orders/Order.h" +#include "lib/api/services/OrderService2.pb.h" namespace bts { namespace orderman2 { @@ -9,13 +10,18 @@ namespace orderman2 { class LimitOrder : public Order { public: - void create(api::orderman2::OrderDefinition const&); - void recover(api::orderman2::OrderRecord const&); - void activate(); - void update(Price price, Quantity qty); - void crack(); - void cancel(); - api::orderman2::OrderState const& state(); + ~LimitOrder() override; + void create(api::orderman2::OrderDefinition const&) override {}; + void recover(api::orderman2::OrderRecord const&) override {}; + void activate() override {}; + void update(Price , Quantity ) override {}; + void crack() override {}; + void cancel() override {}; + api::orderman2::OrderState const& state() override + { + static api::orderman2::OrderState result; + return result; + }; }; }} diff --git a/src/server/sparkd/orderman2/orders/Order.h b/src/server/sparkd/orderman2/orders/Order.h index 6de672ca1..853a5ec0d 100644 --- a/src/server/sparkd/orderman2/orders/Order.h +++ b/src/server/sparkd/orderman2/orders/Order.h @@ -23,6 +23,9 @@ class Order { public: Order(); + OrderKey key() const; + OrderKey parent() const; + virtual ~Order(); virtual void create(api::orderman2::OrderDefinition const&) = 0; virtual void recover(api::orderman2::OrderRecord const&) = 0; @@ -35,8 +38,11 @@ public: private: friend class OrderFactory; - void pre_create(OrderKey id, OrderKey parent, securities::ISecurityDB &db,IOrderFactory &); - void pre_activate(ISecurityDB &db,IOrderFactory &); + friend class OrderManager; + void pre_init(OrderKey , OrderKey , + securities::ISecurityDB &, + IOrderFactory &) {}; + void pre_activate(ISecurityDB &, IOrderFactory &) {}; struct PImpl; std::unique_ptr me; diff --git a/tools/config/KEVIN.location b/tools/config/KEVIN.location new file mode 100644 index 000000000..4ed1e2dcf --- /dev/null +++ b/tools/config/KEVIN.location @@ -0,0 +1,2 @@ +#put the location of your code tree below, it will map to /bts on the docker image +%HOMEDRIVE%/code/bts/ \ No newline at end of file From 645b80caf501842d03fea94b0df81bb668463f14 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Dec 2017 10:44:12 -0500 Subject: [PATCH 21/35] Added support for batching of events. This allows natural synopsis policies like cache all or cache N to be overlayed on top of the event without affecting the event members. --- src/server/sparkd/cmds/Benchmark.cpp | 1 - src/server/sparkd/main.cpp | 15 ------- src/server/sparkd/mercury/actors/Actor.cpp | 5 ++- src/server/sparkd/mercury/actors/Actor.h | 23 +++++++--- .../sparkd/mercury/broker/AsyncEventBroker.h | 37 +++++++++++----- src/server/sparkd/mercury/events/Event.h | 7 ++- src/server/sparkd/mercury/events/PollEvent.h | 4 +- src/server/sparkd/mercury/events/TimerEvent.h | 5 ++- src/server/sparkd/mercury/events/Update.h | 3 +- .../mercury/synopsys/AccumulateVector.h | 43 ------------------- src/server/sparkd/mercury/synopsys/CacheAll.h | 37 ++++++++++++++++ .../sparkd/mercury/synopsys/CacheLast.h | 5 +-- src/server/sparkd/mercury/topics/Topic.h | 8 ++-- .../orderman2/actors/ExecutionGateway.cpp | 23 ++++++---- .../sparkd/orderman2/actors/SecuritySrc.cpp | 6 ++- .../orderman2/events/CancelRejectEvent.h | 9 +++- .../events/GatewayStatusChangeEvent.h | 4 +- .../events/NewExecutionReportEvent.h | 14 +++--- .../orderman2/events/NewSecuritiesEvent.h | 17 +++----- .../sparkd/orderman2/events/OutFIXMsgEvent.h | 13 +++++- 20 files changed, 154 insertions(+), 125 deletions(-) delete mode 100644 src/server/sparkd/mercury/synopsys/AccumulateVector.h create mode 100644 src/server/sparkd/mercury/synopsys/CacheAll.h diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 9eb7deb51..116cce3a8 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -10,7 +10,6 @@ #include "server/sparkd/mercury/broker/CoreEventBroker.h" #include "lib/api/services/OrderService2.server.pb.h" #include "lib/utils/SpinLock.h" -#include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" #include "server/sparkd/orderman/native_orders/NativeOrderFIXData.h" #include diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 01caf9c82..71cea8d67 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -14,22 +14,7 @@ #include "server/sparkd/cmds/TestCeloxica.h" #include "server/sparkd/cmds/TestOrderman.h" -#include - -template -void f() -{ - std::cout << N << ": " << sizeof (boost::container::small_vector) << "\n"; -} - int main(int argc, char **argv) { - f<1> (); - f<2> (); - f<4> (); - f<8> (); - f<16> (); - f<32> (); - using namespace bts; os::set_thread_name("main"); diff --git a/src/server/sparkd/mercury/actors/Actor.cpp b/src/server/sparkd/mercury/actors/Actor.cpp index ee1f3ab35..37b11d1f3 100644 --- a/src/server/sparkd/mercury/actors/Actor.cpp +++ b/src/server/sparkd/mercury/actors/Actor.cpp @@ -9,9 +9,9 @@ namespace mercury { class Book{}; -struct BookUpdate : Event { +struct BookUpdate : Event { using Tag = SecurityKey; - using SynopsisBuilder = CacheLast; + using SynopsisPolicy = CacheLast; BookUpdate(Book const &b) : book (b) {} Book book; @@ -33,6 +33,7 @@ public: auto book_stream = make_stream(SecurityKey(1)); publish(book_stream,Book {}); + publish_batch(book_stream, std::array { {Book {}, Book {}} }); destroy_stream(book_stream); } }; diff --git a/src/server/sparkd/mercury/actors/Actor.h b/src/server/sparkd/mercury/actors/Actor.h index 14cc1459e..1b3a2bf92 100644 --- a/src/server/sparkd/mercury/actors/Actor.h +++ b/src/server/sparkd/mercury/actors/Actor.h @@ -15,7 +15,6 @@ namespace mercury { template class Stream { public: - static_assert(std::is_base_of::value, "Only types derived from Event can be used in streams"); StreamID sid; }; @@ -53,7 +52,7 @@ public: return; if (payload) - cb(UpdateType{sid,type, &(payload->unwrap())}); + cb(UpdateType{sid,type, &(payload->unwrap())}); else cb(UpdateType{sid,type,nullptr}); }; @@ -80,7 +79,7 @@ public: return; if (payload) - cb(UpdateType{sid,type, &(payload->unwrap())}); + cb(UpdateType{sid,type, &(payload->unwrap())}); else cb(UpdateType{sid,type,nullptr}); }; @@ -110,7 +109,7 @@ public: return; if (payload) - cb(UpdateType{sid,type, &(payload->unwrap())}); + cb(UpdateType{sid,type, &(payload->unwrap())}); else cb(UpdateType{sid,type,nullptr}); }; @@ -151,7 +150,21 @@ public: void publish(Stream const&stream,Args&&... args) { bts_assert(_broker); - _broker->internal_notify(stream.sid,std::forward(args)...); + auto msg = _broker->alloc_internal_notification_msg(stream.sid); + auto &array = msg.template wrap_in_place(); + array.emplace_back(std::forward(args)...); + _broker->internal_notify(msg); + } + + template + void publish_batch(Stream const&stream, C const&c) + { + bts_assert(_broker); + auto msg = _broker->alloc_internal_notification_msg(stream.sid); + auto &array = msg.template wrap_in_place(); + array.reserve(c.size()); + for (auto &item : c) + array.emplace_back(item); } template diff --git a/src/server/sparkd/mercury/broker/AsyncEventBroker.h b/src/server/sparkd/mercury/broker/AsyncEventBroker.h index 7bbc82b25..f954f9179 100644 --- a/src/server/sparkd/mercury/broker/AsyncEventBroker.h +++ b/src/server/sparkd/mercury/broker/AsyncEventBroker.h @@ -15,6 +15,13 @@ namespace mercury { class AsyncEventBroker : public IEventBroker { +private: + struct BrokerMsg { + utils::FatWrapper<127-8-4> wrapper; + void (*handle_msg) (AsyncEventBroker*self,BrokerMsg*m); + bool is_external; + }; + public: AsyncEventBroker () : _core_broker(), _queue(), _internal_pool(), _external_pool(), @@ -51,17 +58,32 @@ public: // can be called from outside void post_action(std::function const&action) {post_external_msg(on_action,action);} + // Internal API, i.e. API intended for use by a single thread, the // same thread calling do_work. - template - void internal_notify(StreamID sid, Args&&... args) + struct InternalNotificationMsg { + public: + template + T& wrap_in_place(Args&&... args) + { + auto &n = _msg->wrapper.unwrap (); + return n.payload.wrap_in_place(std::forward(args)...); + } + BrokerMsg *_msg; + }; + + InternalNotificationMsg alloc_internal_notification_msg(StreamID sid) { auto msg = _internal_pool.construct(); msg->is_external = false; msg->handle_msg = on_internal_notification; - auto &n = msg->wrapper.wrap_in_place (sid); - n.payload.wrap_in_place(std::forward(args)...); - _queue.enqueue(msg); + msg->wrapper.wrap_in_place (sid); + return InternalNotificationMsg{msg}; + } + + void internal_notify(InternalNotificationMsg msg) + { + _queue.enqueue(msg._msg); } InternalSubID internal_subscribe(TopicFilter const&f,InternalEventHandler const&cb) @@ -101,11 +123,6 @@ public: } private: - struct BrokerMsg { - utils::FatWrapper<127-8-4> wrapper; - void (*handle_msg) (AsyncEventBroker*self,BrokerMsg*m); - bool is_external; - }; using MsgHandler = void(AsyncEventBroker*,BrokerMsg*); using Pool = boost::object_pool; diff --git a/src/server/sparkd/mercury/events/Event.h b/src/server/sparkd/mercury/events/Event.h index 0bc7187bf..b45fc82e6 100644 --- a/src/server/sparkd/mercury/events/Event.h +++ b/src/server/sparkd/mercury/events/Event.h @@ -1,16 +1,19 @@ #pragma once #include -#include "server/sparkd/mercury/synopsys/NoSynopsis.h" #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include +#include "server/sparkd/mercury/synopsys/NoSynopsis.h" namespace bts { namespace mercury { +template > class Event { public: - using SynopsisBuilder = NoSynopsis; + using Array = TArray; }; }} diff --git a/src/server/sparkd/mercury/events/PollEvent.h b/src/server/sparkd/mercury/events/PollEvent.h index 49a08b97f..d4bf58b88 100644 --- a/src/server/sparkd/mercury/events/PollEvent.h +++ b/src/server/sparkd/mercury/events/PollEvent.h @@ -6,10 +6,12 @@ namespace bts { namespace mercury { -class PollEvent : public Event +class PollEvent : public Event { public: using Tag = EventBrokerID; + using SynopsisPolicy = NoSynopsis; }; }} + diff --git a/src/server/sparkd/mercury/events/TimerEvent.h b/src/server/sparkd/mercury/events/TimerEvent.h index 4ed374f14..e9e6ade84 100644 --- a/src/server/sparkd/mercury/events/TimerEvent.h +++ b/src/server/sparkd/mercury/events/TimerEvent.h @@ -2,14 +2,17 @@ #include #include "server/sparkd/mercury/events/Event.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" #include "lib/utils/bts_chrono.h" +#include "server/sparkd/mercury/synopsys/NoSynopsis.h" namespace bts { namespace mercury { -class TimerEvent : public Event +class TimerEvent : public Event { public: + using SynopsisPolicy = NoSynopsis; TimeStamp ts; TimeStampStr ts_str; }; diff --git a/src/server/sparkd/mercury/events/Update.h b/src/server/sparkd/mercury/events/Update.h index d6be5f158..8b2522887 100644 --- a/src/server/sparkd/mercury/events/Update.h +++ b/src/server/sparkd/mercury/events/Update.h @@ -2,6 +2,7 @@ #include #include "server/sparkd/mercury/mercury_utils/mercury_common.h" +#include namespace bts { namespace mercury { @@ -11,7 +12,7 @@ class Update { public: StreamID sid; EventType event_type; - const Event* event; + typename Event::Array const*events; }; }} diff --git a/src/server/sparkd/mercury/synopsys/AccumulateVector.h b/src/server/sparkd/mercury/synopsys/AccumulateVector.h deleted file mode 100644 index cc4dd5bc1..000000000 --- a/src/server/sparkd/mercury/synopsys/AccumulateVector.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include -#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/mercury/mercury_utils/mercury_common.h" - -namespace bts { -namespace mercury { - -template -class AccumulateVector : public ISynopsysBuilder -{ -public: - AccumulateVector() : _synopsis(), _empty(true) {reset();} - - EventPayload* get_synopsis() - { - if (!_empty) - return &_synopsis; - else - return nullptr; - } - - void update(EventPayload const&pl) { - auto const &update = pl.unwrap (); - auto &previous = _synopsis.unwrap().vector(); - for (auto p : update.vector()) - previous.push_back(p); - }; - - void reset() - { - _empty = true; - _synopsis.wrap_in_place(); - } - -private: - EventPayload _synopsis; - bool _empty; -}; - - -}} diff --git a/src/server/sparkd/mercury/synopsys/CacheAll.h b/src/server/sparkd/mercury/synopsys/CacheAll.h new file mode 100644 index 000000000..31a008414 --- /dev/null +++ b/src/server/sparkd/mercury/synopsys/CacheAll.h @@ -0,0 +1,37 @@ +#pragma once + +#include + +namespace bts { +namespace mercury { + +template +class CacheAll : public ISynopsysBuilder +{ +public: + CacheAll() : _synopsis(), _empty(true) {} + + EventPayload* get_synopsis() + { + if (!_empty) + return &_synopsis; + else + return nullptr; + } + + void update(EventPayload const&pl) + { + auto const &update = pl.unwrap (); + auto &previous = _synopsis.unwrap(); + for (auto const &ev : update) + previous.emplace_back(ev); + } + + void reset() {_empty = true;}; + +private: + EventPayload _synopsis; + bool _empty; +}; + +}} diff --git a/src/server/sparkd/mercury/synopsys/CacheLast.h b/src/server/sparkd/mercury/synopsys/CacheLast.h index 26b17caf3..1535a6c80 100644 --- a/src/server/sparkd/mercury/synopsys/CacheLast.h +++ b/src/server/sparkd/mercury/synopsys/CacheLast.h @@ -7,7 +7,6 @@ namespace bts { namespace mercury { -template class CacheLast : public ISynopsysBuilder { public: @@ -21,8 +20,8 @@ public: return nullptr; } - void update(EventPayload const&pl) {_synopsis = pl; _empty= false;}; - void reset() {_empty = true;}; + void update(EventPayload const&pl) {_synopsis = pl; _empty= false;} + void reset() {_empty = true;} private: EventPayload _synopsis; diff --git a/src/server/sparkd/mercury/topics/Topic.h b/src/server/sparkd/mercury/topics/Topic.h index 0b70eeb33..59843602f 100644 --- a/src/server/sparkd/mercury/topics/Topic.h +++ b/src/server/sparkd/mercury/topics/Topic.h @@ -3,11 +3,11 @@ #include #include #include "lib/utils/type_name.h" +#include "server/sparkd/mercury/events/Event.h" namespace bts { namespace mercury { -class Event; template< class... > using void_t = void; @@ -26,13 +26,12 @@ template class Topic : public ITopic { public: - static_assert(std::is_base_of::value, "Only types derived from Event can be used in topics"); using Tag = typename EV::Tag; Topic (const Tag &t) : _tag(t) {} SynopsisBuilderPtr make_synopsis_builder() const override { - return std::make_shared(); + return std::make_shared(); } std::string to_str() const override { @@ -48,9 +47,8 @@ template class Topic : public ITopic { public: - static_assert(std::is_base_of::value, "Only types derived from Event can be used in topics"); SynopsisBuilderPtr make_synopsis_builder() const override { - return std::make_shared(); + return std::make_shared(); } std::string to_str() const override { diff --git a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp index bdcf719c5..58e002e61 100644 --- a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp +++ b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp @@ -53,18 +53,23 @@ void ExecutionGateway::init() { me->state = State::WAITNG_FOR_SECURITIES; subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); + subscribe(me->gw_name,[this] (auto const&fix) {this->on_outgoing_fix(fix);}); } void ExecutionGateway::on_securities(const mercury::Update &update) { - if (update.event) { + if (update.events) { - for (auto sec_ptr : update.event->securities) + for (auto const &ev : *(update.events)) { + auto sec_ptr = ev.security; me->securities[sec_ptr->id()] = sec_ptr; + } if (me->state == State::WAITNG_FOR_SECURITIES) { - LOG(OrderMan,Warn,"Received first set of {} securities. Proceeding with initialization", - update.event->securities.size()); + LOG(OrderMan,Warn, + "Received first set of {} securities. Proceeding with initialization of {}", + update.events->size(), + me->gw_name.value()); // got our security synopsis, ready to start the GW me->state = State::READY; @@ -189,11 +194,11 @@ void ExecutionGateway::on_poll() void ExecutionGateway::on_outgoing_fix( mercury::Update const&msg) { - if (msg.event) { - auto const &m = *msg.event; - LOG(Latency,Info, "Gateway {} {}", m.cid,utils::TimeStamp::now().to_uint64()); - me->gw.send(m.cid, m.msg); - } + if (msg.events) + for (auto const&ev : *(msg.events)) { + LOG(Latency,Info, "Gateway {} {}", ev.cid,utils::TimeStamp::now().to_uint64()); + me->gw.send(ev.cid, ev.msg); + } } }} diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp index c56d18398..3c0ab7784 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp @@ -2,6 +2,7 @@ #include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" #include "server/sparkd/mercury/events/PollEvent.h" #include "server/sparkd/persistence/SqliteStore.h" +#include "server/sparkd/mercury/events/TimerEvent.h" #include "lib/md/MDRecoverableConsumer.h" #include "lib/utils/bts_chrono.h" @@ -57,7 +58,7 @@ void SecuritySrc::init() {cache_if_new(sec);}); me->new_securities_stream = make_stream(); - subscribe (broker_id(),[this] (auto) {this->on_scan_securities();}); + subscribe ([this] (auto) {this->on_scan_securities();}); } void SecuritySrc::cache_if_new(api::Security const&sec) @@ -86,9 +87,10 @@ void SecuritySrc::on_scan_securities() me->last_scan = now; me->md_consumer.scan_securities (); if (me->to_publish.size()) - mercury::Actor::publish(me->new_securities_stream, std::move(me->to_publish)); + mercury::Actor::publish_batch(me->new_securities_stream, me->to_publish); } } }} + diff --git a/src/server/sparkd/orderman2/events/CancelRejectEvent.h b/src/server/sparkd/orderman2/events/CancelRejectEvent.h index 9a28c97d0..911809894 100644 --- a/src/server/sparkd/orderman2/events/CancelRejectEvent.h +++ b/src/server/sparkd/orderman2/events/CancelRejectEvent.h @@ -6,15 +6,20 @@ #include "lib/domain_model/common.h" #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include "server/sparkd/mercury/events/Event.h" +#include "server/sparkd/mercury/synopsys/NoSynopsis.h" namespace bts { namespace orderman2 { -class CancelRejectEvent : public mercury::Event +class CancelRejectEvent : public mercury::Event { public: +// Cancel Rejects are informative only, they have no effect on order +// state. So either they are conveyed to the user when they occur or +// they can be discarded. So no need for synopsis. + using SynopsisPolicy = mercury::NoSynopsis; using Tag = GatewayName; - + CancelRejectEvent (OrderKey order_key, std::string const &rej) : order_key(order_key), reject_msg(rej) {} diff --git a/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h b/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h index 135eff26a..164a974af 100644 --- a/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h +++ b/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h @@ -7,10 +7,10 @@ namespace bts { namespace orderman2 { -class GatewayStatusChangeEvent : public mercury::Event { +class GatewayStatusChangeEvent : public mercury::Event { public: using Tag = GatewayName; - using SynopsisBuilder = mercury::CacheLast; + using SynopsisPolicy = mercury::CacheLast; GatewayStatusChangeEvent(bool c) : is_connected(c) {} bool is_connected; }; diff --git a/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h b/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h index 9e6f9f9e1..c01cdaebe 100644 --- a/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h +++ b/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h @@ -7,18 +7,19 @@ #include "server/sparkd/mercury/mercury_utils/mercury_common.h" #include #include "server/sparkd/mercury/events/Event.h" -#include "server/sparkd/mercury/synopsys/AccumulateVector.h" +#include "server/sparkd/mercury/synopsys/CacheAll.h" + #include namespace bts { namespace orderman2 { -class NewExecutionReportEvent : public mercury::Event +class NewExecutionReportEvent : public mercury::Event { public: using Tag = GatewayName; - using SynopsysBuilder = mercury::AccumulateVector; + using SynopsisPolicy = mercury::CacheAll; struct Data { AccountName account_name; @@ -42,12 +43,9 @@ public: mercury::TimeStampStr transact_time; std::string reject_msg; }; - boost::container::small_vector data; + Data const* data; - boost::container::small_vector_base &vector() {return data;} - - NewExecutionReportEvent(const Data*dt) : data() {data.push_back(dt);} - NewExecutionReportEvent() : data() {} + NewExecutionReportEvent(const Data*dt) : data(dt) {}; }; diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index ccc138e92..a822428fe 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -2,25 +2,18 @@ #include #include "server/sparkd/mercury/events/Event.h" +#include "server/sparkd/mercury/synopsys/CacheAll.h" #include "lib/domain_model/Security.h" -#include "server/sparkd/mercury/synopsys/AccumulateVector.h" namespace bts { namespace orderman2 { -class NewSecuritiesSynopsisBuider; - -class NewSecuritiesEvent : public mercury::Event +class NewSecuritiesEvent : public mercury::Event { public: - using SynopsisBuilder = mercury::AccumulateVector; - - NewSecuritiesEvent() : securities() {} - NewSecuritiesEvent(std::vector&& secs) : securities(std::move(secs)) {} - - std::vector securities; - - auto const &vector() {return securities;} + using SynopsisPolicy = mercury::CacheAll; + NewSecuritiesEvent(api::Security const*sec) : security(sec) {} + api::Security const *security; }; diff --git a/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h b/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h index 9025ccfd3..e8ee66db8 100644 --- a/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h +++ b/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h @@ -2,14 +2,25 @@ #include "server/sparkd/jetfix/common/OutFIXPtr.h" #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include "server/sparkd/mercury/events/Event.h" +#include "server/sparkd/mercury/synopsys/CacheAll.h" + namespace bts { namespace orderman2 { -class OutFIXMsgEvent : public mercury::Event { +class OutFIXMsgEvent : public mercury::Event { public: using Tag = GatewayName; + // there is no need to store synopsis for this event because no one + // should be sending fix events (OutFIXMsgEvent) until they receive + // an event from the FIX gateway regarding the status of the FIX + // connection. Receipt of this connection event guarantees to + // potential publishers of OutFIXMsgEvent that the gateway is + // already subscribed to OutFIXMsgEvent and so no events will be + // missed. + using SynopsisPolicy = mercury::NoSynopsis; + OutFIXMsgEvent (TickToTradeCorID cid, jetfix::OutFIXPtr const&fix) : cid(cid), msg(fix) {} From 1f9ccafa16dc65d2a22139c8b64e2542dae68864 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Dec 2017 13:49:58 -0500 Subject: [PATCH 22/35] More orderman2 --- .../sparkd/mercury/synopsys/MergeByKey.h | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/server/sparkd/mercury/synopsys/MergeByKey.h diff --git a/src/server/sparkd/mercury/synopsys/MergeByKey.h b/src/server/sparkd/mercury/synopsys/MergeByKey.h new file mode 100644 index 000000000..4faf6c5da --- /dev/null +++ b/src/server/sparkd/mercury/synopsys/MergeByKey.h @@ -0,0 +1,61 @@ +#pragma once + +#include +#include + +namespace bts { +namespace mercury { + +template +class MergeByKey : public ISynopsysBuilder +{ +public: + using Key = decltype( ((EV*) nullptr)->key()); + using TMap = std::unordered_map; + + MergeByKey() : + _synopsis(), + _empty(), + _dirty() + {reset();} + + EventPayload* get_synopsis() + { + if (!_empty) { + if (_dirty) { + // regen synopsis from merged map + _dirty = false; + _synopsis.clear(); + auto &syn = _synopsis.unwrap(); + for (auto const &kvp : _merged) + syn.emplace_back(kvp.second); + } + return &_synopsis; + } + else + return nullptr; + } + + void update(EventPayload const&pl) + { + auto const &update = pl.unwrap (); + _dirty = true; + for (auto const &ev : update) + _merged.emplace(ev.key(),ev); + } + + void reset() { + _synopsis.clear(); + _merged.clear(); + _empty = true; + _dirty = true; + }; + +private: + EventPayload _synopsis; + TMap _merged; + bool _empty; + bool _dirty; +}; + +}} From 20c4cb912dee813aae3db776db2c6c8f4cf14124 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Dec 2017 13:50:52 -0500 Subject: [PATCH 23/35] Orderman2 --- .../sparkd/orderman2/actors/OrderManager.cpp | 189 +++++++++--------- .../sparkd/orderman2/actors/OrderManager.h | 8 +- .../sparkd/orderman2/doc/order_man_notes.org | 5 + .../orderman2/events/ActivateOrderEvent.h | 6 +- .../events/GatewayStatusChangeEvent.h | 1 + .../orderman2/events/StoredOrderEvent.h | 13 +- .../orderman2/events/UpdateOrderEvent.h | 9 +- src/server/sparkd/orderman2/orders/Order.h | 10 +- 8 files changed, 125 insertions(+), 116 deletions(-) diff --git a/src/server/sparkd/orderman2/actors/OrderManager.cpp b/src/server/sparkd/orderman2/actors/OrderManager.cpp index 0ab0d4024..7b628c3de 100644 --- a/src/server/sparkd/orderman2/actors/OrderManager.cpp +++ b/src/server/sparkd/orderman2/actors/OrderManager.cpp @@ -1,110 +1,111 @@ -// #include "OrderManager.h" -// #include "server/sparkd/orderman2/order_factory/OrderFactory.h" -// #include "server/sparkd/securities/ISecurityDB.h" -// #include "server/sparkd/securities/MapSecurityDB.h" -// #include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" -// #include "server/sparkd/orderman2/events/StoredOrderEvent.h" -// #include "server/sparkd/orderman2/events/ActivateOrderEvent.h" -// #include "server/sparkd/orderman2/events/UpdateOrderEvent.h" -// #include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" +#include "OrderManager.h" +#include "server/sparkd/orderman2/order_factory/OrderFactory.h" +#include "server/sparkd/securities/ISecurityDB.h" +#include "server/sparkd/securities/MapSecurityDB.h" +#include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" +#include "server/sparkd/orderman2/events/StoredOrderEvent.h" +#include "server/sparkd/orderman2/events/ActivateOrderEvent.h" +#include "server/sparkd/orderman2/events/UpdateOrderEvent.h" +#include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" +#include "server/sparkd/orderman2/orders/Order.h" -// #include +#include -// namespace bts { -// namespace orderman2 { +namespace bts { +namespace orderman2 { -// enum -// class OrderManager::State {WAIT_SEC, WAIT_ORDER_RECOVERY, READY } ; +enum +class OrderManager::State {WAIT_SEC, WAIT_ORDERS, READY } ; -// struct OrderManager::PImpl -// { -// PImpl(config::JetFIX::Connection const &cfg) : -// state (State::WAIT_SEC), -// sec_db(), -// orders(), -// order_factory(sec_db), -// stored_order_sub(), -// cfg(cfg), -// gw_name(GatewayName(cfg.name())) -// {} +struct OrderManager::PImpl +{ + PImpl(config::JetFIX::Connection const &cfg) : + state (State::WAIT_SEC), + sec_db(), + orders(), + order_factory(sec_db), + stored_order_sub(), + cfg(cfg), + gw_name(GatewayName(cfg.name())) + {} -// State state; -// securities::MapSecurityDB sec_db; -// std::unordered_map orders; -// OrderFactory order_factory; -// mercury::Actor::SubHandle stored_order_sub; -// const config::JetFIX::Connection cfg; -// const GatewayName gw_name; -// }; + State state; + securities::MapSecurityDB sec_db; + std::unordered_map orders; + OrderFactory order_factory; + mercury::Actor::SubHandle stored_order_sub; + const config::JetFIX::Connection cfg; + const GatewayName gw_name; +}; -// OrderManager::OrderManager (config::JetFIX::Connection const&cfg) : me (new PImpl(cfg)) {} -// OrderManager::~OrderManager () {} +OrderManager::OrderManager (config::JetFIX::Connection const&cfg) : me (new PImpl(cfg)) {} +OrderManager::~OrderManager () {} -// void OrderManager::init() -// { -// me->state = State::WAIT_SEC; -// subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); -// } +void OrderManager::init() +{ + me->state = State::WAIT_SEC; + subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); +} -// void OrderManager::on_securities(const mercury::Update &update) -// { -// if (update.event) { +void OrderManager::on_securities(const mercury::Update &update) +{ + if (update.events) { -// // update our security db -// for (auto sec_ptr : update.event->securities) -// me->sec_db.securities[SecurityKey(sec_ptr->id())] = sec_ptr; + // update our security db + for (auto ev : *(update.events)) { + auto sec_ptr = ev.security; + me->sec_db.securities[SecurityKey(sec_ptr->id())] = sec_ptr; + } -// if (me->state == State::WAIT_SEC) { - -// // obtain recovered orders -// me->state = State::WAIT_ORDER_RECOVERY; -// me->stored_order_sub = -// subscribe (me->gw_name, -// [this] (auto const&orders) -// {this->on_order_recovery(orders);}); -// } -// } -// } + if (me->state == State::WAIT_SEC) { + // obtain recovered orders + me->state = State::WAIT_ORDERS; + me->stored_order_sub = + subscribe (me->gw_name, + [this] (auto const&orders) + {this->on_order_recovery(orders);}); + } + } +} -// void OrderManager::on_order_recovery(const mercury::Update &update) -// { -// if (update.event) -// if (me->state == State::WAIT_ORDER_RECOVERY) { +void OrderManager::on_order_recovery(const mercury::Update &update) +{ + if (update.events) + if (me->state == State::WAIT_ORDERS) { -// // Got the first batch of persisted orders which has to match -// // the orders stored on disk -// for (auto &order_rec : update.event->orders) { -// auto order = me->order_factory.recover(order_rec); -// me->orders[order.key()] = order; -// order.pre_activate(me->sec_db, me->order_factory); -// order.activate(); -// } + // Got the first batch of persisted orders which has to match + // the orders stored on disk (since we are the only ones + // producing new orders) + for (auto const &ev : *(update.events)) { + auto &order = me->order_factory.recover(*ev.order_record); + me->orders[order.key()] = ℴ + order.pre_activate(me->sec_db, me->order_factory); + order.activate(); + } -// // don't need to monitor persisted orders anymore, all the -// // orders we care about will be pass through this class -// unsubscribe(me->stored_order_sub); + // Don't need to monitor persisted orders anymore, all the + // orders we care about will be generated by us. + unsubscribe(me->stored_order_sub); -// // Now we are ready to subscribe to the execution gateway -// // events. Since we know all the orders that were stored in -// // disk we will be able to match any execution reports we -// // might get to persisted orders. Had we subscribed to -// // gatewat events earlier we wouldn't be able to tell wheter -// // an order was already stored in disk or not when we -// // received an execution report for it. Given that we know -// // for sure that we have all the persisted orders, anything -// // we can't match will signify that we crashed after we sent -// // an order to the gateway but before we were able to persist -// // it. In that case we will do our best to recover the order -// // from the execution report. -// subscribe (me->gw_name, -// [this] (auto const&ev) { -// on_execution_report(ev); -// }); -// } -// } + // Now we are ready to subscribe to the execution gateway + // events. Since we know all the orders that were stored in + // disk we will be able to match any execution reports we + // might get to persisted orders. Had we subscribed to + // gatewat events earlier we would not be able to tell wheter + // an order was already stored in disk or not when we + // received an execution report for it. Given that we know + // for sure that we have all the persisted orders, anything + // we can't match will signify that we crashed after we sent + // an order to the gateway but before we were able to persist + // it. In that case we will do our best to recover the order + // from the execution report. + subscribe (me->gw_name, + [this] (auto const&ev) {on_execution_report(ev);}); + } +} -// void OrderManager::on_execution_report(const mercury::Update &update) -// { -// } +void OrderManager::on_execution_report(const mercury::Update &) +{ +} -// }} +}} diff --git a/src/server/sparkd/orderman2/actors/OrderManager.h b/src/server/sparkd/orderman2/actors/OrderManager.h index 6b529336a..6ea3417e3 100644 --- a/src/server/sparkd/orderman2/actors/OrderManager.h +++ b/src/server/sparkd/orderman2/actors/OrderManager.h @@ -18,8 +18,12 @@ namespace orderman2 { // - a pool of fix buffers (OutFIXPtr) // - an order factory (OrderFactory) // - a security database (SecurityDB) -// - an actor base class, which allows orders to publish and subscribe events - +// - subscriptions to interesting events such as: +// - execution gateway messages (execution reports, rejects, etc) +// - market data book updates +// - security creation events +// - timer updates +// - order state changes class OrderManager : public mercury::Actor { public: diff --git a/src/server/sparkd/orderman2/doc/order_man_notes.org b/src/server/sparkd/orderman2/doc/order_man_notes.org index 5047ac37d..40d314715 100644 --- a/src/server/sparkd/orderman2/doc/order_man_notes.org +++ b/src/server/sparkd/orderman2/doc/order_man_notes.org @@ -296,6 +296,11 @@ ExpireDate = 20161102 432=20161102 CheckSum = 151 10=151 * Open Issues +- We need to decouple OM from fix gateway, so that we can have a slow + OM and a fast OM going against the same gateway +- Once we have multiple OM's we will need to guarantee that they can + see each others order, which means we need to use some sort of + synopsis or other mechanism to ensure that they are synchronized - Self match protection - fill mitigation - should cancel on disconnect be on diff --git a/src/server/sparkd/orderman2/events/ActivateOrderEvent.h b/src/server/sparkd/orderman2/events/ActivateOrderEvent.h index 8c2cbea19..be07a2249 100644 --- a/src/server/sparkd/orderman2/events/ActivateOrderEvent.h +++ b/src/server/sparkd/orderman2/events/ActivateOrderEvent.h @@ -8,11 +8,13 @@ namespace bts { namespace orderman2 { -class ActivateOrderEvent : public mercury::Event +class ActivateOrderEvent : public mercury::Event { public: using Tag = GatewayName; - ActivateOrderEvent (Order &o) : order (&i(o)) {} + using SynopsysPolicy = mercury::NoSynopsis; + + ActivateOrderEvent (Order &o) : order (&o) {} Order* order; }; diff --git a/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h b/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h index 164a974af..568e4fc2e 100644 --- a/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h +++ b/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h @@ -11,6 +11,7 @@ class GatewayStatusChangeEvent : public mercury::Event public: using Tag = GatewayName; using SynopsisPolicy = mercury::CacheLast; + GatewayStatusChangeEvent(bool c) : is_connected(c) {} bool is_connected; }; diff --git a/src/server/sparkd/orderman2/events/StoredOrderEvent.h b/src/server/sparkd/orderman2/events/StoredOrderEvent.h index 9f6e51e2e..7c82d68a9 100644 --- a/src/server/sparkd/orderman2/events/StoredOrderEvent.h +++ b/src/server/sparkd/orderman2/events/StoredOrderEvent.h @@ -2,20 +2,21 @@ #include #include -#include "server/sparkd/mercury/synopsys/AccumulateVector.h" +#include "lib/api/services/OrderService2.pb.h" +#include "server/sparkd/mercury/synopsys/MergeByKey.h" #include "lib/api/services/OrderService2.pb.h" namespace bts { namespace orderman2 { -class StoredOrderEvent : public mercury::Event +class StoredOrderEvent : public mercury::Event { public: using Tag = GatewayName; - using SynopsysBuilder = mercury::AccumulateVector; - - boost::container::small_vector orders; - boost::container::small_vector_base &vector() {return orders;} + using SynopsysPolicy = mercury::MergeByKey; + + auto key() {return order_record->key();} + api::orderman2::OrderRecord *order_record; }; }} diff --git a/src/server/sparkd/orderman2/events/UpdateOrderEvent.h b/src/server/sparkd/orderman2/events/UpdateOrderEvent.h index 1a8fb72ab..cb6285f24 100644 --- a/src/server/sparkd/orderman2/events/UpdateOrderEvent.h +++ b/src/server/sparkd/orderman2/events/UpdateOrderEvent.h @@ -8,15 +8,14 @@ namespace bts { namespace orderman2 { -class UpdateOrderEvent : public mercury::Event +class UpdateOrderEvent : public mercury::Event { public: using Tag = GatewayName; - + using SynopsysPolicy = mercury::NoSynopsis; + UpdateOrderEvent (Order &o, Price p, Quantity q) : - order (&i(o)), - price(p), - quantity(q) + order (&o), price(p), quantity(q) {} Order* order; diff --git a/src/server/sparkd/orderman2/orders/Order.h b/src/server/sparkd/orderman2/orders/Order.h index 853a5ec0d..c11a709ea 100644 --- a/src/server/sparkd/orderman2/orders/Order.h +++ b/src/server/sparkd/orderman2/orders/Order.h @@ -6,7 +6,7 @@ // fwd namespace bts { namespace securities {class ISecurityDB;} -namespace orderman2 {class ISecurityDB; class IOrderFactory;} +namespace orderman2 {class IOrderFactory;} namespace api { namespace orderman2 { class OrderDefinition; @@ -17,8 +17,6 @@ class OrderState; namespace bts { namespace orderman2 { -class ISecurityDB; - class Order { public: @@ -39,10 +37,8 @@ public: private: friend class OrderFactory; friend class OrderManager; - void pre_init(OrderKey , OrderKey , - securities::ISecurityDB &, - IOrderFactory &) {}; - void pre_activate(ISecurityDB &, IOrderFactory &) {}; + void pre_init(OrderKey , OrderKey , securities::ISecurityDB &, IOrderFactory &) {}; + void pre_activate(securities::ISecurityDB &, IOrderFactory &) {}; struct PImpl; std::unique_ptr me; From abef2b94f11336e30d4fd116bafa9a08f2209a38 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 18 Dec 2017 09:57:05 -0500 Subject: [PATCH 24/35] Orderman2 --- src/lib/api/services/OrderService2.proto | 4 +- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/TestOrderman.cpp | 1 - src/server/sparkd/mercury/actors/Actor.cpp | 2 +- src/server/sparkd/mercury/actors/Actor.h | 7 +- .../mercury/actors/ContentSubscription.h | 136 +++++++++ .../sparkd/mercury/actors/EventStream.h | 46 +++ .../sparkd/mercury/broker/CoreEventBroker.cpp | 2 +- src/server/sparkd/mercury/events/Event.h | 4 +- src/server/sparkd/mercury/events/Stream.h | 17 ++ src/server/sparkd/mercury/events/TimerEvent.h | 2 +- .../mercury/{synopsys => synopsis}/CacheAll.h | 2 +- .../{synopsys => synopsis}/CacheLast.h | 4 +- .../mercury/synopsis/ISynopsisBuilder.h | 19 ++ .../{synopsys => synopsis}/ISynopsysBuilder.h | 4 +- .../{synopsys => synopsis}/MergeByKey.h | 2 +- .../{synopsys => synopsis}/NoSynopsis.h | 4 +- .../SynopsisBuilder.cpp | 0 .../{synopsys => synopsis}/SynopsisBuilder.h | 0 src/server/sparkd/mercury/topics/ITopic.h | 2 +- src/server/sparkd/orderman/md/Book.h | 1 - .../orderman2/actors/ExecutionGateway.cpp | 4 +- src/server/sparkd/orderman2/actors/MDSource.h | 69 +++++ .../sparkd/orderman2/actors/OrderManager.cpp | 111 ------- .../actors/order_manager/ChildOrder.h | 87 ++++++ .../actors/order_manager/OrderBuilder.cpp | 8 + .../actors/order_manager/OrderBuilder.h | 102 +++++++ .../actors/order_manager/OrderManager.cpp | 273 ++++++++++++++++++ .../actors/{ => order_manager}/OrderManager.h | 26 +- .../actors/order_manager/OrderServices.h | 78 +++++ .../actors/order_manager/OrderServicesData.h | 78 +++++ .../sparkd/orderman2/doc/event_flow.pdf | Bin 18731 -> 19054 bytes .../sparkd/orderman2/doc/order_man_notes.org | 9 +- .../orderman2/events/ActivateOrderEvent.h | 11 +- .../sparkd/orderman2/events/BookUpdateEvent.h | 22 ++ .../orderman2/events/CancelOrderEvent.h | 11 +- .../orderman2/events/CancelRejectEvent.h | 2 +- .../sparkd/orderman2/events/CrackOrderEvent.h | 11 +- .../events/CreateFIXBufferReplyEvent.h | 25 ++ .../events/CreateFIXBufferRequestEvent.h | 29 ++ .../orderman2/events/CreateOrderReplyEvent.h | 31 ++ .../events/CreateOrderRequestEvent.h | 34 +++ .../events/GatewayStatusChangeEvent.h | 2 +- .../sparkd/orderman2/events/MDRequestEvent.h | 17 ++ .../events/NewExecutionReportEvent.h | 34 +-- .../orderman2/events/NewSecuritiesEvent.h | 2 +- .../orderman2/events/OrderStateUpdateEvent.h | 20 ++ .../sparkd/orderman2/events/OutFIXMsgEvent.h | 2 +- .../orderman2/events/StoredOrderEvent.h | 4 +- .../orderman2/events/UpdateOrderEvent.h | 12 +- .../order_factory/IOrderBuilderFactory.h | 16 - .../orderman2/order_factory/OrderBuilder.h | 11 - .../orderman2/order_factory/OrderFactory.cpp | 61 +++- .../orderman2/order_factory/OrderFactory.h | 4 +- .../orderman2_utils/ExecutionReport.h | 34 +++ .../sparkd/orderman2/orders/LimitOrder.h | 24 +- .../sparkd/orderman2/orders/NativeOrder.h | 17 ++ src/server/sparkd/orderman2/orders/Order.cpp | 12 +- src/server/sparkd/orderman2/orders/Order.h | 32 +- .../orderman2/orders/PostActivationServices.h | 15 + .../orderman2/orders/PreActivationServices.h | 23 ++ .../orderman2/server/OrderServiceServer2.cpp | 2 + 62 files changed, 1358 insertions(+), 268 deletions(-) create mode 100644 src/server/sparkd/mercury/actors/ContentSubscription.h create mode 100644 src/server/sparkd/mercury/actors/EventStream.h create mode 100644 src/server/sparkd/mercury/events/Stream.h rename src/server/sparkd/mercury/{synopsys => synopsis}/CacheAll.h (93%) rename src/server/sparkd/mercury/{synopsys => synopsis}/CacheLast.h (82%) create mode 100644 src/server/sparkd/mercury/synopsis/ISynopsisBuilder.h rename src/server/sparkd/mercury/{synopsys => synopsis}/ISynopsysBuilder.h (75%) rename src/server/sparkd/mercury/{synopsys => synopsis}/MergeByKey.h (96%) rename src/server/sparkd/mercury/{synopsys => synopsis}/NoSynopsis.h (71%) rename src/server/sparkd/mercury/{synopsys => synopsis}/SynopsisBuilder.cpp (100%) rename src/server/sparkd/mercury/{synopsys => synopsis}/SynopsisBuilder.h (100%) create mode 100644 src/server/sparkd/orderman2/actors/MDSource.h delete mode 100644 src/server/sparkd/orderman2/actors/OrderManager.cpp create mode 100644 src/server/sparkd/orderman2/actors/order_manager/ChildOrder.h create mode 100644 src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.cpp create mode 100644 src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h create mode 100644 src/server/sparkd/orderman2/actors/order_manager/OrderManager.cpp rename src/server/sparkd/orderman2/actors/{ => order_manager}/OrderManager.h (54%) create mode 100644 src/server/sparkd/orderman2/actors/order_manager/OrderServices.h create mode 100644 src/server/sparkd/orderman2/actors/order_manager/OrderServicesData.h create mode 100644 src/server/sparkd/orderman2/events/BookUpdateEvent.h create mode 100644 src/server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h create mode 100644 src/server/sparkd/orderman2/events/CreateFIXBufferRequestEvent.h create mode 100644 src/server/sparkd/orderman2/events/CreateOrderReplyEvent.h create mode 100644 src/server/sparkd/orderman2/events/CreateOrderRequestEvent.h create mode 100644 src/server/sparkd/orderman2/events/MDRequestEvent.h create mode 100644 src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h delete mode 100644 src/server/sparkd/orderman2/order_factory/IOrderBuilderFactory.h delete mode 100644 src/server/sparkd/orderman2/order_factory/OrderBuilder.h create mode 100644 src/server/sparkd/orderman2/orderman2_utils/ExecutionReport.h create mode 100644 src/server/sparkd/orderman2/orders/NativeOrder.h create mode 100644 src/server/sparkd/orderman2/orders/PostActivationServices.h create mode 100644 src/server/sparkd/orderman2/orders/PreActivationServices.h diff --git a/src/lib/api/services/OrderService2.proto b/src/lib/api/services/OrderService2.proto index 64792d512..a8c7800f4 100644 --- a/src/lib/api/services/OrderService2.proto +++ b/src/lib/api/services/OrderService2.proto @@ -24,7 +24,7 @@ service OrderService { } // request types -message Create {OrderDefinition new_order = 1;} +message Create {OrderDefinition new_order = 1;double price = 2; uint32 quantity = 3;} message Update {uint32 order_key = 1; double price = 2; uint32 quantity = 3;} message Cancel {uint32 order_key = 1;}; message Crack {uint32 order_key = 1;}; @@ -41,8 +41,6 @@ message OrderDefinition { // standard order elements uint32 security_key = 1; api.Side side = 2; - double initial_price = 3; - uint32 initial_quantity = 4; string login = 5; string account = 6; TimeInForce time_in_force = 7; diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index df03a0d91..07dc9bfc8 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/OrderManager.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/actors/order_manager/OrderBuilder.cpp;orderman2/actors/order_manager/OrderManager.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp index bda049c01..312c7cd86 100644 --- a/src/server/sparkd/cmds/TestOrderman.cpp +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -35,7 +35,6 @@ std::pair get_front_month_es_futures () { if (!sec_db) sec_db = new securities::SecurityDB(); - std::pair result; std::map es_futures; diff --git a/src/server/sparkd/mercury/actors/Actor.cpp b/src/server/sparkd/mercury/actors/Actor.cpp index 37b11d1f3..30ba66f2a 100644 --- a/src/server/sparkd/mercury/actors/Actor.cpp +++ b/src/server/sparkd/mercury/actors/Actor.cpp @@ -1,7 +1,7 @@ #include "Actor.h" #include "server/sparkd/orderman/md/Book.h" #include "lib/domain_model/common.h" -#include "server/sparkd/mercury/synopsys/CacheLast.h" +#include "server/sparkd/mercury/synopsis/CacheLast.h" #include "server/sparkd/mercury/events/Event.h" namespace bts { diff --git a/src/server/sparkd/mercury/actors/Actor.h b/src/server/sparkd/mercury/actors/Actor.h index 1b3a2bf92..1a6e48f2c 100644 --- a/src/server/sparkd/mercury/actors/Actor.h +++ b/src/server/sparkd/mercury/actors/Actor.h @@ -8,16 +8,11 @@ #include "server/sparkd/mercury/broker/AsyncEventBroker.h" #include "server/sparkd/mercury/topics/Topic.h" #include "server/sparkd/mercury/events/Update.h" +#include "server/sparkd/mercury/events/Stream.h" namespace bts { namespace mercury { -template class Stream -{ -public: - StreamID sid; -}; - GCC_DIAG_OFF("-Wnon-virtual-dtor") class Actor : public std::enable_shared_from_this { diff --git a/src/server/sparkd/mercury/actors/ContentSubscription.h b/src/server/sparkd/mercury/actors/ContentSubscription.h new file mode 100644 index 000000000..9df83adbb --- /dev/null +++ b/src/server/sparkd/mercury/actors/ContentSubscription.h @@ -0,0 +1,136 @@ +#pragma once + +#include +#include +#include +#include "server/sparkd/mercury/actors/Actor.h" + +#include "lib/utils/bts_assert.h" + +namespace bts { +namespace mercury { + +struct KeyExtractor +{ + template + auto operator()(const EV&ev) {return ev.key();} +}; + +struct NoKey +{ + template + auto operator()(const EV&) {return 0;} +}; + +template +class ContentSubscription +{ +public: + using Key = decltype( (*((KE *) nullptr)) (*((EV*) nullptr))); + using CB = std::function; + struct SubID { + Key k;uint32_t sid; + bool operator==(SubID const&rhs) const {return k == rhs.k && sid == rhs.sid;} + }; + + ContentSubscription() : + _actor(nullptr), + _sub(), + _my_subs(), + _dispatching(false), + _current_sub_id(0) + {} + + ContentSubscription(ContentSubscription &&src) + { + operator=(std::move(src)); + } + + ContentSubscription(Actor &actor) : + _actor(&actor), + _sub (_actor->subscribe([this] (auto const&u) {this->on_update(u);})), + _my_subs(), + _dispatching(false), + _current_sub_id(0) + {} + + template + ContentSubscription(Actor &actor,Tag const&tag): + _actor(&actor), + _sub (_actor->subscribe(tag,[this] (auto const&u) {this->on_update(u);})), + _my_subs(), + _dispatching(false), + _current_sub_id(0) + {} + + ContentSubscription& operator=(ContentSubscription &&src) + { + _actor = src._actor; + src._actor = nullptr; + _sub = src._sub; + src._sub = Actor::SubHandle(); + _my_subs = std::move(src._my_subs); + _dispatching = src._dispatching; + src._dispatching = false; + _current_sub_id = src._current_sub_id; + src._current_sub_id = 0; + return *this; + } + + template + SubID sub(Key k,CBT const&cb) { + bts_assert(!_dispatching); + auto sid = SubID {k,_current_sub_id++}; + auto &k_subs = _my_subs[k]; + k_subs.emplace_back(Subscriber {sid,CB (cb)}); + return sid; + } + + template + SubID sub(CBT &&cb) {return sub (0,std::forward(cb));} + + void unsub(SubID sid) + { + bts_assert(!_dispatching); + auto &subs = _my_subs[sid.k]; + auto it = std::find_if(subs.begin(),subs.end(), [sid](auto const&subscriber) { + return subscriber.id == sid; + }); + bts_assert (it != subs.end()); + subs.erase(it); + } + + ~ContentSubscription() { + bts_assert(!_dispatching); + _actor->unsubscribe(_sub); + } + +private: + struct Subscriber { SubID id; CB cb; }; + + using SubList = std::vector; + using Subscriptions = std::unordered_map; + + Actor *_actor; + Actor::SubHandle _sub; + Subscriptions _my_subs; + bool _dispatching; + uint32_t _current_sub_id; + + void on_update(Update const&u) + { + KE ke; + _dispatching = true; + if (u.events) + for (auto const &ev : *(u.events)) { + auto k = ke(ev); + for (auto const &sub : _my_subs[k]) + sub.cb(ev); + } + _dispatching = false; + } + +}; + +}} + diff --git a/src/server/sparkd/mercury/actors/EventStream.h b/src/server/sparkd/mercury/actors/EventStream.h new file mode 100644 index 000000000..a9f9c61a5 --- /dev/null +++ b/src/server/sparkd/mercury/actors/EventStream.h @@ -0,0 +1,46 @@ +#pragma once + +#include +#include +#include "server/sparkd/mercury/actors/ContentSubscription.h" + +namespace bts { +namespace orderman2 { + +template +struct EventStream +{ + using CS = mercury::ContentSubscription; + using SubID = typename CS::SubID; + + EventStream (CS&cs) : cs (cs) {} + + template + SubID sub(typename CS::Key k, CB&&cb) { + auto s = cs.sub(k,std::forward (cb)); + active_subs.push_back(s); + return s; + } + + template + SubID sub(CB&&cb) { + auto s = cs.sub(std::forward (cb)); + active_subs.push_back(s); + return s; + } + + void unsub(SubID sid) { + std::remove(active_subs.begin(),active_subs.end(),sid); + cs.unsub(sid); + } + + ~EventStream() { + while (active_subs.size()) unsub(active_subs.front()); + } + +private: + CS &cs; + boost::container::small_vector active_subs; +}; + +}} diff --git a/src/server/sparkd/mercury/broker/CoreEventBroker.cpp b/src/server/sparkd/mercury/broker/CoreEventBroker.cpp index 3016fd00f..b0cdae393 100644 --- a/src/server/sparkd/mercury/broker/CoreEventBroker.cpp +++ b/src/server/sparkd/mercury/broker/CoreEventBroker.cpp @@ -2,7 +2,7 @@ #include "lib/utils/Puid.h" #include "lib/utils/bts_assert.h" -#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/synopsis/ISynopsisBuilder.h" #include "server/sparkd/mercury/topics/ITopic.h" #include diff --git a/src/server/sparkd/mercury/events/Event.h b/src/server/sparkd/mercury/events/Event.h index b45fc82e6..b1bb9a4a6 100644 --- a/src/server/sparkd/mercury/events/Event.h +++ b/src/server/sparkd/mercury/events/Event.h @@ -3,7 +3,9 @@ #include #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include -#include "server/sparkd/mercury/synopsys/NoSynopsis.h" +#include "server/sparkd/mercury/synopsis/NoSynopsis.h" +#include "server/sparkd/mercury/synopsis/CacheAll.h" +#include "server/sparkd/mercury/synopsis/CacheLast.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/mercury/events/Stream.h b/src/server/sparkd/mercury/events/Stream.h new file mode 100644 index 000000000..3488f3074 --- /dev/null +++ b/src/server/sparkd/mercury/events/Stream.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" + +namespace bts { +namespace mercury { + +template class Stream +{ +public: + StreamID sid; +}; + + +}} + diff --git a/src/server/sparkd/mercury/events/TimerEvent.h b/src/server/sparkd/mercury/events/TimerEvent.h index e9e6ade84..920355901 100644 --- a/src/server/sparkd/mercury/events/TimerEvent.h +++ b/src/server/sparkd/mercury/events/TimerEvent.h @@ -4,7 +4,7 @@ #include "server/sparkd/mercury/events/Event.h" #include "server/sparkd/mercury/mercury_utils/mercury_common.h" #include "lib/utils/bts_chrono.h" -#include "server/sparkd/mercury/synopsys/NoSynopsis.h" +#include "server/sparkd/mercury/synopsis/NoSynopsis.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/mercury/synopsys/CacheAll.h b/src/server/sparkd/mercury/synopsis/CacheAll.h similarity index 93% rename from src/server/sparkd/mercury/synopsys/CacheAll.h rename to src/server/sparkd/mercury/synopsis/CacheAll.h index 31a008414..68dcdd188 100644 --- a/src/server/sparkd/mercury/synopsys/CacheAll.h +++ b/src/server/sparkd/mercury/synopsis/CacheAll.h @@ -6,7 +6,7 @@ namespace bts { namespace mercury { template -class CacheAll : public ISynopsysBuilder +class CacheAll : public ISynopsisBuilder { public: CacheAll() : _synopsis(), _empty(true) {} diff --git a/src/server/sparkd/mercury/synopsys/CacheLast.h b/src/server/sparkd/mercury/synopsis/CacheLast.h similarity index 82% rename from src/server/sparkd/mercury/synopsys/CacheLast.h rename to src/server/sparkd/mercury/synopsis/CacheLast.h index 1535a6c80..8236607e1 100644 --- a/src/server/sparkd/mercury/synopsys/CacheLast.h +++ b/src/server/sparkd/mercury/synopsis/CacheLast.h @@ -1,13 +1,13 @@ #pragma once #include -#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/synopsis/ISynopsisBuilder.h" #include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { -class CacheLast : public ISynopsysBuilder +class CacheLast : public ISynopsisBuilder { public: CacheLast() : _synopsis(), _empty(true) {} diff --git a/src/server/sparkd/mercury/synopsis/ISynopsisBuilder.h b/src/server/sparkd/mercury/synopsis/ISynopsisBuilder.h new file mode 100644 index 000000000..9eb107f8d --- /dev/null +++ b/src/server/sparkd/mercury/synopsis/ISynopsisBuilder.h @@ -0,0 +1,19 @@ +#pragma once + +#include +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" + +namespace bts { +namespace mercury { + +class ISynopsisBuilder +{ +public: + EventPayload* get_synopsis() {return nullptr;} + void update(EventPayload const&) {}; + void reset() {}; +}; + +using SynopsisBuilderPtr = std::shared_ptr ; + +}} diff --git a/src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h b/src/server/sparkd/mercury/synopsis/ISynopsysBuilder.h similarity index 75% rename from src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h rename to src/server/sparkd/mercury/synopsis/ISynopsysBuilder.h index a7869142f..9eb107f8d 100644 --- a/src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h +++ b/src/server/sparkd/mercury/synopsis/ISynopsysBuilder.h @@ -6,7 +6,7 @@ namespace bts { namespace mercury { -class ISynopsysBuilder +class ISynopsisBuilder { public: EventPayload* get_synopsis() {return nullptr;} @@ -14,6 +14,6 @@ public: void reset() {}; }; -using SynopsisBuilderPtr = std::shared_ptr ; +using SynopsisBuilderPtr = std::shared_ptr ; }} diff --git a/src/server/sparkd/mercury/synopsys/MergeByKey.h b/src/server/sparkd/mercury/synopsis/MergeByKey.h similarity index 96% rename from src/server/sparkd/mercury/synopsys/MergeByKey.h rename to src/server/sparkd/mercury/synopsis/MergeByKey.h index 4faf6c5da..cb4ddaf30 100644 --- a/src/server/sparkd/mercury/synopsys/MergeByKey.h +++ b/src/server/sparkd/mercury/synopsis/MergeByKey.h @@ -7,7 +7,7 @@ namespace bts { namespace mercury { template -class MergeByKey : public ISynopsysBuilder +class MergeByKey : public ISynopsisBuilder { public: using Key = decltype( ((EV*) nullptr)->key()); diff --git a/src/server/sparkd/mercury/synopsys/NoSynopsis.h b/src/server/sparkd/mercury/synopsis/NoSynopsis.h similarity index 71% rename from src/server/sparkd/mercury/synopsys/NoSynopsis.h rename to src/server/sparkd/mercury/synopsis/NoSynopsis.h index 5eb4ea0de..063b54a8e 100644 --- a/src/server/sparkd/mercury/synopsys/NoSynopsis.h +++ b/src/server/sparkd/mercury/synopsis/NoSynopsis.h @@ -1,13 +1,13 @@ #pragma once #include -#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/synopsis/ISynopsisBuilder.h" #include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { -class NoSynopsis : public ISynopsysBuilder +class NoSynopsis : public ISynopsisBuilder { public: EventPayload* get_synopsis() {return nullptr;} diff --git a/src/server/sparkd/mercury/synopsys/SynopsisBuilder.cpp b/src/server/sparkd/mercury/synopsis/SynopsisBuilder.cpp similarity index 100% rename from src/server/sparkd/mercury/synopsys/SynopsisBuilder.cpp rename to src/server/sparkd/mercury/synopsis/SynopsisBuilder.cpp diff --git a/src/server/sparkd/mercury/synopsys/SynopsisBuilder.h b/src/server/sparkd/mercury/synopsis/SynopsisBuilder.h similarity index 100% rename from src/server/sparkd/mercury/synopsys/SynopsisBuilder.h rename to src/server/sparkd/mercury/synopsis/SynopsisBuilder.h diff --git a/src/server/sparkd/mercury/topics/ITopic.h b/src/server/sparkd/mercury/topics/ITopic.h index 4f70ffbdc..34d7d9834 100644 --- a/src/server/sparkd/mercury/topics/ITopic.h +++ b/src/server/sparkd/mercury/topics/ITopic.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/synopsis/ISynopsisBuilder.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman/md/Book.h b/src/server/sparkd/orderman/md/Book.h index 40bd53bde..65d677f91 100644 --- a/src/server/sparkd/orderman/md/Book.h +++ b/src/server/sparkd/orderman/md/Book.h @@ -10,7 +10,6 @@ namespace bts { namespace orderman { using BookSide = std::array ; -class MDSource; class Book { public: diff --git a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp index 58e002e61..24de40dd3 100644 --- a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp +++ b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp @@ -37,7 +37,7 @@ struct ExecutionGateway::PImpl {} JFGw gw; - boost::object_pool exe_report_pool; + boost::object_pool exe_report_pool; State state; std::unordered_map securities; mercury::Stream exe_report_stream; @@ -140,7 +140,7 @@ void ExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &msg) api::orderman2::MANUAL_ORDER_INDICATOR_YES ; str_to(msg.get(),&data->exchange_order_id); data->price = securities::decode_exchange_price(*sec,Price (msg.get())); - data->order_quantity = Quantity(msg.get()); + data->quantity = Quantity(msg.get()); data->filled_quantity = Quantity(msg.get()); data->last_shares = msg.has()? Quantity(msg.get()):Quantity(0); data->last_price = msg.has()? diff --git a/src/server/sparkd/orderman2/actors/MDSource.h b/src/server/sparkd/orderman2/actors/MDSource.h new file mode 100644 index 000000000..826c8c9e0 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/MDSource.h @@ -0,0 +1,69 @@ +#pragma once + +#include "server/sparkd/mercury/actors/Actor.h" +#include "server/sparkd/orderman2/events/BookUpdateEvent.h" +#include "server/sparkd/orderman2/events/MDRequestEvent.h" +#include "lib/utils/TimeStamp.h" +#include "lib/md/MDConsumerHandle.h" +#include "lib/md/MDRecoverableConsumer.h" +#include "lib/logging/logging.h" + +namespace bts { +namespace orderman2 { + +class MDSource : public mercury::Actor +{ +public: + void init() override + { + subscribe([this] (auto const&update) { + if (update.events) + for (auto const &ev : *update.events) { + auto k = ev.security_key.value(); + + for (auto &h : _handles) + if (h.handle->key() == k) { + // we want to resend this MD so that late joiners can + // catch up + h.last = utils::TimeStamp(); + return ; + } + + auto managed_handle = _md_consumer.get_managed_handle(k); + _keep_alive.push_back(managed_handle); + _handles.push_back({utils::TimeStamp(),managed_handle.get()}); + }}); + + subscribe (broker_id(), [this] (auto const&) { + auto out_stream = make_stream(); + Book book; + TickToTradeCorID corid; + + for (auto &h : _handles) { + auto &handle = h.handle; + if (handle->get_depth(h.last, + std::tuple_size(), + &book.bid()[0], + &book.ask()[0]) == md2::HandleReadResult::SUCCESS) { + book._security_key = SecurityKey(handle->key()); + corid = handle->sequence(); + LOG(Latency,Info,"MDSource {} {}", corid,utils::TimeStamp::now().to_uint64()); + publish(out_stream, book, corid); + } + } + }); + } + +private: + struct HandleRecord { + utils::TimeStamp last; + md2::MDConsumerHandle* handle; + }; + + std::vector _handles; + md::MDRecoverableConsumer _md_consumer; + std::vector> _keep_alive; +}; + +}} + diff --git a/src/server/sparkd/orderman2/actors/OrderManager.cpp b/src/server/sparkd/orderman2/actors/OrderManager.cpp deleted file mode 100644 index 7b628c3de..000000000 --- a/src/server/sparkd/orderman2/actors/OrderManager.cpp +++ /dev/null @@ -1,111 +0,0 @@ -#include "OrderManager.h" -#include "server/sparkd/orderman2/order_factory/OrderFactory.h" -#include "server/sparkd/securities/ISecurityDB.h" -#include "server/sparkd/securities/MapSecurityDB.h" -#include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" -#include "server/sparkd/orderman2/events/StoredOrderEvent.h" -#include "server/sparkd/orderman2/events/ActivateOrderEvent.h" -#include "server/sparkd/orderman2/events/UpdateOrderEvent.h" -#include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" -#include "server/sparkd/orderman2/orders/Order.h" - -#include - -namespace bts { -namespace orderman2 { - -enum -class OrderManager::State {WAIT_SEC, WAIT_ORDERS, READY } ; - -struct OrderManager::PImpl -{ - PImpl(config::JetFIX::Connection const &cfg) : - state (State::WAIT_SEC), - sec_db(), - orders(), - order_factory(sec_db), - stored_order_sub(), - cfg(cfg), - gw_name(GatewayName(cfg.name())) - {} - - State state; - securities::MapSecurityDB sec_db; - std::unordered_map orders; - OrderFactory order_factory; - mercury::Actor::SubHandle stored_order_sub; - const config::JetFIX::Connection cfg; - const GatewayName gw_name; -}; - -OrderManager::OrderManager (config::JetFIX::Connection const&cfg) : me (new PImpl(cfg)) {} -OrderManager::~OrderManager () {} - -void OrderManager::init() -{ - me->state = State::WAIT_SEC; - subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); -} - -void OrderManager::on_securities(const mercury::Update &update) -{ - if (update.events) { - - // update our security db - for (auto ev : *(update.events)) { - auto sec_ptr = ev.security; - me->sec_db.securities[SecurityKey(sec_ptr->id())] = sec_ptr; - } - - if (me->state == State::WAIT_SEC) { - // obtain recovered orders - me->state = State::WAIT_ORDERS; - me->stored_order_sub = - subscribe (me->gw_name, - [this] (auto const&orders) - {this->on_order_recovery(orders);}); - } - } -} - -void OrderManager::on_order_recovery(const mercury::Update &update) -{ - if (update.events) - if (me->state == State::WAIT_ORDERS) { - - // Got the first batch of persisted orders which has to match - // the orders stored on disk (since we are the only ones - // producing new orders) - for (auto const &ev : *(update.events)) { - auto &order = me->order_factory.recover(*ev.order_record); - me->orders[order.key()] = ℴ - order.pre_activate(me->sec_db, me->order_factory); - order.activate(); - } - - // Don't need to monitor persisted orders anymore, all the - // orders we care about will be generated by us. - unsubscribe(me->stored_order_sub); - - // Now we are ready to subscribe to the execution gateway - // events. Since we know all the orders that were stored in - // disk we will be able to match any execution reports we - // might get to persisted orders. Had we subscribed to - // gatewat events earlier we would not be able to tell wheter - // an order was already stored in disk or not when we - // received an execution report for it. Given that we know - // for sure that we have all the persisted orders, anything - // we can't match will signify that we crashed after we sent - // an order to the gateway but before we were able to persist - // it. In that case we will do our best to recover the order - // from the execution report. - subscribe (me->gw_name, - [this] (auto const&ev) {on_execution_report(ev);}); - } -} - -void OrderManager::on_execution_report(const mercury::Update &) -{ -} - -}} diff --git a/src/server/sparkd/orderman2/actors/order_manager/ChildOrder.h b/src/server/sparkd/orderman2/actors/order_manager/ChildOrder.h new file mode 100644 index 000000000..9f054044b --- /dev/null +++ b/src/server/sparkd/orderman2/actors/order_manager/ChildOrder.h @@ -0,0 +1,87 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/orderman2/actors/order_manager/OrderServices.h" +#include "lib/utils/bts_assert.h" + +namespace bts { +namespace orderman2 { + +class ChildOrder{ +public: + ChildOrder () + : _order(nullptr), + _order_services(nullptr), + _active(false) + {} + + ChildOrder (Order &o, OrderServices &services) + : _order(&o) , + _order_services(&services), + _active(false) + {} + + ChildOrder (ChildOrder &&src) + { + operator=(std::move(src)); + } + + ChildOrder& operator=(ChildOrder &&src) + { + _order = src._order; + _order_services = src._order_services; + _active = src._active; + + src._order = nullptr; + src._order_services = nullptr; + src._active = false; + return *this; + } + + OrderKey key() const + { + bts_assert(_order); + return _order->key(); + } + + void activate(Price p, Quantity q) + { + bts_assert(_order); + bts_assert(!_active); + _order_services->send_activate(*_order,p,q); + _active = true; + } + + void update(Price p, Quantity q) + { + bts_assert(_order); + bts_assert(_active); + _order_services->send_update(_order->key(),p,q); + } + + void crack() + { + bts_assert(_order); + bts_assert(_active); + _order_services->send_crack(_order->key()); + } + + void cancel() + { + bts_assert(_order); + bts_assert(_active); + _order_services->send_cancel(_order->key()); + } + +private: + friend class OrderBuilder; + Order* _order; + OrderServices *_order_services; + bool _active; +}; + + +}} + + diff --git a/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.cpp b/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.cpp new file mode 100644 index 000000000..e01011a09 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.cpp @@ -0,0 +1,8 @@ +#include "OrderBuilder.h" + +namespace bts { +namespace orderman2 { + +std::atomic OrderBuilder::_current_builder_id(0); + +}} diff --git a/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h b/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h new file mode 100644 index 000000000..bf623e4d9 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h @@ -0,0 +1,102 @@ +#pragma once + +#include +#include +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "lib/api/services/OrderService2.pb.h" +#include "server/sparkd/orderman2/orders/PreActivationServices.h" +#include "server/sparkd/orderman2/actors/order_manager/OrderServices.h" +#include "lib/logging/logging.h" +#include "server/sparkd/orderman2/actors/order_manager/ChildOrder.h" + +namespace bts { +namespace orderman2 { + +class OrderBuilder +{ +public: + OrderBuilder() {} + + OrderBuilder(OrderBuilder&&src) {operator=(std::move(src));} + + OrderBuilder(OrderKey parent_key, + api::orderman2::OrderDefinition const&def, + PreActivationOrderServices &srv, + size_t reserve_sz = 1) + : _parent_key(parent_key), + _definition(def) , + _reserve_sz(reserve_sz), + _order_stash(), + _builder_id(++_current_builder_id), + _order_services(nullptr) + + { + bts_assert(parent_key != null_order_key()); + while (_order_stash.size() != reserve_sz) + _order_stash.push_back(&srv.order_factory.create(parent_key,_definition)); + } + + void activate(OrderServices &order_services) + { + bts_assert(!_order_services); + _order_services = &order_services; + _order_services->order_creations.sub(_builder_id,[this] (auto const&order_ev) { + _order_stash.insert(_order_stash.end(),order_ev.orders.begin(),order_ev.orders.end()); + }); + } + + ChildOrder build() + { + bts_assert(_order_services); + + ChildOrder result; + if (_order_stash.size()) { + result = ChildOrder( *_order_stash.back(), + *_order_services); + _order_stash.pop_back(); + } + else { + LOG(OrderMan,Warn, + "Ran out of pre-allocated child orders for order {}. Will allocate directly. " + "This will have an impact on performance", _parent_key); + result = ChildOrder (_order_services->order_factory().create(_parent_key,_definition), + *_order_services); + } + auto need = _reserve_sz - _order_stash.size(); + if (need > 0) + _order_services->send_order_create_req(_builder_id,_parent_key,_definition,need); + return result; + } + + OrderBuilder& operator=(OrderBuilder &&src) + { + move_here(src); + return *this; + } + +private: + void move_here(OrderBuilder &src) + { + bts_assert(!_order_services); + _parent_key = src._parent_key; + _definition= src._definition; + _reserve_sz = src._reserve_sz; + _order_stash = src._order_stash; + _builder_id = src._builder_id; + src._order_stash.clear(); + src._builder_id = 0; + src._order_services = nullptr; + bts_assert(_parent_key != null_order_key()); + } + + OrderKey _parent_key; + api::orderman2::OrderDefinition _definition; + size_t _reserve_sz; + std::vector _order_stash; + size_t _builder_id ; + OrderServices *_order_services; + + static std::atomic _current_builder_id; +}; + +}} diff --git a/src/server/sparkd/orderman2/actors/order_manager/OrderManager.cpp b/src/server/sparkd/orderman2/actors/order_manager/OrderManager.cpp new file mode 100644 index 000000000..7d270a728 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/order_manager/OrderManager.cpp @@ -0,0 +1,273 @@ +#include "server/sparkd/orderman2/actors/order_manager/OrderServicesData.h" + +#include "OrderManager.h" + + +#include + +#include "server/sparkd/jetfix/common/OutFIX.h" +#include "server/sparkd/orderman2/order_factory/OrderFactory.h" +#include "server/sparkd/orderman2/orders/Order.h" +#include "server/sparkd/securities/ISecurityDB.h" +#include "server/sparkd/orderman2/actors/order_manager/OrderServices.h" + +namespace bts { +namespace orderman2 { + +using namespace mercury; +const auto fix_buffer_pool_size = 10000; + +enum class OrderManager::State {WAIT_SEC, WAIT_ORDERS, READY } ; + +struct OrderManager::OrderInfo { + OrderInfo (Order &o, OrderServicesData &data) + : order(&o), + order_services(std::make_unique (data)) + {} + + OrderInfo() = default; + OrderInfo(OrderInfo &&src) = default; + OrderInfo& operator=(OrderInfo &&src) = default; + + Order *order; + std::unique_ptr order_services; +}; + +struct OrderManager::PImpl +{ + PImpl(config::JetFIX::Connection const &cfg, Actor&owner) : + state (State::WAIT_SEC), + cfg(cfg), + gw_name(GatewayName(cfg.name())), + services_data(cfg,owner) + {} + + State state; + std::unordered_map orders; + mercury::Actor::SubHandle stored_order_sub; + const config::JetFIX::Connection cfg; + const GatewayName gw_name; + OrderServicesData services_data; +}; + +OrderManager::OrderManager (config::JetFIX::Connection const&cfg) : me (new PImpl(cfg,*this)) {} +OrderManager::~OrderManager () {} + +void OrderManager::init() +{ + subscribe([this] (auto const&sec_update) {this->on_securities(sec_update);}); +} + +void OrderManager::on_securities(const mercury::Update &update) +{ + if (update.events) { + + // update our security db + for (auto ev : *(update.events)) { + auto sec_ptr = ev.security; + me->services_data.sec_db.securities[SecurityKey(sec_ptr->id())] = sec_ptr; + } + + if (me->state == State::WAIT_SEC) { + // obtain recovered orders + me->state = State::WAIT_ORDERS; + me->stored_order_sub = + subscribe (me->gw_name, + [this] (auto const&orders) + {this->on_order_recovery(orders);}); + } + } +} + +void OrderManager::on_order_recovery(const mercury::Update &update) +{ + if (update.events) + if (me->state == State::WAIT_ORDERS) { + // Got the first batch of persisted orders which has to match + // the orders stored on disk (since we are the only ones + // producing new orders) + for (auto const &ev : *(update.events)) { + auto &order = me->services_data.order_factory.recover(*ev.order_record); + auto const&ostate = ev.order_record->state(); + OrderInfo oi {order,me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[order.key()] = std::move(oi); + order.on_activate(Price(ostate.price()), + Quantity(ostate.quantity()), *serv_ptr); + } + + // Don't need to monitor persisted orders anymore, all the + // orders we care about will be generated by us. + unsubscribe(me->stored_order_sub); + + // Now we are ready to subscribe to the execution gateway + // events. Since we know all the orders that were stored in + // disk we will be able to match any execution reports we + // might get to persisted orders. Had we subscribed to + // gatewat events earlier we might not be able to tell wheter + // an order was already stored in disk or not when we + // received an execution report for it. Given that we know + // for sure that we have all the persisted orders, anything + // we can't match has to mean that we crashed after we sent + // an order to the gateway but before we were able to persist + // it. In that case we will do our best to recover the order + // from the execution report. That is the only purpose of + // this subscription. + subscribe (me->gw_name, + [this] (auto const&ev) {this->on_execution_report(ev);}); + + // we need to know the gateway status because some of our + // orders need to know it at activation time. The + // ContentSubscription mechanism does not provide a synopsis + // so we cache the last known state of the gateway ourselves + // and offer it to the orders. + subscribe (me->gw_name, + [this] (auto const&ev) {this->on_gateway_state(ev);}); + + // Order creation and maintenance + subscribe(me->gw_name, [this] (auto const&ev) {this->on_activate_order(ev);}); + subscribe(me->gw_name, [this] (auto const&ev) {this->on_update_order(ev);}); + subscribe(me->gw_name, [this] (auto const&ev) {this->on_cancel_order(ev);}); + subscribe(me->gw_name, [this] (auto const&ev) {this->on_crack_order(ev);}); + + // Allocating FIX buffers is relatively expensive so we try + // to keep a pool of pre-allocated buffers ready. To + // replinish the pool we issue CreateFIXBufferRequestEvent + // and listen for replies + while (free_buffers().size() != fix_buffer_pool_size) + free_buffers().push_back(std::make_shared(me->cfg)); + subscribe(me->gw_name, + [this] (auto const &ev) {this->on_new_fix_buffer(ev);}); + + // Subscription setup/teardown is a relatively heavy + // operation. For that reason we use coarse-grained topics to + // which we subscribe at startup. Individual orders can + // obtain fine-grained and light weight filtering through the + // ContentSubscription helper class. + me->services_data.md_subs = ContentSubscription (*this); + me->services_data.child_order_subs = ContentSubscription (*this); + me->services_data.md_subs = ContentSubscription (*this); + me->services_data.exe_report_subs = ContentSubscription (*this,me->gw_name); + me->services_data.cancel_reject_subs = ContentSubscription (*this,me->gw_name); + me->services_data.gateway_status_subs = ContentSubscription (*this); + me->services_data.time_subs = ContentSubscription (*this); + me->services_data.order_creation_subs = ContentSubscription (*this,me->gw_name); + + // Outputs + me->services_data.order_state_pub = make_stream(); + me->services_data.out_fix_pub = make_stream(me->gw_name); + me->services_data.activate_order_pub = make_stream(me->gw_name); + me->services_data.update_order_pub = make_stream(me->gw_name); + me->services_data.cancel_order_pub = make_stream(me->gw_name); + me->services_data.crack_order_pub = make_stream(me->gw_name); + me->services_data.create_order_req_pub = make_stream(me->gw_name); + me->services_data.create_fix_req_pub = make_stream(me->gw_name); + me->services_data.md_request_pub = make_stream(); + } +} + +void OrderManager::on_execution_report(const mercury::Update &m) +{ + if (m.events) + for (auto const &report: *m.events) { + auto k = report.data->order_key; + auto it = me->orders.find(k); + if (it == me->orders.end()) { + LOG(OrderMan,Error, + "Received an execution report for an unknown order with key {}. " + "Order state will be reconstructed from this report but some information " + "will be lost, including CustomerOrFirm,CTI code and " + "parent order id", k.value()); + auto order = &me->services_data.order_factory.recreate_from_exe_report(*report.data); + OrderInfo oi {*order,me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[order->key()] = std::move(oi); + order->on_activate(report.data->price,report.data->quantity,*serv_ptr); + } + } +} + +void OrderManager::on_activate_order(const mercury::Update &m) +{ + if (m.events) + for (auto const &ev: *m.events) { + auto order = ev.order; + auto k = order->key(); + bts_assert(me->orders.find(k) != me->orders.end()); + OrderInfo oi {*order,me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[k] = std::move(oi); + order->on_activate(ev.price,ev.quantity,*serv_ptr); + } +} +void OrderManager::on_update_order(const mercury::Update &m) +{ + if (m.events) + for (auto const &ev: *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_update(ev.price,ev.quantity); + else { + LOG(OrderMan,Error, + "Received an update request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } +} + +void OrderManager::on_cancel_order(const mercury::Update &m) +{ + if (m.events) + for (auto const &ev: *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_cancel(); + else { + LOG(OrderMan,Error, + "Received a cancel request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } +} + +void OrderManager::on_crack_order(const mercury::Update &m) +{ + if (m.events) + for (auto const &ev: *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_crack(); + else { + LOG(OrderMan,Error, + "Received a crack request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } +} + +void OrderManager::on_gateway_state(const mercury::Update &m) +{ + if (m.events) + for (auto ev : *m.events) + me->services_data.gw_connected = ev.is_connected; +} + +void OrderManager::on_new_fix_buffer(const mercury::Update &m) +{ + if (m.events) + for (auto ev : *m.events) + free_buffers().insert(free_buffers().end(), + ev.buffers.begin(), ev.buffers.end()); +} + + +std::vector &OrderManager::free_buffers() +{return me->services_data.free_buffers;} + +}} diff --git a/src/server/sparkd/orderman2/actors/OrderManager.h b/src/server/sparkd/orderman2/actors/order_manager/OrderManager.h similarity index 54% rename from src/server/sparkd/orderman2/actors/OrderManager.h rename to src/server/sparkd/orderman2/actors/order_manager/OrderManager.h index 6ea3417e3..3740e5f99 100644 --- a/src/server/sparkd/orderman2/actors/OrderManager.h +++ b/src/server/sparkd/orderman2/actors/order_manager/OrderManager.h @@ -2,14 +2,22 @@ #include #include "server/sparkd/mercury/actors/Actor.h" +#include "server/sparkd/jetfix/common/OutFIXPtr.h" #include "lib/config/protos/jetfix.pb.h" // fwd namespace bts { -namespace orderman2 {class NewSecuritiesEvent;} -namespace orderman2 {class NewExecutionReportEvent;} -namespace orderman2 {class StoredOrderEvent;} -} +namespace orderman2 { +class NewSecuritiesEvent; +class NewExecutionReportEvent; +class ActivateOrderEvent; +class UpdateOrderEvent; +class CancelOrderEvent; +class CrackOrderEvent; +class StoredOrderEvent; +class CreateFIXBufferReplyEvent; +class GatewayStatusChangeEvent; +}} namespace bts { namespace orderman2 { @@ -24,6 +32,7 @@ namespace orderman2 { // - security creation events // - timer updates // - order state changes +// - order update/cancel/crack events class OrderManager : public mercury::Actor { public: @@ -35,7 +44,16 @@ private: void on_securities(const mercury::Update &); void on_order_recovery(const mercury::Update &); void on_execution_report(const mercury::Update &); + void on_activate_order(const mercury::Update &); + void on_update_order(const mercury::Update &); + void on_cancel_order(const mercury::Update &); + void on_crack_order(const mercury::Update &); + void on_new_fix_buffer(const mercury::Update &); + void on_gateway_state(const mercury::Update &); + + std::vector &free_buffers(); enum class State; + struct OrderInfo; struct PImpl; std::unique_ptr me; }; diff --git a/src/server/sparkd/orderman2/actors/order_manager/OrderServices.h b/src/server/sparkd/orderman2/actors/order_manager/OrderServices.h new file mode 100644 index 000000000..faf576be2 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/order_manager/OrderServices.h @@ -0,0 +1,78 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/actors/order_manager/OrderServicesData.h" +#include "server/sparkd/mercury/actors/EventStream.h" +#include "lib/logging/logging.h" +#include "server/sparkd/jetfix/common/OutFIX.h" + +namespace bts { +namespace orderman2 { + + +class OrderServices +{ +public: + + OrderServices (OrderServicesData &data) : + book_updates(data.md_subs), + child_updates(data.child_order_subs), + exe_reports(data.exe_report_subs), + cancel_rejects(data.cancel_reject_subs), + gateway_status(data.gateway_status_subs), + time_change(data.time_subs), + order_creations(data.order_creation_subs), + _data(data) + {} + + EventStream book_updates; + EventStream child_updates; + EventStream exe_reports; + EventStream cancel_rejects; + EventStream gateway_status; + EventStream time_change; + + jetfix::OutFIXPtr get_fix_buffer() + { + jetfix::OutFIXPtr result; + if (_data.free_buffers.size()) { + result = _data.free_buffers.back(); + _data.free_buffers.pop_back(); + } + else { + LOG(OrderMan,Warn, + "Ran out of fix buffers in {}. Will allocate directly. " + "This will have an impact on performance", + _data.cfg.name()); + result = std::make_shared(_data.cfg); + } + auto need = _data.free_buffers.capacity() - _data.free_buffers.size(); + if (need > 0) + _data.owner.publish(_data.create_fix_req_pub, need,_data.cfg); + return result; + } + + void send_fix_buffer(TickToTradeCorID cid,jetfix::OutFIXPtr const&fix) + {_data.owner.publish(_data.out_fix_pub,cid,fix);} + + securities::ISecurityDB &sec_db() {return _data.sec_db;} +private: + friend class OrderBuilder; + IOrderFactory &order_factory() {return _data.order_factory;} + + EventStream order_creations; + void send_order_create_req(size_t builder_id,OrderKey pk, api::orderman2::OrderDefinition const &def,size_t n_orders) + {_data.owner.publish(_data.create_order_req_pub, builder_id, pk, def,n_orders);} + + friend class ChildOrder; + void send_activate(Order &o,Price p, Quantity q) {_data.owner.publish(_data.activate_order_pub,o,p,q);} + void send_update(OrderKey k, Price p, Quantity q) {_data.owner.publish(_data.update_order_pub,k,p,q);} + void send_crack(OrderKey k) {_data.owner.publish(_data.crack_order_pub,k);} + void send_cancel(OrderKey k) {_data.owner.publish(_data.cancel_order_pub,k);} + + OrderServicesData &_data; +}; + +}} + + diff --git a/src/server/sparkd/orderman2/actors/order_manager/OrderServicesData.h b/src/server/sparkd/orderman2/actors/order_manager/OrderServicesData.h new file mode 100644 index 000000000..035754358 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/order_manager/OrderServicesData.h @@ -0,0 +1,78 @@ +#pragma once + +#include + +#include "server/sparkd/mercury/events/Stream.h" +#include "server/sparkd/securities/MapSecurityDB.h" +#include "server/sparkd/mercury/actors/ContentSubscription.h" +#include "server/sparkd/orderman2/order_factory/OrderFactory.h" + +#include "server/sparkd/mercury/events/TimerEvent.h" +#include "server/sparkd/orderman2/events/ActivateOrderEvent.h" +#include "server/sparkd/orderman2/events/BookUpdateEvent.h" +#include "server/sparkd/orderman2/events/CancelOrderEvent.h" +#include "server/sparkd/orderman2/events/CancelRejectEvent.h" +#include "server/sparkd/orderman2/events/CrackOrderEvent.h" +#include "server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h" +#include "server/sparkd/orderman2/events/CreateFIXBufferRequestEvent.h" +#include "server/sparkd/orderman2/events/CreateOrderReplyEvent.h" +#include "server/sparkd/orderman2/events/CreateOrderRequestEvent.h" +#include "server/sparkd/orderman2/events/GatewayStatusChangeEvent.h" +#include "server/sparkd/orderman2/events/GatewayStatusChangeEvent.h" +#include "server/sparkd/orderman2/events/NewExecutionReportEvent.h" +#include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" +#include "server/sparkd/orderman2/events/OrderStateUpdateEvent.h" +#include "server/sparkd/orderman2/events/OutFIXMsgEvent.h" +#include "server/sparkd/orderman2/events/StoredOrderEvent.h" +#include "server/sparkd/orderman2/events/UpdateOrderEvent.h" +#include "server/sparkd/orderman2/events/MDRequestEvent.h" + +namespace bts { +namespace orderman2 { + +struct ParentKey +{ + OrderKey operator()(const OrderStateUpdateEvent&ev) + {return ev.parent_key;} +}; + +class OrderServicesData +{ +public: + OrderServicesData (config::JetFIX::Connection const &cfg, mercury::Actor&owner) : + owner(owner), + order_factory(sec_db), + cfg(cfg), + gw_connected(false) + {} + + mercury::Actor &owner; + securities::MapSecurityDB sec_db; + OrderFactory order_factory; + const config::JetFIX::Connection cfg; + + bool gw_connected; + + + mercury::ContentSubscription md_subs; + mercury::ContentSubscription child_order_subs; + mercury::ContentSubscription exe_report_subs; + mercury::ContentSubscription cancel_reject_subs; + mercury::ContentSubscription gateway_status_subs; + mercury::ContentSubscription time_subs; + mercury::ContentSubscription order_creation_subs; + + mercury::Stream order_state_pub; + mercury::Stream out_fix_pub; + mercury::Stream activate_order_pub; + mercury::Stream update_order_pub; + mercury::Stream cancel_order_pub; + mercury::Stream crack_order_pub; + mercury::Stream create_order_req_pub; + mercury::Stream create_fix_req_pub; + mercury::Stream md_request_pub; + + std::vector free_buffers; +}; + +}} diff --git a/src/server/sparkd/orderman2/doc/event_flow.pdf b/src/server/sparkd/orderman2/doc/event_flow.pdf index 7732f471bfb905ea80167204bc7c7df9ef8cae56..b29b00ec74f46e341e33b067a97dd83fbf41c63f 100644 GIT binary patch delta 17495 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 y1r#$i#ZYH%UW?{~ys_N?R#svVa2>M$9 delta 17168 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 Tlf}J!xs1(BxKveL{oS|#LzZv2 diff --git a/src/server/sparkd/orderman2/doc/order_man_notes.org b/src/server/sparkd/orderman2/doc/order_man_notes.org index 40d314715..10eb397f2 100644 --- a/src/server/sparkd/orderman2/doc/order_man_notes.org +++ b/src/server/sparkd/orderman2/doc/order_man_notes.org @@ -387,11 +387,14 @@ digraph G { SecSrc UI OrderStore - AsyncOFactory + OrderFactory + FIXFactory } - AsyncOFactory -> OMan [label=new_o] - OMan -> AsyncOFactory [label=req_new_o] + OMan -> OrderFactory [label=req] + OrderFactory -> OMan [label=rep] + OMan -> FIXFactory [label=req] + FIXFactory -> OMan [label=rep] SecSrc -> GW [label=psec] SecSrc -> OrderStore [label=psec] SecSrc -> OMan [label=psec] diff --git a/src/server/sparkd/orderman2/events/ActivateOrderEvent.h b/src/server/sparkd/orderman2/events/ActivateOrderEvent.h index be07a2249..1d96b1b92 100644 --- a/src/server/sparkd/orderman2/events/ActivateOrderEvent.h +++ b/src/server/sparkd/orderman2/events/ActivateOrderEvent.h @@ -12,10 +12,15 @@ class ActivateOrderEvent : public mercury::Event { public: using Tag = GatewayName; - using SynopsysPolicy = mercury::NoSynopsis; + using SynopsisPolicy = mercury::NoSynopsis; - ActivateOrderEvent (Order &o) : order (&o) {} - Order* order; + ActivateOrderEvent (Order &o,Price p, Quantity q) : + order (&o),price(p),quantity(q) + {} + + Order* order; + Price price; + Quantity quantity; }; }} diff --git a/src/server/sparkd/orderman2/events/BookUpdateEvent.h b/src/server/sparkd/orderman2/events/BookUpdateEvent.h new file mode 100644 index 000000000..02d439633 --- /dev/null +++ b/src/server/sparkd/orderman2/events/BookUpdateEvent.h @@ -0,0 +1,22 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/orderman2/orderman2_utils/Book.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { + +class BookUpdateEvent : public mercury::Event { +public: + using SynopsisPolicy = mercury::NoSynopsis; + Book book; + TickToTradeCorID correlation_id; + SecurityKey key() const {return book.security_key();} + + BookUpdateEvent(const Book &b, TickToTradeCorID corid) : book(b), correlation_id(corid) {} +}; + +}} diff --git a/src/server/sparkd/orderman2/events/CancelOrderEvent.h b/src/server/sparkd/orderman2/events/CancelOrderEvent.h index c004bf952..4cf8d6c5b 100644 --- a/src/server/sparkd/orderman2/events/CancelOrderEvent.h +++ b/src/server/sparkd/orderman2/events/CancelOrderEvent.h @@ -8,12 +8,17 @@ namespace bts { namespace orderman2 { -class CancelOrderEvent : public mercury::Event +class CancelOrderEvent : public mercury::Event { public: using Tag = GatewayName; - CancelOrderEvent (Order &o) : order (&i(o)) {} - Order* order; + using SynopsisPolicy = mercury::NoSynopsis; + + CancelOrderEvent (OrderKey k) : k (k) {} + +// used by ContentSubscription + OrderKey key() const {return k;} + OrderKey k; }; }} diff --git a/src/server/sparkd/orderman2/events/CancelRejectEvent.h b/src/server/sparkd/orderman2/events/CancelRejectEvent.h index 911809894..4590bbccc 100644 --- a/src/server/sparkd/orderman2/events/CancelRejectEvent.h +++ b/src/server/sparkd/orderman2/events/CancelRejectEvent.h @@ -6,7 +6,7 @@ #include "lib/domain_model/common.h" #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include "server/sparkd/mercury/events/Event.h" -#include "server/sparkd/mercury/synopsys/NoSynopsis.h" +#include "server/sparkd/mercury/synopsis/NoSynopsis.h" namespace bts { namespace orderman2 { diff --git a/src/server/sparkd/orderman2/events/CrackOrderEvent.h b/src/server/sparkd/orderman2/events/CrackOrderEvent.h index 200b0d89f..c38dd633e 100644 --- a/src/server/sparkd/orderman2/events/CrackOrderEvent.h +++ b/src/server/sparkd/orderman2/events/CrackOrderEvent.h @@ -8,12 +8,17 @@ namespace bts { namespace orderman2 { -class CrackOrderEvent : public mercury::Event +class CrackOrderEvent : public mercury::Event { public: using Tag = GatewayName; - CrackOrderEvent(Order &o) : order (&i(o)) {} - Order* order; + using SynopsisPolicy = mercury::NoSynopsis; + + CrackOrderEvent(OrderKey k) : k (k) {} + +// used by ContentSubscription + OrderKey key() const {return k;} + OrderKey k; }; }} diff --git a/src/server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h b/src/server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h new file mode 100644 index 000000000..2a1756c37 --- /dev/null +++ b/src/server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h @@ -0,0 +1,25 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" +#include "server/sparkd/jetfix/common/OutFIXPtr.h" + +namespace bts { +namespace orderman2 { + +class CreateFIXBufferReplyEvent: public mercury::Event +{ +public: + using Tag = GatewayName; + using SynopsisPolicy = mercury::NoSynopsis; + + CreateFIXBufferReplyEvent (std::vector const&b) : buffers(b) {} + CreateFIXBufferReplyEvent (std::vector &&b) : buffers(std::move(b)) {} + + std::vector buffers; +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/CreateFIXBufferRequestEvent.h b/src/server/sparkd/orderman2/events/CreateFIXBufferRequestEvent.h new file mode 100644 index 000000000..b396c1469 --- /dev/null +++ b/src/server/sparkd/orderman2/events/CreateFIXBufferRequestEvent.h @@ -0,0 +1,29 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" +#include "lib/config/protos/jetfix.pb.h" + +namespace bts { +namespace orderman2 { + +class CreateFIXBufferRequestEvent: public mercury::Event +{ +public: + using Tag = GatewayName; + using SynopsisPolicy = mercury::NoSynopsis; + + CreateFIXBufferRequestEvent (size_t n_buffers, + config::JetFIX::Connection const &cfg) : + n_buffers(n_buffers), + cfg(&cfg) + {} + + size_t n_buffers; + config::JetFIX::Connection const *cfg; +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/CreateOrderReplyEvent.h b/src/server/sparkd/orderman2/events/CreateOrderReplyEvent.h new file mode 100644 index 000000000..5f5f24478 --- /dev/null +++ b/src/server/sparkd/orderman2/events/CreateOrderReplyEvent.h @@ -0,0 +1,31 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" +#include "server/sparkd/orderman2/orders/Order.h" + +namespace bts { +namespace orderman2 { +class Order; + +class CreateOrderReplyEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + using SynopsisPolicy = mercury::NoSynopsis; + + CreateOrderReplyEvent (size_t request_id,std::vector &&orders) : + request_id(request_id), + orders(std::move(orders)) + {} + + size_t key() const{return request_id;} + + size_t request_id; + std::vector orders; +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/CreateOrderRequestEvent.h b/src/server/sparkd/orderman2/events/CreateOrderRequestEvent.h new file mode 100644 index 000000000..e085dcd78 --- /dev/null +++ b/src/server/sparkd/orderman2/events/CreateOrderRequestEvent.h @@ -0,0 +1,34 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { +class Order; + +class CreateOrderRequestEvent : public mercury::Event +{ +public: + using Tag = GatewayName; + using SynopsisPolicy = mercury::CacheAll; + + CreateOrderRequestEvent (size_t request_id,OrderKey parent_key, + api::orderman2::OrderDefinition const &def, + size_t n_orders) : + request_id(request_id), + parent_key(parent_key), + def(&def), + n_orders(n_orders) + {} + + size_t request_id; + OrderKey parent_key; + api::orderman2::OrderDefinition const *def; + size_t n_orders; +}; + +}} + diff --git a/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h b/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h index 568e4fc2e..e575aecd3 100644 --- a/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h +++ b/src/server/sparkd/orderman2/events/GatewayStatusChangeEvent.h @@ -2,7 +2,7 @@ #include #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" -#include "server/sparkd/mercury/synopsys/CacheLast.h" +#include "server/sparkd/mercury/synopsis/CacheLast.h" namespace bts { namespace orderman2 { diff --git a/src/server/sparkd/orderman2/events/MDRequestEvent.h b/src/server/sparkd/orderman2/events/MDRequestEvent.h new file mode 100644 index 000000000..1bf3d44dc --- /dev/null +++ b/src/server/sparkd/orderman2/events/MDRequestEvent.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/events/Event.h" + +namespace bts { +namespace orderman2 { + +class MDRequestEvent : public mercury::Event { +public: + using SynopsisPolicy = mercury::CacheAll; + SecurityKey security_key; +}; + +}} diff --git a/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h b/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h index c01cdaebe..2e56b2636 100644 --- a/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h +++ b/src/server/sparkd/orderman2/events/NewExecutionReportEvent.h @@ -7,8 +7,8 @@ #include "server/sparkd/mercury/mercury_utils/mercury_common.h" #include #include "server/sparkd/mercury/events/Event.h" -#include "server/sparkd/mercury/synopsys/CacheAll.h" - +#include "server/sparkd/mercury/synopsis/CacheAll.h" +#include "server/sparkd/orderman2/orderman2_utils/ExecutionReport.h" #include @@ -20,32 +20,10 @@ class NewExecutionReportEvent : public mercury::Event public: using Tag = GatewayName; using SynopsisPolicy = mercury::CacheAll; - - struct Data { - AccountName account_name; - OperatorID operator_id; - OrderKey order_key; - api::Security const*security; - api::Side side; - api::orderman2::TimeInForce time_in_force; - api::orderman2::NativeOrderType order_type; - api::orderman2::ExecType exec_type; - api::orderman2::NativeOrderStatus order_status; - api::orderman2::ManualOrderIndicator manual_order_indicator; - ExchangeOrderID exchange_order_id; - Price price; - Quantity order_quantity; - Quantity filled_quantity; - Quantity last_shares; - Price last_price; - Price avg_price; - ExchangeFillID exchange_fill_id; - mercury::TimeStampStr transact_time; - std::string reject_msg; - }; - Data const* data; - - NewExecutionReportEvent(const Data*dt) : data(dt) {}; + ExecutionReport const *data; + // used by ContentSubscription + OrderKey key() const {return data->order_key;} + NewExecutionReportEvent(const ExecutionReport*dt) : data(dt) {}; }; diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index a822428fe..f06c0ec6a 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -2,7 +2,7 @@ #include #include "server/sparkd/mercury/events/Event.h" -#include "server/sparkd/mercury/synopsys/CacheAll.h" +#include "server/sparkd/mercury/synopsis/CacheAll.h" #include "lib/domain_model/Security.h" namespace bts { diff --git a/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h b/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h new file mode 100644 index 000000000..411ce8df2 --- /dev/null +++ b/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h @@ -0,0 +1,20 @@ +#pragma once + +#include +#include "server/sparkd/mercury/events/Event.h" + +#include "lib/api/services/OrderService.pb.h" + +namespace bts { +namespace orderman2 { + +class OrderStateUpdateEvent : public mercury::Event +{ +public: + using SynopsisPolicy = mercury::NoSynopsis; + OrderKey key; + OrderKey parent_key; + api::orderman::OrderState state; +}; + +}} diff --git a/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h b/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h index e8ee66db8..7c061b358 100644 --- a/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h +++ b/src/server/sparkd/orderman2/events/OutFIXMsgEvent.h @@ -2,7 +2,7 @@ #include "server/sparkd/jetfix/common/OutFIXPtr.h" #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include "server/sparkd/mercury/events/Event.h" -#include "server/sparkd/mercury/synopsys/CacheAll.h" +#include "server/sparkd/mercury/synopsis/CacheAll.h" namespace bts { diff --git a/src/server/sparkd/orderman2/events/StoredOrderEvent.h b/src/server/sparkd/orderman2/events/StoredOrderEvent.h index 7c82d68a9..42c5c397c 100644 --- a/src/server/sparkd/orderman2/events/StoredOrderEvent.h +++ b/src/server/sparkd/orderman2/events/StoredOrderEvent.h @@ -3,7 +3,7 @@ #include #include #include "lib/api/services/OrderService2.pb.h" -#include "server/sparkd/mercury/synopsys/MergeByKey.h" +#include "server/sparkd/mercury/synopsis/MergeByKey.h" #include "lib/api/services/OrderService2.pb.h" namespace bts { @@ -13,7 +13,7 @@ class StoredOrderEvent : public mercury::Event { public: using Tag = GatewayName; - using SynopsysPolicy = mercury::MergeByKey; + using SynopsisPolicy = mercury::MergeByKey; auto key() {return order_record->key();} api::orderman2::OrderRecord *order_record; diff --git a/src/server/sparkd/orderman2/events/UpdateOrderEvent.h b/src/server/sparkd/orderman2/events/UpdateOrderEvent.h index cb6285f24..890b66f41 100644 --- a/src/server/sparkd/orderman2/events/UpdateOrderEvent.h +++ b/src/server/sparkd/orderman2/events/UpdateOrderEvent.h @@ -12,16 +12,20 @@ class UpdateOrderEvent : public mercury::Event { public: using Tag = GatewayName; - using SynopsysPolicy = mercury::NoSynopsis; + using SynopsisPolicy = mercury::NoSynopsis; - UpdateOrderEvent (Order &o, Price p, Quantity q) : - order (&o), price(p), quantity(q) + UpdateOrderEvent (OrderKey k, Price p, Quantity q) : + k(k), price(p), quantity(q) {} - Order* order; + // used by ContentSubscription + OrderKey key() const {return k;} + + OrderKey k; Price price; Quantity quantity; }; }} + diff --git a/src/server/sparkd/orderman2/order_factory/IOrderBuilderFactory.h b/src/server/sparkd/orderman2/order_factory/IOrderBuilderFactory.h deleted file mode 100644 index 1278ee15b..000000000 --- a/src/server/sparkd/orderman2/order_factory/IOrderBuilderFactory.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include -#include "server/sparkd/orderman2/order_factory/OrderBuilder.h" - -namespace bts { -namespace orderman2 { - -class IOrderBuilderFactory -{ -public: - virtual OrderBuilder make_builder(api::orderman::OrderDefinition const&,size_t reserve) = 0; - virtual ~IOrderBuilderFactory(); -}; - -}} diff --git a/src/server/sparkd/orderman2/order_factory/OrderBuilder.h b/src/server/sparkd/orderman2/order_factory/OrderBuilder.h deleted file mode 100644 index 8af331da4..000000000 --- a/src/server/sparkd/orderman2/order_factory/OrderBuilder.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include -#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" - -namespace bts { -namespace orderman2 { - -using OrderBuilder = std::function; - -}} diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp index 899bcd3eb..80509336d 100644 --- a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp @@ -5,6 +5,10 @@ #include "server/sparkd/orderman2/orders/Order.h" #include "lib/api/services/OrderService2.pb.h" #include "server/sparkd/orderman2/orders/LimitOrder.h" +#include "lib/logging/logging.h" +#include "server/sparkd/orderman2/orderman2_utils/ExecutionReport.h" +#include "server/sparkd/orderman2/orders/PreActivationServices.h" + #include #include @@ -25,7 +29,10 @@ OrderKey gen_order_id() return OrderKey(++current_oid); } else { + LOG(OrderMan,Info,"Generating new order ids"); auto next = utils::gen_id("order_id"); + LOG(OrderMan,Info,"First free order id is {0}", next); + bts_assert(next < std::numeric_limits::max()); remaining_in_batch = gen_batch_size; current_oid = next; @@ -46,21 +53,58 @@ OrderFactory::~OrderFactory () {} Order &OrderFactory::create (OrderKey parent,api::orderman2::OrderDefinition const&def) { - auto &order = allocate(def); - order.pre_init(gen_order_id(), parent,me->sec_db,*this); - order.create(def); + auto k = gen_order_id(); + auto pk = parent; + auto &order = allocate(k,pk,def); + order.on_init_new(def, PreActivationOrderServices{me->sec_db,*this}); return order; } Order &OrderFactory::recover(api::orderman2::OrderRecord const&rec) { - auto &order = allocate(rec.def()); - order.pre_init(OrderKey(rec.key()),OrderKey(rec.parent_key()),me->sec_db,*this); - order.recover(rec); + auto k = OrderKey(rec.key()); + auto pk = OrderKey(rec.parent_key()); + auto &order = allocate(k,pk,rec.def()); + order.on_init_recovered (rec, PreActivationOrderServices{me->sec_db,*this}); return order; } -Order &OrderFactory::allocate (api::orderman2::OrderDefinition const&def) +Order &OrderFactory::recreate_from_exe_report(ExecutionReport const&r) +{ + me->my_orders.emplace_back(); + auto &order_ptr = me->my_orders.back(); + + using namespace api::orderman2; + + switch (r.order_type) { + case NATIVE_ORDER_TYPE_UNDEFINED: + bts_assert(false); + break; + case NATIVE_ORDER_TYPE_MARKET: + bts_assert(false); + break; + case NATIVE_ORDER_TYPE_LIMIT: + order_ptr.reset (new LimitOrder()); + break; + case NATIVE_ORDER_TYPE_STOP: + bts_assert(false); + break; + case NATIVE_ORDER_TYPE_STOP_LIMIT: + bts_assert(false); + break; + case NATIVE_ORDER_TYPE_MARKET_LIMIT: + bts_assert(false); + break; + default: + bts_assert(false); + break; + } + order_ptr->_key = r.order_key; + order_ptr->_parent_key = null_order_key(); + return *order_ptr; +} + +Order &OrderFactory::allocate (OrderKey k, OrderKey pk,api::orderman2::OrderDefinition const&def) { using namespace bts::api::orderman2; @@ -93,7 +137,8 @@ Order &OrderFactory::allocate (api::orderman2::OrderDefinition const&def) bts_assert(false); break; } - + order_ptr->_key = k; + order_ptr->_parent_key = pk; return *order_ptr; } diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.h b/src/server/sparkd/orderman2/order_factory/OrderFactory.h index 20efbe1bb..1a4675ebb 100644 --- a/src/server/sparkd/orderman2/order_factory/OrderFactory.h +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.h @@ -7,6 +7,7 @@ namespace bts { namespace securities {class ISecurityDB;} namespace orderman2 {class Order;} +namespace orderman2 {class ExecutionReport;} namespace api {namespace orderman2 {class OrderDefinition;class OrderRecord;}}} // end fwd @@ -21,9 +22,10 @@ public: Order &create (OrderKey parent,api::orderman2::OrderDefinition const&) override; Order &recover(api::orderman2::OrderRecord const&); + Order &recreate_from_exe_report(ExecutionReport const&report); private: - Order &allocate (api::orderman2::OrderDefinition const&); + Order &allocate (OrderKey k, OrderKey pk, api::orderman2::OrderDefinition const&); struct PImpl; std::unique_ptr me; }; diff --git a/src/server/sparkd/orderman2/orderman2_utils/ExecutionReport.h b/src/server/sparkd/orderman2/orderman2_utils/ExecutionReport.h new file mode 100644 index 000000000..7469bd8a6 --- /dev/null +++ b/src/server/sparkd/orderman2/orderman2_utils/ExecutionReport.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" + +namespace bts { +namespace orderman2 { + +class ExecutionReport { +public: + AccountName account_name; + OperatorID operator_id; + OrderKey order_key; + api::Security const*security; + api::Side side; + api::orderman2::TimeInForce time_in_force; + api::orderman2::NativeOrderType order_type; + api::orderman2::ExecType exec_type; + api::orderman2::NativeOrderStatus order_status; + api::orderman2::ManualOrderIndicator manual_order_indicator; + ExchangeOrderID exchange_order_id; + Price price; + Quantity quantity; + Quantity filled_quantity; + Quantity last_shares; + Price last_price; + Price avg_price; + ExchangeFillID exchange_fill_id; + mercury::TimeStampStr transact_time; + std::string reject_msg; +}; + +}} diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.h b/src/server/sparkd/orderman2/orders/LimitOrder.h index 3b19dd21d..fac0b1302 100644 --- a/src/server/sparkd/orderman2/orders/LimitOrder.h +++ b/src/server/sparkd/orderman2/orders/LimitOrder.h @@ -3,25 +3,25 @@ #include #include "server/sparkd/orderman2/orders/Order.h" #include "lib/api/services/OrderService2.pb.h" +#include "server/sparkd/orderman2/orders/NativeOrder.h" namespace bts { namespace orderman2 { -class LimitOrder : public Order +class LimitOrder : public NativeOrder { public: ~LimitOrder() override; - void create(api::orderman2::OrderDefinition const&) override {}; - void recover(api::orderman2::OrderRecord const&) override {}; - void activate() override {}; - void update(Price , Quantity ) override {}; - void crack() override {}; - void cancel() override {}; - api::orderman2::OrderState const& state() override - { - static api::orderman2::OrderState result; - return result; - }; + + void on_init_new(api::orderman2::OrderDefinition const&, const PreActivationOrderServices&) override {} + void on_init_recovered(api::orderman2::OrderRecord const&, const PreActivationOrderServices &) override {} + void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &) override {}; + void on_activate(Price,Quantity,OrderServices &) override {} + + void on_update(Price , Quantity ) override {} + void on_crack() override {} + void on_cancel() override {} + }; }} diff --git a/src/server/sparkd/orderman2/orders/NativeOrder.h b/src/server/sparkd/orderman2/orders/NativeOrder.h new file mode 100644 index 000000000..3a2cfd8ae --- /dev/null +++ b/src/server/sparkd/orderman2/orders/NativeOrder.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/orders/Order.h" + +namespace bts { +namespace orderman2 { + +class ExecutionReport; + +class NativeOrder : public Order +{ +public: + virtual void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &) = 0; +}; + +}} diff --git a/src/server/sparkd/orderman2/orders/Order.cpp b/src/server/sparkd/orderman2/orders/Order.cpp index 5b6b8464c..1d6d250a4 100644 --- a/src/server/sparkd/orderman2/orders/Order.cpp +++ b/src/server/sparkd/orderman2/orders/Order.cpp @@ -3,16 +3,6 @@ namespace bts { namespace orderman2 { -struct Order::PImpl -{ - PImpl() - {} -}; - -Order::Order () : me (new PImpl()) { -} - -Order::~Order () -{} +Order::~Order() {} }} diff --git a/src/server/sparkd/orderman2/orders/Order.h b/src/server/sparkd/orderman2/orders/Order.h index c11a709ea..073e4e57f 100644 --- a/src/server/sparkd/orderman2/orders/Order.h +++ b/src/server/sparkd/orderman2/orders/Order.h @@ -17,31 +17,29 @@ class OrderState; namespace bts { namespace orderman2 { +class PreActivationOrderServices; +class OrderServices; + class Order { public: - Order(); - OrderKey key() const; - OrderKey parent() const; - virtual ~Order(); - virtual void create(api::orderman2::OrderDefinition const&) = 0; - virtual void recover(api::orderman2::OrderRecord const&) = 0; - virtual void activate() = 0; - virtual void update(Price price, Quantity qty) = 0; - virtual void crack() = 0; - virtual void cancel() = 0; - virtual api::orderman2::OrderState const& state() = 0; + OrderKey key() const {return _key;} + OrderKey parent_key() const {return _parent_key;} + + virtual void on_init_new(api::orderman2::OrderDefinition const&, const PreActivationOrderServices&) = 0; + virtual void on_init_recovered(api::orderman2::OrderRecord const&, const PreActivationOrderServices &) = 0; + virtual void on_activate(Price, Quantity,OrderServices &) = 0; + + virtual void on_update(Price , Quantity ) = 0; + virtual void on_crack() = 0; + virtual void on_cancel() = 0; private: + OrderKey _key; + OrderKey _parent_key; friend class OrderFactory; - friend class OrderManager; - void pre_init(OrderKey , OrderKey , securities::ISecurityDB &, IOrderFactory &) {}; - void pre_activate(securities::ISecurityDB &, IOrderFactory &) {}; - - struct PImpl; - std::unique_ptr me; }; }} diff --git a/src/server/sparkd/orderman2/orders/PostActivationServices.h b/src/server/sparkd/orderman2/orders/PostActivationServices.h new file mode 100644 index 000000000..8dc368b95 --- /dev/null +++ b/src/server/sparkd/orderman2/orders/PostActivationServices.h @@ -0,0 +1,15 @@ +#pragma once + +#include +#include "server/sparkd/mercury/actors/ContentSubscription.h" + +namespace bts { +namespace orderman2 { + +class PostActivationServices +{ +public: + +}; + +}} diff --git a/src/server/sparkd/orderman2/orders/PreActivationServices.h b/src/server/sparkd/orderman2/orders/PreActivationServices.h new file mode 100644 index 000000000..533790aba --- /dev/null +++ b/src/server/sparkd/orderman2/orders/PreActivationServices.h @@ -0,0 +1,23 @@ +#pragma once + +#include + +namespace bts {namespace securities { class ISecurityDB;}} +namespace bts {namespace orderman2 { class OrderFactory;}} + +namespace bts { +namespace orderman2 { + +class PreActivationOrderServices +{ +public: + PreActivationOrderServices (securities::ISecurityDB &db, + OrderFactory &f) + : sec_db(db), order_factory(f) + {} + + securities::ISecurityDB &sec_db; + OrderFactory &order_factory; +}; + +}} diff --git a/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp b/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp index 9f7ce0a0a..89ecdca9e 100644 --- a/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp +++ b/src/server/sparkd/orderman2/server/OrderServiceServer2.cpp @@ -7,6 +7,7 @@ #include "server/sparkd/orderman2/actors/ExecutionGateway.h" #include "lib/config/config.h" #include "lib/config/protos/jetfix.pb.h" +#include "server/sparkd/orderman2/actors/MDSource.h" namespace bts { namespace orderman2 { @@ -50,6 +51,7 @@ OrderServiceServer2::OrderServiceServer2 (bts::api::ServiceContext& ctx) : me->fast_thread = std::thread([this] () { me->fast_exe.spawn (); me->fast_exe.spawn (get_connection()); + me->fast_exe.spawn (); while(true) me->fast_exe.do_work(); }); From fea0ec22794062f5836b6c7cd1aa286d1ebe630e Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 18 Dec 2017 10:31:45 -0500 Subject: [PATCH 25/35] Orderman2 --- src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h b/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h index bf623e4d9..a1ce9c746 100644 --- a/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h +++ b/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h @@ -47,7 +47,7 @@ public: ChildOrder build() { - bts_assert(_order_services); + bts_assert_msg(_order_services,"OrderBuilder::activate() must be called before orders can be built"); ChildOrder result; if (_order_stash.size()) { From dba051e37405ca107ecc7ae57da1c20e2ada502d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 18 Dec 2017 21:34:32 +0000 Subject: [PATCH 26/35] Orderman2 --- src/lib/api/services/OrderService2.proto | 6 +- src/server/sparkd/CMakeDeps.cmake | 2 +- .../orderman2/actors/ExecutionGateway.cpp | 12 +-- .../sparkd/orderman2/actors/OrderStore.cpp | 80 +++++++++++++++++ .../sparkd/orderman2/actors/OrderStore.h | 21 +++++ .../orderman2/order_factory/OrderFactory.cpp | 18 ++-- .../orderman2_utils/ExecutionReport.h | 4 +- .../sparkd/orderman2/orders/LimitOrder.cpp | 85 +++++++++++++++++++ .../sparkd/orderman2/orders/LimitOrder.h | 9 +- 9 files changed, 219 insertions(+), 18 deletions(-) create mode 100644 src/server/sparkd/orderman2/actors/OrderStore.cpp create mode 100644 src/server/sparkd/orderman2/actors/OrderStore.h diff --git a/src/lib/api/services/OrderService2.proto b/src/lib/api/services/OrderService2.proto index a8c7800f4..4555d8e0b 100644 --- a/src/lib/api/services/OrderService2.proto +++ b/src/lib/api/services/OrderService2.proto @@ -108,7 +108,11 @@ message GatewayStatusUpdate { string gateway_name = 3 [(bts.api.key)=true]; } -message LimitOrderState {NativeOrderStatus native_status = 1;} +message LimitOrderState { + string exchange_order_id = 1; + NativeOrderStatus native_status = 2; +} + message MarketOrderState {NativeOrderStatus native_status = 1;} message StopMarketOrderState {NativeOrderStatus native_status = 1;} message StopLimitOrderState {NativeOrderStatus native_status = 1;} diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 07dc9bfc8..e2f3cc0d7 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/actors/order_manager/OrderBuilder.cpp;orderman2/actors/order_manager/OrderManager.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/OrderStore.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/actors/order_manager/OrderBuilder.cpp;orderman2/actors/order_manager/OrderManager.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp index 24de40dd3..e974f9c2e 100644 --- a/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp +++ b/src/server/sparkd/orderman2/actors/ExecutionGateway.cpp @@ -33,7 +33,8 @@ struct ExecutionGateway::PImpl exe_report_stream(), gw_status_change_stream(), cancel_reject_stream(), - gw_name(cfg.name()) + gw_name(cfg.name()), + cfg (cfg) {} JFGw gw; @@ -44,6 +45,7 @@ struct ExecutionGateway::PImpl mercury::Stream gw_status_change_stream; mercury::Stream cancel_reject_stream; GatewayName gw_name; + config::JetFIX::Connection cfg; }; ExecutionGateway::ExecutionGateway (config::JetFIX::Connection const&cfg) : me (new PImpl(cfg)) {} @@ -118,9 +120,9 @@ void ExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &msg) if (msg.has() && msg.get() == 2) return; - std::string reject_msg; + std::string text_msg; if (msg.has()) - reject_msg = msg.get(); + text_msg = msg.get(); // allocate from our pool auto data = me->exe_report_pool.construct(); @@ -149,8 +151,8 @@ void ExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &msg) securities::decode_exchange_price(*sec,Price(msg.get())) : Price(0); str_to(msg.get(),&data->exchange_fill_id); str_to(msg.get(),&data->transact_time); - data->reject_msg = reject_msg; - + data->cfg = &me->cfg; + data->msg = text_msg; publish(me->exe_report_stream,data); } } diff --git a/src/server/sparkd/orderman2/actors/OrderStore.cpp b/src/server/sparkd/orderman2/actors/OrderStore.cpp new file mode 100644 index 000000000..82a10403c --- /dev/null +++ b/src/server/sparkd/orderman2/actors/OrderStore.cpp @@ -0,0 +1,80 @@ +#include "OrderStore.h" + +#include "lib/utils/PBUtils.h" +#include "server/sparkd/persistence/SqliteStore.h" +#include "lib/api/services/OrderService2.pb.h" +#include "server/sparkd/orderman2/events/StoredOrderEvent.h" + +#include + +namespace bts { +namespace orderman2 { + +static auto const orders_ns = "orders"; + +struct OrderStore::PImpl +{ + PImpl() : + known_orders(), + store(new persistence::SqliteStore("orders2")), + order_stream() + {} + + std::unordered_map> known_orders; + std::unique_ptr store; + mercury::Stream order_stream; +}; + +OrderStore::OrderStore () : me (new PImpl()) {} +OrderStore::~OrderStore () {} + +void OrderStore::init() +{ + api::orderman2::OrderRecord rec; + std::vector stored_batch; + + auto all = me->store->retrieve_all()[orders_ns]; + for (auto const &kvp : all) + if (utils::pb::from_string (kvp.second,&rec)) { + auto ok = OrderKey(std::stoi(kvp.first)); + auto order_record = std::make_unique (rec); + stored_batch.emplace_back(order_record.get()); + me->known_orders[ok] = std::move(order_record); + } + else + LOG(Persistence,Error, + "Could not recover order {} from storage. " + "This should be investigated", kvp.first); + + me->order_stream = make_stream (); + publish_batch(me->order_stream,stored_batch); +} + +// void OrderStore::on(event::NativeOrderStateChange const&ch) +// { +// auto pb = event::to_pb(*ch.header,ch.current_state); +// LOG(OrderMan,Info,"Storing native order: {} ",utils::pb::to_string(pb)); +// me->store.store(pb); + +// std::vector v {pb}; +// order_state_change_signal(event::OrderStateChange {v}); +// } + +// void OrderStore::on(event::SpreaderOrderStateChange const&sc) +// { +// auto pb = event::to_pb(*sc.header,sc.current_state); +// LOG(OrderMan,Info,"Storing spreader order: {} ",utils::pb::to_string(pb)); +// me->store.store(pb); + +// std::vector v {pb}; +// order_state_change_signal(event::OrderStateChange {v}); +// } + +// void OrderStore::on(event_grid::event::Init const&) +// { +// auto existing_orders = me->store.retrieve_all(); +// LOG(OrderMan,Info,"Publishing initial {} orders recovered from store.", existing_orders.size()); +// order_state_change_signal(event::OrderStateChange {existing_orders}); +// } + +}} diff --git a/src/server/sparkd/orderman2/actors/OrderStore.h b/src/server/sparkd/orderman2/actors/OrderStore.h new file mode 100644 index 000000000..6b69ed7f1 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/OrderStore.h @@ -0,0 +1,21 @@ +#pragma once + +#include +#include "server/sparkd/mercury/actors/Actor.h" + +namespace bts { +namespace orderman2 { + +class OrderStore : public mercury::Actor +{ +public: + OrderStore(); + ~OrderStore(); + void init() override; + +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp index 80509336d..9762a5dad 100644 --- a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp @@ -71,11 +71,9 @@ Order &OrderFactory::recover(api::orderman2::OrderRecord const&rec) Order &OrderFactory::recreate_from_exe_report(ExecutionReport const&r) { - me->my_orders.emplace_back(); - auto &order_ptr = me->my_orders.back(); - using namespace api::orderman2; - + + std::unique_ptr native_order; switch (r.order_type) { case NATIVE_ORDER_TYPE_UNDEFINED: bts_assert(false); @@ -84,7 +82,7 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const&r) bts_assert(false); break; case NATIVE_ORDER_TYPE_LIMIT: - order_ptr.reset (new LimitOrder()); + native_order. reset (new LimitOrder()); break; case NATIVE_ORDER_TYPE_STOP: bts_assert(false); @@ -99,8 +97,13 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const&r) bts_assert(false); break; } - order_ptr->_key = r.order_key; - order_ptr->_parent_key = null_order_key(); + native_order->on_init_from_exe_report(r,PreActivationOrderServices{me->sec_db,*this}); + native_order->_key = r.order_key; + native_order->_parent_key = null_order_key(); + + me->my_orders.emplace_back(); + auto &order_ptr = me->my_orders.back(); + order_ptr.reset(native_order.release()); return *order_ptr; } @@ -145,3 +148,4 @@ Order &OrderFactory::allocate (OrderKey k, OrderKey pk,api::orderman2::OrderDefi }} + diff --git a/src/server/sparkd/orderman2/orderman2_utils/ExecutionReport.h b/src/server/sparkd/orderman2/orderman2_utils/ExecutionReport.h index 7469bd8a6..b1dad8067 100644 --- a/src/server/sparkd/orderman2/orderman2_utils/ExecutionReport.h +++ b/src/server/sparkd/orderman2/orderman2_utils/ExecutionReport.h @@ -3,6 +3,7 @@ #include #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include "server/sparkd/mercury/mercury_utils/mercury_common.h" +#include "lib/config/protos/jetfix.pb.h" namespace bts { namespace orderman2 { @@ -28,7 +29,8 @@ public: Price avg_price; ExchangeFillID exchange_fill_id; mercury::TimeStampStr transact_time; - std::string reject_msg; + config::JetFIX::Connection const *cfg; + std::string msg; }; }} diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.cpp b/src/server/sparkd/orderman2/orders/LimitOrder.cpp index 02c9ab133..e8c81e5d4 100644 --- a/src/server/sparkd/orderman2/orders/LimitOrder.cpp +++ b/src/server/sparkd/orderman2/orders/LimitOrder.cpp @@ -1,8 +1,93 @@ #include "LimitOrder.h" +#include "server/sparkd/orderman2/orderman2_utils/ExecutionReport.h" +#include "lib/api/services/OrderService2.pb.h" +#include "server/sparkd/orderman2/order_factory/IOrderFactory.h" +#include namespace bts { namespace orderman2 { +api::orderman2::OrderStatus map_status(api::orderman2::NativeOrderStatus status) +{ + using namespace api::orderman2; + + switch (status) { + case NATIVE_ORDER_STATUS_NONE: + case NATIVE_ORDER_STATUS_UNACKNOWLEDGED: + case NATIVE_ORDER_STATUS_REJECTED_BY_SPARK: + case NATIVE_ORDER_STATUS_DONE: + case NATIVE_ORDER_STATUS_REJECTED: + case NATIVE_ORDER_STATUS_ORDER_NOT_FOUND: + return OrderStatus::ORDER_STATUS_INACTIVE; + break; + + case NATIVE_ORDER_STATUS_NEW: + case NATIVE_ORDER_STATUS_PENDING_NEW: + case NATIVE_ORDER_STATUS_PARTIALLY_FILLED: + case NATIVE_ORDER_STATUS_REPLACED: + case NATIVE_ORDER_STATUS_PENDING_CANCEL: + case NATIVE_ORDER_STATUS_STOPPED: + case NATIVE_ORDER_STATUS_SUSPENDED: + case NATIVE_ORDER_STATUS_CANCEL_ACK: + case NATIVE_ORDER_STATUS_ACCEPTED_FOR_BIDDING: + case NATIVE_ORDER_STATUS_PENDING_REPLACE: + case NATIVE_ORDER_STATUS_CALCULATED: + return OrderStatus::ORDER_STATUS_ACTIVE; + break; + + case NATIVE_ORDER_STATUS_FILLED: + return OrderStatus::ORDER_STATUS_COMPLETED; + break; + + case NATIVE_ORDER_STATUS_EXPIRED: + case NATIVE_ORDER_STATUS_CANCELED: + return OrderStatus::ORDER_STATUS_CANCELED; + break; + default: + return OrderStatus::ORDER_STATUS_ERROR; + break; + } +} + + +void LimitOrder::on_init_from_exe_report(ExecutionReport const&er, const PreActivationOrderServices &os) +{ + auto k = er.order_key; + + api::orderman2::OrderRecord orecord; + orecord.set_key(k.value()); + orecord.set_parent_key(null_order_key().value()); + + auto &def = *orecord.mutable_def(); + def.set_security_key(er.security->id()); + def.set_side(er.side); + def.set_login(to_str(er.operator_id)); + def.set_account(to_str(er.account_name)); + def.set_time_in_force(er.time_in_force); + def.set_manual_order_indicator(er.manual_order_indicator); + def.set_cti_code(api::orderman2::CTICode(er.cfg->cti_code()[0])); + + def.mutable_limit(); + + auto &state = *orecord.mutable_state(); + state.set_status(map_status(er.order_status)); + state.set_price(er.price.value()); + state.set_quantity(er.quantity.value()); + state.set_filled_quantity(er.filled_quantity.value()); + state.set_last_price(er.last_price.value()); + state.set_avg_price(er.avg_price.value()); + state.set_last_msg(er.msg); + struct timeval tv; + gettimeofday(&tv, NULL); + state.mutable_last_change()->set_seconds(tv.tv_sec); + state.mutable_last_change()->set_nanos(tv.tv_usec * 1000); + + auto &limit_state = *state.mutable_limit(); + limit_state.set_exchange_order_id(to_str(er.exchange_order_id)); + + on_init_recovered(orecord,os); +} + LimitOrder::~LimitOrder() {} diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.h b/src/server/sparkd/orderman2/orders/LimitOrder.h index fac0b1302..f93941546 100644 --- a/src/server/sparkd/orderman2/orders/LimitOrder.h +++ b/src/server/sparkd/orderman2/orders/LimitOrder.h @@ -13,9 +13,12 @@ class LimitOrder : public NativeOrder public: ~LimitOrder() override; - void on_init_new(api::orderman2::OrderDefinition const&, const PreActivationOrderServices&) override {} - void on_init_recovered(api::orderman2::OrderRecord const&, const PreActivationOrderServices &) override {} - void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &) override {}; + void on_init_new(api::orderman2::OrderDefinition const&, + const PreActivationOrderServices&) override {} + void on_init_recovered(api::orderman2::OrderRecord const&, + const PreActivationOrderServices &) override {} + void on_init_from_exe_report(ExecutionReport const&, + const PreActivationOrderServices &) override ; void on_activate(Price,Quantity,OrderServices &) override {} void on_update(Price , Quantity ) override {} From deb8f8e440afb66b3fa2cd4f34d3e29ba55e55d6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 19 Dec 2017 16:20:17 +0000 Subject: [PATCH 27/35] Orderman2 --- src/server/sparkd/cmds/Run.cpp | 2 +- src/server/sparkd/orderman2/actors/MDSource.h | 4 +- .../sparkd/orderman2/actors/OrderStore.cpp | 59 ++++++++++--------- .../sparkd/orderman2/actors/OrderStore.h | 6 +- .../orderman2/events/OrderStateUpdateEvent.h | 5 +- .../orderman2/events/StoredOrderEvent.h | 2 + 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 2c5565b3c..ae09f354c 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -39,7 +39,7 @@ int Run::execute(std::vector const &) account::AccountServiceServer account_server(sc); md::run_market_datapublishers(); md::QueryServerPtr md_query_server(md::run_query_server(sc)); - orderman2::OrderServiceServer2 order_service_server(sc); + //orderman2::OrderServiceServer2 order_service_server(sc); orderman::OrderServiceServer order_server(sc); std::thread([]() { diff --git a/src/server/sparkd/orderman2/actors/MDSource.h b/src/server/sparkd/orderman2/actors/MDSource.h index 826c8c9e0..fb5861f39 100644 --- a/src/server/sparkd/orderman2/actors/MDSource.h +++ b/src/server/sparkd/orderman2/actors/MDSource.h @@ -35,7 +35,7 @@ public: }}); subscribe (broker_id(), [this] (auto const&) { - auto out_stream = make_stream(); + auto out_stream = this->make_stream(); Book book; TickToTradeCorID corid; @@ -48,7 +48,7 @@ public: book._security_key = SecurityKey(handle->key()); corid = handle->sequence(); LOG(Latency,Info,"MDSource {} {}", corid,utils::TimeStamp::now().to_uint64()); - publish(out_stream, book, corid); + this->publish(out_stream, book, corid); } } }); diff --git a/src/server/sparkd/orderman2/actors/OrderStore.cpp b/src/server/sparkd/orderman2/actors/OrderStore.cpp index 82a10403c..0a2124002 100644 --- a/src/server/sparkd/orderman2/actors/OrderStore.cpp +++ b/src/server/sparkd/orderman2/actors/OrderStore.cpp @@ -4,6 +4,7 @@ #include "server/sparkd/persistence/SqliteStore.h" #include "lib/api/services/OrderService2.pb.h" #include "server/sparkd/orderman2/events/StoredOrderEvent.h" +#include "server/sparkd/orderman2/events/OrderStateUpdateEvent.h" #include @@ -14,18 +15,20 @@ static auto const orders_ns = "orders"; struct OrderStore::PImpl { - PImpl() : + PImpl(GatewayName const&gw) : + gw_name(gw), known_orders(), store(new persistence::SqliteStore("orders2")), order_stream() {} + const GatewayName gw_name; std::unordered_map> known_orders; std::unique_ptr store; mercury::Stream order_stream; }; -OrderStore::OrderStore () : me (new PImpl()) {} +OrderStore::OrderStore (const GatewayName &gw_name) : me (new PImpl(gw_name)) {} OrderStore::~OrderStore () {} void OrderStore::init() @@ -38,7 +41,7 @@ void OrderStore::init() if (utils::pb::from_string (kvp.second,&rec)) { auto ok = OrderKey(std::stoi(kvp.first)); auto order_record = std::make_unique (rec); - stored_batch.emplace_back(order_record.get()); + stored_batch.emplace_back(*order_record.get()); me->known_orders[ok] = std::move(order_record); } else @@ -46,35 +49,33 @@ void OrderStore::init() "Could not recover order {} from storage. " "This should be investigated", kvp.first); - me->order_stream = make_stream (); + me->order_stream = make_stream (me->gw_name); publish_batch(me->order_stream,stored_batch); + subscribe ([this] (auto const&ev) {this->on_order_state_update(ev);}); } -// void OrderStore::on(event::NativeOrderStateChange const&ch) -// { -// auto pb = event::to_pb(*ch.header,ch.current_state); -// LOG(OrderMan,Info,"Storing native order: {} ",utils::pb::to_string(pb)); -// me->store.store(pb); +void OrderStore::on_order_state_update(mercury::Update const&u) +{ + if (u.events) + for (auto const &ev : *u.events) { + auto &ptr = me->known_orders[ev.key]; + auto new_order = !ptr; + if (new_order) { + ptr.reset (new api::orderman2::OrderRecord()); + *ptr->mutable_def() = *ev.definition; + ptr->set_key(ev.key.value()); + ptr->set_parent_key(ev.parent_key.value()); + } + *ptr->mutable_state() = ev.state; -// std::vector v {pb}; -// order_state_change_signal(event::OrderStateChange {v}); -// } - -// void OrderStore::on(event::SpreaderOrderStateChange const&sc) -// { -// auto pb = event::to_pb(*sc.header,sc.current_state); -// LOG(OrderMan,Info,"Storing spreader order: {} ",utils::pb::to_string(pb)); -// me->store.store(pb); - -// std::vector v {pb}; -// order_state_change_signal(event::OrderStateChange {v}); -// } - -// void OrderStore::on(event_grid::event::Init const&) -// { -// auto existing_orders = me->store.retrieve_all(); -// LOG(OrderMan,Info,"Publishing initial {} orders recovered from store.", existing_orders.size()); -// order_state_change_signal(event::OrderStateChange {existing_orders}); -// } + auto k = std::to_string(ptr->key()); + auto v = utils::pb::to_string(*ptr); + if (new_order) + me->store->insert(orders_ns,k,v); + else + me->store->update(orders_ns,k,v); + publish(me->order_stream,*ptr.get()); + } +} }} diff --git a/src/server/sparkd/orderman2/actors/OrderStore.h b/src/server/sparkd/orderman2/actors/OrderStore.h index 6b69ed7f1..50c9cfd82 100644 --- a/src/server/sparkd/orderman2/actors/OrderStore.h +++ b/src/server/sparkd/orderman2/actors/OrderStore.h @@ -2,20 +2,24 @@ #include #include "server/sparkd/mercury/actors/Actor.h" +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" namespace bts { namespace orderman2 { +class OrderStateUpdateEvent; class OrderStore : public mercury::Actor { public: - OrderStore(); + OrderStore(GatewayName const&gw); ~OrderStore(); void init() override; private: struct PImpl; std::unique_ptr me; + + void on_order_state_update(mercury::Update const&ev); }; }} diff --git a/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h b/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h index 411ce8df2..7e7065b80 100644 --- a/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h +++ b/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h @@ -3,7 +3,7 @@ #include #include "server/sparkd/mercury/events/Event.h" -#include "lib/api/services/OrderService.pb.h" +#include "lib/api/services/OrderService2.pb.h" namespace bts { namespace orderman2 { @@ -14,7 +14,8 @@ public: using SynopsisPolicy = mercury::NoSynopsis; OrderKey key; OrderKey parent_key; - api::orderman::OrderState state; + api::orderman2::OrderDefinition const *definition; + api::orderman2::OrderState state; }; }} diff --git a/src/server/sparkd/orderman2/events/StoredOrderEvent.h b/src/server/sparkd/orderman2/events/StoredOrderEvent.h index 42c5c397c..2394d62cc 100644 --- a/src/server/sparkd/orderman2/events/StoredOrderEvent.h +++ b/src/server/sparkd/orderman2/events/StoredOrderEvent.h @@ -15,6 +15,8 @@ public: using Tag = GatewayName; using SynopsisPolicy = mercury::MergeByKey; + StoredOrderEvent(api::orderman2::OrderRecord &record) : order_record(&record) {} + auto key() {return order_record->key();} api::orderman2::OrderRecord *order_record; }; From ce2208218b07d446fcff4504ff1d8bc521b974de Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 19 Dec 2017 11:43:59 -0500 Subject: [PATCH 28/35] Cleaned up merge. --- .../sparkd/orderman/tests/tests_common.h | 10 +++ .../sparkd/orderman2/events/BookUpdateEvent.h | 2 +- .../orderman2/events/CancelRejectEvent.h | 1 + .../sparkd/orderman2/orderman2_utils/Book.h | 67 +++++++++++++++++++ src/server/sparkd/position/IMarginObserver.h | 2 +- 5 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 src/server/sparkd/orderman2/orderman2_utils/Book.h diff --git a/src/server/sparkd/orderman/tests/tests_common.h b/src/server/sparkd/orderman/tests/tests_common.h index 2bb2cdffc..6d8f97e0d 100644 --- a/src/server/sparkd/orderman/tests/tests_common.h +++ b/src/server/sparkd/orderman/tests/tests_common.h @@ -21,6 +21,16 @@ namespace orderman { using namespace api; using namespace spark; +struct MySecDB : public securities::ISecurityDB +{ + ISecurityDB::SecurityMap secs; + + api::Security const *resolve(SecurityKey const&k) override + {return secs[k];} + + SecurityMap retrieve_all() const override + {return secs;} + MySecDB (const std::vector& legs) { for (auto it = legs.begin(); it != legs.end(); it++) diff --git a/src/server/sparkd/orderman2/events/BookUpdateEvent.h b/src/server/sparkd/orderman2/events/BookUpdateEvent.h index 02d439633..b04e9f5b4 100644 --- a/src/server/sparkd/orderman2/events/BookUpdateEvent.h +++ b/src/server/sparkd/orderman2/events/BookUpdateEvent.h @@ -3,8 +3,8 @@ #include #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" -#include "server/sparkd/orderman2/orderman2_utils/Book.h" #include "server/sparkd/mercury/events/Event.h" +#include "server/sparkd/orderman2/orderman2_utils/Book.h" namespace bts { namespace orderman2 { diff --git a/src/server/sparkd/orderman2/events/CancelRejectEvent.h b/src/server/sparkd/orderman2/events/CancelRejectEvent.h index 4590bbccc..16514fcd8 100644 --- a/src/server/sparkd/orderman2/events/CancelRejectEvent.h +++ b/src/server/sparkd/orderman2/events/CancelRejectEvent.h @@ -24,6 +24,7 @@ public: order_key(order_key), reject_msg(rej) {} + OrderKey key() const{return order_key;} OrderKey order_key; std::string reject_msg; }; diff --git a/src/server/sparkd/orderman2/orderman2_utils/Book.h b/src/server/sparkd/orderman2/orderman2_utils/Book.h new file mode 100644 index 000000000..53be531e3 --- /dev/null +++ b/src/server/sparkd/orderman2/orderman2_utils/Book.h @@ -0,0 +1,67 @@ +#pragma once + +#include +#include "lib/domain_model/common.h" +#include "lib/config/protos/MarketData.pb.h" +#include "lib/md/Structure/PriceSize.h" + + +namespace bts { +namespace orderman2 { + +using BookSide = std::array ; + +class Book { +public: + Book () : + _security_key(), + _book() + {} + + Book (SecurityKey key, + BookSide const&bid, + BookSide const&ask) : + _security_key(key), + _book {bid,ask} + {} + + Book (Book const&rhs) + : _security_key(rhs._security_key), + _book(rhs._book) + {} + + Book &operator=(Book const &rhs) + { + _security_key = rhs._security_key; + _book = rhs._book; + return *this; + } + + SecurityKey security_key() const {return _security_key;} ; + + BookSide const &bid () const {return _book[0];} + BookSide const &ask () const {return _book[1];} + BookSide &bid () {return _book[0];} + BookSide &ask () {return _book[1];} + + size_t n_levels() const {return std::tuple_size();} + + BookSide const& side(api::Side bs) const + { + bts_assert_d(bs != api::SIDE_UNDEFINED); + return _book[bs - api::SIDE_BUY]; + } + + BookSide & side(api::Side bs) + { + bts_assert_d(bs != api::SIDE_UNDEFINED); + return _book[bs - api::SIDE_BUY]; + } + +private: + friend class MDSource; + SecurityKey _security_key; + std::array _book; +}; + +}} diff --git a/src/server/sparkd/position/IMarginObserver.h b/src/server/sparkd/position/IMarginObserver.h index f1a8aa6ab..2eb19e2e8 100644 --- a/src/server/sparkd/position/IMarginObserver.h +++ b/src/server/sparkd/position/IMarginObserver.h @@ -6,7 +6,7 @@ namespace bts { namespace position { -class MarginResult; +struct MarginResult; class IMarginObserver { From 652ef371472ea6ab1688224b67dffe9c9012f7cb Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 19 Dec 2017 12:46:06 -0500 Subject: [PATCH 29/35] Specify maximum icon width in SparkWindow base style. (Fixes Fills icon on Picker) --- src/client/spark/view/Resources/WindowStyle.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Resources/WindowStyle.xaml b/src/client/spark/view/Resources/WindowStyle.xaml index 46d69ba51..e77a05db7 100644 --- a/src/client/spark/view/Resources/WindowStyle.xaml +++ b/src/client/spark/view/Resources/WindowStyle.xaml @@ -28,7 +28,7 @@ - +