From fa2a2e21078bb5c37792e9e27a5cabbc37aebf5e Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 25 Sep 2018 12:46:22 +0000 Subject: [PATCH] Rewrite of mercury for better performance. --- CMakeLists.txt | 2 +- src/lib/CMakeDeps.cmake | 2 +- src/lib/mercury/actors/Actor.cpp | 7 - src/lib/mercury/actors/Actor.h | 115 +++--- src/lib/mercury/actors/ActorBroker.h | 73 ++++ src/lib/mercury/actors/ActorPtr.h | 11 - .../IPollableActor.cpp | 0 .../IPollableActor.h | 0 src/lib/mercury/actors/Ping.h | 37 -- src/lib/mercury/actors/PingPong.h | 8 +- src/lib/mercury/actors/Timer.h | 10 +- src/lib/mercury/broker/AsyncEventBroker.cpp | 8 - src/lib/mercury/broker/AsyncEventBroker.h | 337 ------------------ .../{CoreEventBroker.cpp => Broker.cpp} | 254 +++++++------ src/lib/mercury/broker/Broker.h | 47 +++ src/lib/mercury/broker/BrokerProxy.cpp | 99 +++++ src/lib/mercury/broker/BrokerProxy.h | 141 ++++++++ src/lib/mercury/broker/CoreEventBroker.h | 46 --- src/lib/mercury/broker/IEventBroker.cpp | 8 - src/lib/mercury/broker/IEventBroker.h | 29 -- src/lib/mercury/broker/ILocalBroker.cpp | 6 + src/lib/mercury/broker/ILocalBroker.h | 16 + src/lib/mercury/broker/IRemoteBroker.cpp | 6 + src/lib/mercury/broker/IRemoteBroker.h | 28 ++ .../{mercury_utils => common}/FatWrapper.h | 15 +- .../mercury_common.cpp | 0 src/lib/mercury/common/mercury_common.h | 33 ++ src/lib/mercury/events/Event.h | 18 +- src/lib/mercury/events/Stream.h | 12 +- src/lib/mercury/events/TimerEvent.h | 2 +- src/lib/mercury/events/Update.h | 2 +- src/lib/mercury/executor/Executor.cpp | 44 +++ src/lib/mercury/executor/Executor.h | 44 +++ src/lib/mercury/mercury_utils/Executor.cpp | 7 - src/lib/mercury/mercury_utils/Executor.h | 57 --- .../mercury/mercury_utils/mercury_common.h | 39 -- src/lib/mercury/synopsis/CacheAll.h | 26 +- src/lib/mercury/synopsis/CacheLast.h | 29 +- src/lib/mercury/synopsis/ISynopsisBuilder.h | 16 +- src/lib/mercury/synopsis/ISynopsysBuilder.h | 19 - src/lib/mercury/synopsis/MergeByKey.h | 14 +- src/lib/mercury/synopsis/NoSynopsis.h | 21 +- src/lib/mercury/synopsis/SynopsisBuilder.cpp | 6 - src/lib/mercury/synopsis/SynopsisBuilder.h | 17 - src/lib/mercury/topics/ITopic.cpp | 8 - src/lib/mercury/topics/ITopic.h | 12 +- src/lib/mercury/topics/Topic.cpp | 9 + src/lib/mercury/topics/Topic.h | 47 ++- src/lib/orderman/actors/ExecutionGateway.h | 2 +- src/lib/orderman/actors/MDSource.h | 2 +- src/lib/orderman/actors/ServiceBridge.cpp | 50 ++- src/lib/orderman/actors/ServiceBridge.h | 63 ++-- src/lib/orderman/events/NewAdminDataEvent.h | 2 +- .../orderman/events/NewExecutionReportEvent.h | 22 +- .../orderman/orderman_utils/ExecutionReport.h | 2 +- .../orderman/server/OrderServiceServer.cpp | 17 +- src/lib/orderman/server/OrderServiceServer.h | 2 +- src/lib/orderman/tests/fat_wrapper_tests.cpp | 14 +- src/server/sparkd/cmds/Benchmark.cpp | 211 ++--------- src/server/sparkd/cmds/QuickTest.cpp | 52 +-- 60 files changed, 971 insertions(+), 1255 deletions(-) delete mode 100644 src/lib/mercury/actors/Actor.cpp create mode 100644 src/lib/mercury/actors/ActorBroker.h delete mode 100644 src/lib/mercury/actors/ActorPtr.h rename src/lib/mercury/{mercury_utils => actors}/IPollableActor.cpp (100%) rename src/lib/mercury/{mercury_utils => actors}/IPollableActor.h (100%) delete mode 100644 src/lib/mercury/actors/Ping.h delete mode 100644 src/lib/mercury/broker/AsyncEventBroker.cpp delete mode 100644 src/lib/mercury/broker/AsyncEventBroker.h rename src/lib/mercury/broker/{CoreEventBroker.cpp => Broker.cpp} (60%) create mode 100644 src/lib/mercury/broker/Broker.h create mode 100644 src/lib/mercury/broker/BrokerProxy.cpp create mode 100644 src/lib/mercury/broker/BrokerProxy.h delete mode 100644 src/lib/mercury/broker/CoreEventBroker.h delete mode 100644 src/lib/mercury/broker/IEventBroker.cpp delete mode 100644 src/lib/mercury/broker/IEventBroker.h create mode 100644 src/lib/mercury/broker/ILocalBroker.cpp create mode 100644 src/lib/mercury/broker/ILocalBroker.h create mode 100644 src/lib/mercury/broker/IRemoteBroker.cpp create mode 100644 src/lib/mercury/broker/IRemoteBroker.h rename src/lib/mercury/{mercury_utils => common}/FatWrapper.h (89%) rename src/lib/mercury/{mercury_utils => common}/mercury_common.cpp (100%) create mode 100644 src/lib/mercury/common/mercury_common.h create mode 100644 src/lib/mercury/executor/Executor.cpp create mode 100644 src/lib/mercury/executor/Executor.h delete mode 100644 src/lib/mercury/mercury_utils/Executor.cpp delete mode 100644 src/lib/mercury/mercury_utils/Executor.h delete mode 100644 src/lib/mercury/mercury_utils/mercury_common.h delete mode 100644 src/lib/mercury/synopsis/ISynopsysBuilder.h delete mode 100644 src/lib/mercury/synopsis/SynopsisBuilder.cpp delete mode 100644 src/lib/mercury/synopsis/SynopsisBuilder.h delete mode 100644 src/lib/mercury/topics/ITopic.cpp create mode 100644 src/lib/mercury/topics/Topic.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 17160c354..ea4a0dc95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ else () -fPIC -Wall -pedantic -Wextra -Werror \ -Wno-missing-braces -Wno-ignored-qualifiers \ --std=c++17 -fdiagnostics-color") - set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -DNDEBUG -O3") + set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3") add_subdirectory(src/server/sparkd) add_subdirectory(src/lib) add_subdirectory(src/web) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index f3e3e8582..b4a049dfc 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/dynamic_orders.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/Actor.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/IPollableActor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/dynamic_orders.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file diff --git a/src/lib/mercury/actors/Actor.cpp b/src/lib/mercury/actors/Actor.cpp deleted file mode 100644 index 7d79fef1d..000000000 --- a/src/lib/mercury/actors/Actor.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "Actor.h" - -namespace bts { -namespace mercury { - - -}} diff --git a/src/lib/mercury/actors/Actor.h b/src/lib/mercury/actors/Actor.h index bb784ed54..d94043947 100644 --- a/src/lib/mercury/actors/Actor.h +++ b/src/lib/mercury/actors/Actor.h @@ -3,10 +3,12 @@ #include #include -#include "lib/mercury/broker/AsyncEventBroker.h" +#include "lib/mercury/common/mercury_common.h" #include "lib/mercury/events/Stream.h" #include "lib/mercury/events/Update.h" #include "lib/mercury/topics/Topic.h" +#include "lib/mercury/actors/ActorBroker.h" + #include "lib/tracing/bts_trace.h" #include "lib/utils/bts_assert.h" #include "lib/utils/warn_ctrl.h" @@ -14,17 +16,16 @@ namespace bts { namespace mercury { -// Helper class to ease subscription/publication of events Client code -// should derive from this class and implement an init() method which -// signals to the class that the event dispatch framework is ready to -// process event subscription and publication. +// Helper class to ease subscription/publication of events. Client +// code should derive from this class and implement an init() method +// which signals to the class that the event dispatch framework is +// ready to process event subscription and publication. -GCC_DIAG_OFF("-Wnon-virtual-dtor") -class Actor : public std::enable_shared_from_this { +class Actor { public: - using SubHandle = InternalSubID; + using SubHandle = LocalSubID; - Actor() : _broker(nullptr), _active_streams(), _active_subs() {} + Actor() : _broker(nullptr), _active_streams(), _active_subs(), _broker_id() {} virtual ~Actor() {} // Override this to kick off actor. @@ -43,8 +44,7 @@ class Actor : public std::enable_shared_from_this { using TopicType = Topic; using UpdateType = Update; - auto self = shared_from_this(); - TopicFilter filter = [tag, self](const ITopic &t) { + TopicFilter filter = [tag, this](const ITopic &t) { auto typed_topic = dynamic_cast(&t); if (!typed_topic) return false; @@ -52,20 +52,20 @@ class Actor : public std::enable_shared_from_this { auto match = typed_topic->tag() == tag; if (match) LOG(Mercury, Info, "{} on event broker {} matched sub to {}", - self->name(), self->broker_id().value(), + name(), _broker_id, TopicType(tag).to_str()); return match; } }; - InternalEventHandler handler = [this, cb, - tag](const StreamID &sid, EventType type, - EventPayload const *payload) { + LocalEventHandler handler = [this, cb, tag](const StreamID &sid, + EventType type, + Notification const *payload) { if (!this->_broker) return; tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), - utils::type_name(), broker_id().value(), sid.value(), + utils::type_name(), _broker_id, sid.value(), 0); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); @@ -77,7 +77,7 @@ class Actor : public std::enable_shared_from_this { LOG(Mercury, Info, "{} on event broker {} subscribing to {} with subid {}", name(), - broker_id().value(), TopicType(tag).to_str(), result.value()); + _broker_id, TopicType(tag).to_str(), result.value()); return result; } @@ -87,26 +87,25 @@ class Actor : public std::enable_shared_from_this { bts_assert(_broker); using TopicType = Topic; using UpdateType = Update; - auto self = shared_from_this(); - TopicFilter filter = [self](const ITopic &t) { + TopicFilter filter = [this](const ITopic &t) { auto typed_topic = dynamic_cast(&t); auto match = typed_topic != nullptr; if (match) LOG(Mercury, Info, "{} on event broker {} matched sub to {}", - self->name(), self->broker_id().value(), + name(), _broker_id, std::string(utils::type_name())); return match; }; - InternalEventHandler handler = [this, cb](const StreamID &sid, - EventType type, - EventPayload const *payload) { + LocalEventHandler handler = [this, cb](const StreamID &sid, + EventType type, + Notification const *payload) { if (!this->_broker) return; tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), - utils::type_name(), broker_id().value(), sid.value(), + utils::type_name(), _broker_id, sid.value(), 0); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); @@ -118,7 +117,7 @@ class Actor : public std::enable_shared_from_this { LOG(Mercury, Info, "{} on event broker {} subscribing to all instances " "of type {} with subid {}", - name(), broker_id().value(), std::string(utils::type_name()), + name(), _broker_id, std::string(utils::type_name()), result.value()); return result; } @@ -131,8 +130,7 @@ class Actor : public std::enable_shared_from_this { using TopicType = Topic; using UpdateType = Update; - auto self = shared_from_this(); - TopicFilter filter = [self, user_filter](const ITopic &t) { + TopicFilter filter = [this, user_filter](const ITopic &t) { auto typed_topic = dynamic_cast(&t); if (typed_topic == nullptr) return false; @@ -140,13 +138,13 @@ class Actor : public std::enable_shared_from_this { return user_filter(*typed_topic); }; - InternalEventHandler handler = [this, cb](const StreamID &sid, - EventType type, - EventPayload const *payload) { + LocalEventHandler handler = [this, cb](const StreamID &sid, + EventType type, + Notification const *payload) { if (!this->_broker) return; tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), - utils::type_name(), broker_id().value(), sid.value(), + utils::type_name(), _broker_id, sid.value(), 0); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); @@ -157,7 +155,7 @@ class Actor : public std::enable_shared_from_this { auto result = _subscribe(filter, handler); LOG(Mercury, Info, "{} on event broker {} subscribing to filter on {} with subid {}", - name(), broker_id().value(), std::string(utils::type_name()), + name(), _broker_id, std::string(utils::type_name()), result.value()); return result; } @@ -165,7 +163,7 @@ class Actor : public std::enable_shared_from_this { // unsubscribe void unsubscribe(SubHandle id) { bts_assert(_broker); - _broker->internal_unsubscribe(id); + _broker->unsubscribe(id); _active_subs.erase(id); } @@ -174,11 +172,11 @@ class Actor : public std::enable_shared_from_this { bts_assert(_broker); using TopicType = Topic; auto topic = std::make_shared(tag); - auto sid = _broker->internal_advertise(topic); + auto sid = _broker->advertise(topic); LOG(Mercury, Info, "{} on event broker {} creating stream for {} with sid {}", name(), - broker_id().value(), TopicType(tag).to_str(), sid.value()); + _broker_id, TopicType(tag).to_str(), sid.value()); _active_streams.insert(sid); return Stream{sid}; @@ -189,11 +187,11 @@ class Actor : public std::enable_shared_from_this { bts_assert(_broker); using TopicType = Topic; auto topic = std::make_shared(); - auto sid = _broker->internal_advertise(topic); + auto sid = _broker->advertise(topic); LOG(Mercury, Info, "{} on event broker {} creating stream for {} with sid {}", name(), - broker_id().value(), TopicType().to_str(), sid.value()); + _broker_id, TopicType().to_str(), sid.value()); _active_streams.insert(sid); return Stream{sid}; @@ -203,49 +201,32 @@ class Actor : public std::enable_shared_from_this { // event with the args passed template void publish(Stream const &stream, Args &&... args) { + bts_assert_d(_broker); + tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), - utils::type_name(), broker_id().value(), + utils::type_name(), _broker_id, stream.sid.value(), 1); - bts_assert(_broker); - 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); + _broker->notify(stream, std::forward(args)...); } // publish a sequence of events to a previously created stream 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); - _broker->internal_notify(msg); + _broker->notify_batch(stream,c); } // destroy a previously created stream template void destroy_stream(Stream const &stream) { bts_assert(_broker); _active_streams.erase(stream.sid); - _broker->internal_unadvertise(stream.sid); - } - - // queue a lambda for execution in the Actors thread - void post_action(std::function const &action) { - _broker->post_action(action); + _broker->unadvertise(stream.sid); } protected: - EventBrokerID broker_id() { - bts_assert(_broker); - return _broker->id(); - } - friend class Executor; - void activate(AsyncEventBroker &broker) { + void activate(ActorBroker &broker) { bts_assert(!_broker); _broker = &broker; LOG(Mercury, Info, "Initializing {}", name()); @@ -257,27 +238,27 @@ class Actor : public std::enable_shared_from_this { finit(); for (auto sid : _active_streams) - _broker->internal_unadvertise(sid); + _broker->unadvertise(sid); _active_streams.clear(); for (auto h : _active_subs) - _broker->internal_unsubscribe(h); + _broker->unsubscribe(h); _active_subs.clear(); _broker = nullptr; } private: - AsyncEventBroker *_broker; + ActorBroker *_broker; boost::container::flat_set _active_streams; boost::container::flat_set _active_subs; + BrokerID::Value _broker_id; - SubHandle _subscribe(TopicFilter const &f, InternalEventHandler const &h) { - auto handle = _broker->internal_subscribe(f, h); + SubHandle _subscribe(TopicFilter const &f, LocalEventHandler const &h) { + auto handle = _broker->subscribe(f, h); _active_subs.insert(handle); return handle; } }; -GCC_DIAG_RESTORE() } // namespace mercury } // namespace bts diff --git a/src/lib/mercury/actors/ActorBroker.h b/src/lib/mercury/actors/ActorBroker.h new file mode 100644 index 000000000..302e32709 --- /dev/null +++ b/src/lib/mercury/actors/ActorBroker.h @@ -0,0 +1,73 @@ +#pragma once + +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/broker/BrokerProxy.h" +#include "lib/mercury/events/Stream.h" + +namespace bts { +namespace mercury { + +class ActorBroker { +public: + ActorBroker (ILocalBroker &real_broker) : _proxy(real_broker),_proxy_id(_proxy.id()),_current_suid(0) {} + + BrokerID id() {return _proxy_id;} + + LocalSubID subscribe(TopicFilter const&f, LocalEventHandler const &h) { + _current_suid = LocalSubID(_current_suid.value() + 1); + _proxy.local_subscribe(_current_suid,f,h); + return _current_suid; + } + + void unsubscribe(LocalSubID suid) { + _proxy.local_unsubscribe(suid); + } + + StreamID advertise (TopicPtr const&t) { + auto sid = gen_stream_id(); + _proxy.advertise(_proxy_id,sid,t); + return sid; + } + + void unadvertise (StreamID sid) { + _proxy.unadvertise(_proxy_id,sid); + } + + template + void notify (Stream const &stream, Args &&... args) { + BrokerProxy::BrokerMsg *m; + Notification *notification; + _proxy.alloc_notify(&m,¬ification); + auto &array = notification->template wrap_in_place(); + array.emplace_back(std::forward(args)...); + _proxy.send_notify(_proxy_id, stream.sid, SubID(0), *m); + } + + template + void notify_batch(Stream const &stream, C const &c) { + BrokerProxy::BrokerMsg *msg; + Notification *notification; + _proxy.alloc_notify(&msg,¬ification); + auto &array = notification->template wrap_in_place(); + array.reserve(c.size()); + for (auto &item : c) + array.emplace_back(item); + _proxy.send_notify(_proxy_id, stream.sid, SubID(0), *msg); + } + + void do_work() { + _proxy.do_work(); + } + + void schedule_action (std::function const&action) { + _proxy.schedule_action(action); + } + +private: + BrokerProxy _proxy; + BrokerID _proxy_id; + LocalSubID _current_suid; +}; + + +}} diff --git a/src/lib/mercury/actors/ActorPtr.h b/src/lib/mercury/actors/ActorPtr.h deleted file mode 100644 index 4bedb0fdc..000000000 --- a/src/lib/mercury/actors/ActorPtr.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include - -namespace bts { -namespace mercury { - -class Actor; -using ActorPtr = std::shared_ptr; - -}} diff --git a/src/lib/mercury/mercury_utils/IPollableActor.cpp b/src/lib/mercury/actors/IPollableActor.cpp similarity index 100% rename from src/lib/mercury/mercury_utils/IPollableActor.cpp rename to src/lib/mercury/actors/IPollableActor.cpp diff --git a/src/lib/mercury/mercury_utils/IPollableActor.h b/src/lib/mercury/actors/IPollableActor.h similarity index 100% rename from src/lib/mercury/mercury_utils/IPollableActor.h rename to src/lib/mercury/actors/IPollableActor.h diff --git a/src/lib/mercury/actors/Ping.h b/src/lib/mercury/actors/Ping.h deleted file mode 100644 index 18ed08d08..000000000 --- a/src/lib/mercury/actors/Ping.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/events/TimerEvent.h" - -#include - -namespace bts { -namespace mercury { - -class PingEvent : public Event { - utils::TimeStamp sent_ts; -}; - -class Ping : public Actor, public mercury::IPollableActor { - public: - void init() override { - _stream = make_stream(); - _last_ts = bts::Timer::now(); - } - - private: - void on_poll() override { - auto now = bts::Timer::now(); - if (ms_diff(now, _last_ts) > 1) { - _last_ts = now; - publish(_stream, now); - } - } - - mercury::Stream _stream; - TimeStamp _last_ts; -}; -} -} diff --git a/src/lib/mercury/actors/PingPong.h b/src/lib/mercury/actors/PingPong.h index c862cfee8..c385a6dc2 100644 --- a/src/lib/mercury/actors/PingPong.h +++ b/src/lib/mercury/actors/PingPong.h @@ -1,7 +1,9 @@ #pragma once #include "lib/mercury/actors/Actor.h" -#include "lib/mercury/mercury_utils/IPollableActor.h" +#include "lib/mercury/actors/IPollableActor.h" +#include "lib/mercury/events/Event.h" + #include "lib/tracing/bts_trace.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/datetime.h" @@ -28,10 +30,10 @@ class Ping : public Actor, public mercury::IPollableActor { private: void on_poll() override { _i++; - if (_i % 100000 == 0) { + // if (_i % 100000 == 0) { tracepoint(bts_trace, trace_order, "ping_send", 0, 0, _i); publish(_stream, _i); - } + // } } mercury::Stream _stream; diff --git a/src/lib/mercury/actors/Timer.h b/src/lib/mercury/actors/Timer.h index e29fdb58b..0d4c6c441 100644 --- a/src/lib/mercury/actors/Timer.h +++ b/src/lib/mercury/actors/Timer.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" #include "lib/mercury/actors/Actor.h" #include "lib/mercury/events/TimerEvent.h" +#include "lib/utils/bts_chrono.h" +#include "lib/utils/datetime.h" #include #include @@ -12,7 +12,7 @@ namespace bts { namespace mercury { // a standard actor providing periodic time events at a -// fixed 10ms frequency +// fixed 10ms frequency class Timer : public Actor, public mercury::IPollableActor { public: void init() override { @@ -37,5 +37,5 @@ class Timer : public Actor, public mercury::IPollableActor { mercury::Stream _stream; TimeStamp _last_ts; }; -} -} +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/broker/AsyncEventBroker.cpp b/src/lib/mercury/broker/AsyncEventBroker.cpp deleted file mode 100644 index 548beecf1..000000000 --- a/src/lib/mercury/broker/AsyncEventBroker.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "AsyncEventBroker.h" - -namespace bts { -namespace mercury { - - -}} - diff --git a/src/lib/mercury/broker/AsyncEventBroker.h b/src/lib/mercury/broker/AsyncEventBroker.h deleted file mode 100644 index 1f5e38909..000000000 --- a/src/lib/mercury/broker/AsyncEventBroker.h +++ /dev/null @@ -1,337 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include - -#include "lib/mercury/broker/CoreEventBroker.h" -#include "lib/mercury/mercury_utils/FatWrapper.h" - -namespace bts { -namespace mercury { - -class AsyncEventBroker : public IEventBroker { - private: - struct BrokerMsg { - EventBrokerID broker_src_id; - utils::FatWrapper<127 - 8 - 4> wrapper; - void (*handle_msg)(AsyncEventBroker *self, BrokerMsg *m); - bool is_external; - }; - - public: - AsyncEventBroker() - : _core_broker(),_id(_core_broker.id()), _queue(), _internal_pool(), _external_pool(), - _external_pool_mtx(), _current_suid(0) {} - - void - init_neighbours(std::vector const &neighbours) { - for (auto const &n : neighbours) - if (_id != n->id()) - _core_broker.add_neighbour(n); - } - - // ieventbroker methods, can be called from multiple threads - EventBrokerID id() const override { return _core_broker.id(); } - - 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 - - // can be called from outside - void post_action(std::function const &action) { - post_external_msg(on_action, EventBrokerID(0), action); - } - - // Internal API, i.e. API intended for use by a single thread, the - // same thread calling do_work. - struct InternalNotificationMsg { - public: - 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; - msg->wrapper.wrap_in_place(sid); - return InternalNotificationMsg{msg}; - } - - void internal_notify(InternalNotificationMsg msg) { - msg._msg->broker_src_id = _id; - enqueue(msg._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); - } - - 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); - } - - bool do_work() { - BrokerMsg *m; - auto count = 0; - for(;;) { - m = nullptr; - if (_queue.try_pop(m)) { - m->handle_msg(this, m); - free_msg(m); - count ++; - } - else - break; - } - return count; - } - - private: - void add_neighbour(IEventBrokerPtr const &n) override { - post_external_msg(on_neighbour_addition, - EventBrokerID(0), n); - } - - void remove_neighbour(EventBrokerID n) override { - post_external_msg(on_neighbour_removal, - EventBrokerID(0), n); - } - - using MsgHandler = void(AsyncEventBroker *, BrokerMsg *); - - using Pool = boost::object_pool; - // using Queue = boost::lockfree::queue; - - using Queue = tbb::concurrent_queue; - using DispatchMap = - boost::container::flat_map>; - CoreEventBroker _core_broker; - EventBrokerID _id; - 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, EventBrokerID eid, - Args &&... args) { - - while (_external_pool_mtx.test_and_set(std::memory_order_acquire)) - ; - auto msg = _external_pool.construct(); - _external_pool_mtx.clear(std::memory_order_release); - - msg->broker_src_id = eid; - msg->is_external = true; - msg->handle_msg = handler; - msg->wrapper.wrap_in_place(eid, std::forward(args)...); - enqueue(msg); - } - - template - void post_internal_msg(MsgHandler handler, Args &&... args) { - auto msg = _internal_pool.construct(); - msg->broker_src_id = _id; - msg->handle_msg = handler; - msg->is_external = false; - msg->wrapper.wrap_in_place(std::forward(args)...); - enqueue(msg); - } - - void enqueue(BrokerMsg *msg) { - _queue.push(msg); - } - - struct NeighbourAddition { - NeighbourAddition(EventBrokerID, const IEventBrokerPtr &src) : ptr(src) {} - IEventBrokerPtr ptr; - }; - - struct NeighbourRemoval { - NeighbourRemoval(EventBrokerID, 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; - }; - - struct Action { - Action(EventBrokerID, std::function const &action) - : action(action) {} - std::function action; - }; - - 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->_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); - } - - static void on_action(AsyncEventBroker *, BrokerMsg *m) { - auto const &action = m->wrapper.unwrap(); - action.action(); - } -}; -} // namespace mercury -} // namespace bts diff --git a/src/lib/mercury/broker/CoreEventBroker.cpp b/src/lib/mercury/broker/Broker.cpp similarity index 60% rename from src/lib/mercury/broker/CoreEventBroker.cpp rename to src/lib/mercury/broker/Broker.cpp index fd5369219..dd6bf4d9d 100644 --- a/src/lib/mercury/broker/CoreEventBroker.cpp +++ b/src/lib/mercury/broker/Broker.cpp @@ -1,9 +1,9 @@ -#include "CoreEventBroker.h" +#include "lib/mercury/broker/Broker.h" -#include "lib/utils/Puid.h" -#include "lib/utils/bts_assert.h" #include "lib/mercury/synopsis/ISynopsisBuilder.h" #include "lib/mercury/topics/ITopic.h" +#include "lib/utils/Puid.h" +#include "lib/utils/bts_assert.h" #include #include @@ -13,7 +13,7 @@ namespace mercury { template using Map = boost::container::flat_map; -struct CoreEventBroker::NoReenter { +struct Broker::NoReenter { NoReenter(bool &inside) : inside(inside) { bts_assert(!inside); inside = true; @@ -22,47 +22,47 @@ struct CoreEventBroker::NoReenter { bool &inside; }; -struct CoreEventBroker::InternalSubFilter { +struct Broker::LocalSubFilter { TopicFilter matches; - InternalEventHandler handler; + LocalEventHandler handler; }; -struct CoreEventBroker::StreamRec { - StreamRec(CoreEventBroker &owner, IEventBrokerPtr const &src, StreamID sid, +struct Broker::StreamRec { + StreamRec(Broker &owner, IRemoteBroker &src, StreamID sid, TopicPtr const &topic) - : owner(owner), local(false), src(src), sid(sid), topic(topic), - internal_subs(), external_subs(), sub_id(), + : owner(owner), local(false), src(&src), sid(sid), topic(topic), + local_subs(), external_subs(), sub_id(), synopsis_builder(topic->make_synopsis_builder()), topic_tag(topic->to_str()) {} - StreamRec(CoreEventBroker &owner, StreamID sid, TopicPtr const &topic) - : owner(owner), local(true), src(), sid(sid), topic(topic), - internal_subs(), external_subs(), sub_id(), + StreamRec(Broker &owner, StreamID sid, TopicPtr const &topic) + : owner(owner), local(true), src(), sid(sid), topic(topic), local_subs(), + external_subs(), sub_id(), synopsis_builder(topic->make_synopsis_builder()), topic_tag(topic->to_str()) {} ~StreamRec() { - for (auto &isub : internal_subs) + for (auto &isub : local_subs) isub.on_event(sid, EventType::END_STREAM, nullptr); } - struct InternalSubRec { - InternalSubID sub_id; - InternalEventHandler on_event; + struct LocalSubRec { + LocalSubID sub_id; + LocalEventHandler on_event; }; struct SubRec { SubID sub_id; - IEventBrokerPtr neighbour; + IRemoteBroker *neighbour; }; - CoreEventBroker &owner; + Broker &owner; const bool local; - const IEventBrokerPtr src; + IRemoteBroker *const src; const StreamID sid; const TopicPtr topic; - std::vector internal_subs; + std::vector local_subs; std::vector external_subs; SubID sub_id; @@ -71,11 +71,11 @@ struct CoreEventBroker::StreamRec { bool is_local() const { return local; } bool is_active() const { - return is_local() || internal_subs.size() || external_subs.size(); + return is_local() || local_subs.size() || external_subs.size(); } - EventPayload *get_synopsis() { return synopsis_builder->get_synopsis(); } + Notification *get_synopsis() { return synopsis_builder->get_synopsis(); } - void add_external_sub(IEventBrokerPtr const &node, SubID subid) { + void add_external_sub(IRemoteBroker *const &node, SubID subid) { auto sender = node->id(); bts_assert(std::find_if(external_subs.begin(), external_subs.end(), [sender](auto const &sub_rec) { @@ -95,21 +95,22 @@ struct CoreEventBroker::StreamRec { // we were already active so if we have a synopsis forward it auto synopsis = synopsis_builder->get_synopsis(); if (synopsis) { - LOG(Mercury, Info, "CoreEventBroker {} sending synopsis for sid: " - "{} to broker {} (sub_id:{} topic: {})", + LOG(Mercury, Info, + "Broker {} sending synopsis for sid: " + "{} to broker {} (sub_id:{} topic: {})", owner.id().value(), sid.value(), sender.value(), subid.value(), topic_tag); node->notify(owner.id(), sid, subid, *synopsis); } else LOG(Mercury, Info, - "CoreEventBroker {} does not have synopsis for sid: " + "Broker {} does not have synopsis for sid: " "{} for broker {} (sub_id:{} topic:{})", owner.id().value(), sid.value(), sender.value(), subid.value(), topic_tag); } } - void remove_external_sub(EventBrokerID sender, SubID subid) { + void remove_external_sub(BrokerID 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; @@ -121,33 +122,32 @@ struct CoreEventBroker::StreamRec { forward_unsub(); } - void add_internal_sub(InternalEventHandler const &handler, - InternalSubID sub_id) { + void add_local_sub(LocalEventHandler const &handler, LocalSubID sub_id) { auto it = - std::find_if(internal_subs.begin(), internal_subs.end(), + std::find_if(local_subs.begin(), local_subs.end(), [sub_id](auto &sub) { return sub.sub_id == sub_id; }); - bts_assert(it == internal_subs.end()); + bts_assert(it == local_subs.end()); auto was_active = is_active(); - internal_subs.push_back(InternalSubRec{sub_id, handler}); + local_subs.push_back(LocalSubRec{sub_id, handler}); handler(sid, EventType::BEGIN_STREAM, get_synopsis()); if (!was_active) forward_sub(); } - void remove_internal_sub(InternalSubID sub_id) { + void remove_local_sub(LocalSubID sub_id) { auto it = - std::find_if(internal_subs.begin(), internal_subs.end(), + std::find_if(local_subs.begin(), local_subs.end(), [sub_id](auto &sub) { return sub.sub_id == sub_id; }); - bts_assert(it != internal_subs.end()); + bts_assert(it != local_subs.end()); it->on_event(sid, EventType::END_SUB, nullptr); - internal_subs.erase(it); + local_subs.erase(it); if (!is_active()) forward_unsub(); } - void notify(EventPayload const &payload) { + void notify(Notification const &payload) { // notify local subs - for (auto &isub : internal_subs) + for (auto &isub : local_subs) isub.on_event(sid, EventType::NEW_EVENT, &payload); // fwd to remote subs @@ -160,14 +160,14 @@ struct CoreEventBroker::StreamRec { void forward_sub() { bts_assert(!is_local()); - bts_assert(internal_subs.size() || external_subs.size()); + bts_assert(local_subs.size() || external_subs.size()); - sub_id = owner.gen_external_sub_id(); + sub_id = owner.gen_remote_sub_id(); LOG(Mercury, Info, - "CoreEventBroker {} issuing subscription for topic: {} sid: {} " + "Broker {} issuing subscription for topic: {} sid: {} " "to broker {} (sub_id:{})", - owner.id().value(),topic_tag , sid.value(), src->id().value(), + owner.id().value(), topic_tag, sid.value(), src->id().value(), sub_id.value()); src->subscribe(owner.id(), sub_id, sid); @@ -176,41 +176,42 @@ struct CoreEventBroker::StreamRec { void forward_unsub() { bts_assert(!is_local()); - bts_assert(internal_subs.empty() && external_subs.empty()); - LOG(Mercury, Info, "CoreEventBroker {} canceling subscription for {} " - "from {} (sub_id: {})", + bts_assert(local_subs.empty() && external_subs.empty()); + LOG(Mercury, Info, + "Broker {} 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 { +struct Broker::PImpl { PImpl() - : streams(), neighbours(), internal_subs(), + : streams(), neighbours(), local_subs(), my_id(utils::gen_id("event_broker")), last_external_sub_id(), inside(false) {} Map> streams; - Map neighbours; - Map internal_subs; - EventBrokerID my_id; + Map neighbours; + Map local_subs; + BrokerID my_id; SubID last_external_sub_id; bool inside; }; -CoreEventBroker::CoreEventBroker() : me(new PImpl()) {} -CoreEventBroker::~CoreEventBroker() {} +Broker::Broker() : me(new PImpl()) {} +Broker::~Broker() {} -EventBrokerID CoreEventBroker::id() const { return me->my_id; } +BrokerID Broker::id() const { return me->my_id; } -void CoreEventBroker::add_neighbour(IEventBrokerPtr const &neighbour) { - LOG(Mercury, Info, "CoreEventBroker {} add_neighbour: {}", - me->my_id.value(), neighbour->id().value()); +void Broker::add_neighbour(IRemoteBroker &neighbour) { + LOG(Mercury, Info, "Broker {} add_neighbour: {}", me->my_id.value(), + neighbour.id().value()); NoReenter nr(me->inside); - auto &n = me->neighbours[neighbour->id()]; + auto &n = me->neighbours[neighbour.id()]; bts_assert(!n); - n = neighbour; + n = &neighbour; // Since we assume direct connections between all brokers (i.e. no // forwarding of notifications is needed), we only need to @@ -220,9 +221,9 @@ void CoreEventBroker::add_neighbour(IEventBrokerPtr const &neighbour) { n->advertise(me->my_id, s.first, s.second->topic); } -void CoreEventBroker::remove_neighbour(EventBrokerID removed_neighbour_id) { - LOG(Mercury, Info, "CoreEventBroker {} remove_neighbour broker {} ", - id().value(), removed_neighbour_id.value()); +void Broker::remove_neighbour(BrokerID removed_neighbour_id) { + LOG(Mercury, Info, "Broker {} remove_neighbour broker {} ", id().value(), + removed_neighbour_id.value()); NoReenter nr(me->inside); auto &n_rec = me->neighbours[removed_neighbour_id]; @@ -251,7 +252,7 @@ void CoreEventBroker::remove_neighbour(EventBrokerID removed_neighbour_id) { // unadvertise orphan streams for (auto &sid : its_streams) { LOG(Mercury, Info, - "CoreEventBroker {} sending unadvertisement for stream owned by dead " + "Broker {} sending unadvertisement for stream owned by dead " "node: {} sid: {}", id().value(), removed_neighbour_id.value(), sid.value()); _unadvertise(removed_neighbour_id, sid); @@ -262,7 +263,7 @@ void CoreEventBroker::remove_neighbour(EventBrokerID removed_neighbour_id) { auto sub_id = p.first; auto sid = p.second; LOG(Mercury, Info, - "CoreEventBroker {} canceling subscription for stream requested by " + "Broker {} canceling subscription for stream requested by " "dead node: {} sid: {} (sub_id:{})", id().value(), removed_neighbour_id.value(), sid.value(), sub_id.value()); @@ -273,10 +274,9 @@ void CoreEventBroker::remove_neighbour(EventBrokerID removed_neighbour_id) { me->neighbours.erase(removed_neighbour_id); } -void CoreEventBroker::advertise(EventBrokerID sender, StreamID sid, - TopicPtr const &topic) { +void Broker::advertise(BrokerID sender, StreamID sid, TopicPtr const &topic) { LOG(Mercury, Info, - "CoreEventBroker {} received advertisement from broker {} " + "Broker {} received advertisement from broker {} " "sid: {} topic: {}", id().value(), sender.value(), sid.value(), topic->to_str()); NoReenter nr(me->inside); @@ -289,7 +289,7 @@ void CoreEventBroker::advertise(EventBrokerID sender, StreamID sid, // external advertisement, must come from a known neighbour auto const &node = me->neighbours[sender]; bts_assert(node); - srec = std::make_unique(*this, node, sid, topic); + srec = std::make_unique(*this, *node, sid, topic); } else { srec = std::make_unique(*this, sid, topic); bts_assert(srec->is_local()); @@ -298,7 +298,7 @@ void CoreEventBroker::advertise(EventBrokerID sender, StreamID sid, // interconnected) for (auto &kvp : me->neighbours) { LOG(Mercury, Info, - "CoreEventBroker {} forwarding advertisement for stream {} owned " + "Broker {} forwarding advertisement for stream {} owned " "by broker {} to: {} sid: {} ", id().value(), topic->to_str(), sender.value(), kvp.first.value(), sid.value()); @@ -306,49 +306,52 @@ void CoreEventBroker::advertise(EventBrokerID sender, StreamID sid, } } - // match to existing internal subscriptions + // match to existing local subscriptions bool found = false; - for (auto const &kvp : me->internal_subs) { - auto internal_sub_id = kvp.first; + for (auto const &kvp : me->local_subs) { + auto local_sub_id = kvp.first; auto const &f = kvp.second; if (f.matches(*topic)) { found = true; - LOG(Mercury, Info, - "CoreEventBroker {} matched internal sub {} to topic {} sid {}", - id().value(), internal_sub_id, topic->to_str(), sid.value()); - srec->add_internal_sub(f.handler, internal_sub_id); + LOG(Mercury, Info, "Broker {} matched local sub {} to topic {} sid {}", + id().value(), local_sub_id, topic->to_str(), sid.value()); + srec->add_local_sub(f.handler, local_sub_id); } } if (!found) LOG(Mercury, Info, - "CoreEventBroker {} has no internal sub matches to topic {} sid {}", - id().value(), topic->to_str(), sid.value()); + "Broker {} has no local sub matches to topic {} sid {}", id().value(), + topic->to_str(), sid.value()); } -void CoreEventBroker::unadvertise(EventBrokerID sender, StreamID sid) { +void Broker::unadvertise(BrokerID sender, StreamID sid) { LOG(Mercury, Info, - "CoreEventBroker {} received unadvertisement from broker {} sid: {}", + "Broker {} received unadvertisement from broker {} 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) { +#ifndef NDEBUG +void Broker::notify(BrokerID sender, StreamID sid, SubID ex_subid, + Notification const &payload) { NoReenter nr(me->inside); - +#else +void Broker::notify(BrokerID , StreamID sid, SubID ex_subid, + Notification const &payload) { +#endif auto &srec = me->streams[sid]; - bts_assert(srec); - bts_assert((srec->is_local() && sender == id()) || - (!srec->is_local() && srec->src->id() == sender)); + bts_assert_d(srec); + bts_assert_d((srec->is_local() && sender == id()) || + (!srec->is_local() && 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, Info, "CoreEventBroker {} received subscribe from broker {} " - "sid: {} sub_id:{}", +void Broker::subscribe(BrokerID sender, SubID ex_subid, StreamID sid) { + LOG(Mercury, Info, + "Broker {} received subscribe from broker {} " + "sid: {} sub_id:{}", id().value(), sender.value(), sid.value(), ex_subid.value()); NoReenter nr(me->inside); @@ -360,33 +363,32 @@ void CoreEventBroker::subscribe(EventBrokerID sender, SubID ex_subid, if (it != me->streams.end()) it->second->add_external_sub(node, ex_subid); else - LOG(Mercury, Info, "CoreEventBroker {} received external subscribe for " - "dead stream {}. ignoring", + LOG(Mercury, Info, + "Broker {} received external subscribe for " + "dead stream {}. ignoring", id().value(), sid.value()); } -void CoreEventBroker::unsubscribe(EventBrokerID sender, SubID ex_subid, - StreamID sid) { - LOG(Mercury, Info, "CoreEventBroker {} received unsubscribe from broker {} " - "sid: {} sub_id:{}", +void Broker::unsubscribe(BrokerID sender, SubID ex_subid, StreamID sid) { + LOG(Mercury, Info, + "Broker {} received unsubscribe from broker {} " + "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, Info, - "CoreEventBroker {} received internal_subscribe (sub_id: {})", +void Broker::local_subscribe(LocalSubID in_subid, TopicFilter const &f, + LocalEventHandler const &cb) { + LOG(Mercury, Info, "Broker {} received local_subscribe (sub_id: {})", id().value(), in_subid.value()); NoReenter nr(me->inside); // no duplicates - bts_assert(me->internal_subs.find(in_subid) == me->internal_subs.end()); + bts_assert(me->local_subs.find(in_subid) == me->local_subs.end()); - // add to internal sub list - auto &sf = me->internal_subs[in_subid]; + // add to local sub list + auto &sf = me->local_subs[in_subid]; sf.matches = f; sf.handler = cb; @@ -397,44 +399,41 @@ void CoreEventBroker::internal_subscribe(InternalSubID in_subid, auto &srec = kvp.second; if (sf.matches(*srec->topic)) { found = true; - LOG(Mercury, Info, - "CoreEventBroker {} matched internal sub {} to topic {} sid {}", + LOG(Mercury, Info, "Broker {} matched local sub {} to topic {} sid {}", id().value(), in_subid, srec->topic->to_str(), kvp.first.value()); - srec->add_internal_sub(cb, in_subid); + srec->add_local_sub(cb, in_subid); } } if (!found) - LOG(Mercury, Info, - "CoreEventBroker {} found no topics to match internal sub {}", + LOG(Mercury, Info, "Broker {} found no topics to match local sub {}", id().value(), in_subid.value()); } -void CoreEventBroker::internal_unsubscribe(InternalSubID in_subid) { - LOG(Mercury, Info, - "CoreEventBroker {} received internal_unsubscribe (sub_id: {})", +void Broker::local_unsubscribe(LocalSubID in_subid) { + LOG(Mercury, Info, "Broker {} received local_unsubscribe (sub_id: {})", id().value(), in_subid.value()); NoReenter nr(me->inside); // must be a previously entered sub - auto it = me->internal_subs.find(in_subid); - bts_assert(it != me->internal_subs.end()); + auto it = me->local_subs.find(in_subid); + bts_assert(it != me->local_subs.end()); auto &matches = it->second.matches; - // for each stream that matched this filter remove the corresponding internal + // for each stream that matched this filter remove the corresponding local // sub for (auto &kvp : me->streams) { auto &srec = kvp.second; if (matches(*srec->topic)) - srec->remove_internal_sub(in_subid); + srec->remove_local_sub(in_subid); } } -SubID CoreEventBroker::gen_external_sub_id() { +SubID Broker::gen_remote_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) { +void Broker::_unadvertise(BrokerID sender, StreamID sid) { auto it = me->streams.find(sid); bts_assert(it != me->streams.end()); @@ -445,7 +444,6 @@ void CoreEventBroker::_unadvertise(EventBrokerID sender, StreamID sid) { bts_assert((sender == id() && srec->is_local()) || (!srec->is_local() && sender == srec->src->id())); - // remove from our index me->streams.erase(it); @@ -454,24 +452,24 @@ void CoreEventBroker::_unadvertise(EventBrokerID sender, StreamID sid) { if (srec->is_local()) { auto topic_str = srec->topic->to_str(); for (auto &kvp : me->neighbours) - if (kvp.first != sender) { - LOG(Mercury, Info, "CoreEventBroker {} forwarding unadvertisement for " - "stream {} owned " - "by broker {} to: {} sid: {}", + if (kvp.first != sender) { + LOG(Mercury, Info, + "Broker {} forwarding unadvertisement for " + "stream {} owned " + "by broker {} 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) { +void Broker::_unsubscribe(BrokerID 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); } } -} -} +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/broker/Broker.h b/src/lib/mercury/broker/Broker.h new file mode 100644 index 000000000..1781f42b2 --- /dev/null +++ b/src/lib/mercury/broker/Broker.h @@ -0,0 +1,47 @@ +#pragma once + +#include +#include "lib/mercury/broker/ILocalBroker.h" + +namespace bts { +namespace mercury { + +class Broker : public ILocalBroker +{ +public: + Broker(); + virtual ~Broker(); + + BrokerID id() const override; + + void add_neighbour(IRemoteBroker &) override; + void remove_neighbour(BrokerID) override; + + void advertise(BrokerID, StreamID, TopicPtr const &) override; + void unadvertise(BrokerID, StreamID) override; + + void subscribe(BrokerID, SubID, StreamID) override; + void unsubscribe(BrokerID, SubID, StreamID) override; + + void notify(BrokerID, StreamID, SubID, Notification const &) override; + + void local_subscribe(LocalSubID, TopicFilter const &, + LocalEventHandler const &cb) override; + void local_unsubscribe(LocalSubID) override; + +private: + struct NoReenter; + struct StreamRec; + struct LocalSubRec; + struct SubRec; + struct LocalSubFilter; + struct PImpl; + + SubID gen_remote_sub_id(); + void _unadvertise(BrokerID,StreamID) ; + void _unsubscribe (BrokerID,SubID,StreamID) ; + + std::unique_ptr me; +}; + +}} diff --git a/src/lib/mercury/broker/BrokerProxy.cpp b/src/lib/mercury/broker/BrokerProxy.cpp new file mode 100644 index 000000000..ba32b94a0 --- /dev/null +++ b/src/lib/mercury/broker/BrokerProxy.cpp @@ -0,0 +1,99 @@ +#include "lib/mercury/broker/BrokerProxy.h" + +namespace bts { +namespace mercury { + +BrokerProxy::BrokerProxy(ILocalBroker &real_broker) + : _real_broker(real_broker), _id(real_broker.id()), _outgoing(1000), _incoming(1000), _action_pool() +{} + +BrokerProxy::~BrokerProxy() {} + + +void BrokerProxy::add_neighbour(IRemoteBroker &n) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::ADD_NEIGHBOUR; + m->neighbour = &n; + send(*m); +} + +void BrokerProxy::remove_neighbour(BrokerID id) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::REMOVE_NEIGHBOUR; + m->broker_id = id; + send(*m); +} + +void BrokerProxy::advertise(BrokerID bid, StreamID sid, TopicPtr const &t) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::ADVERTISE; + m->broker_id = bid; + m->stream_id = sid; + m->topic = t; + send(*m); +} + +void BrokerProxy::unadvertise(BrokerID bid, StreamID sid) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::UNADVERTISE; + m->broker_id = bid; + m->stream_id = sid; + send(*m); +} + +void BrokerProxy::subscribe(BrokerID bid, SubID sub_id, StreamID sid) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::SUBSCRIBE; + m->broker_id = bid; + m->stream_id = sid; + m->sub_id = sub_id; + send(*m); +} + +void BrokerProxy::unsubscribe(BrokerID bid, SubID sub_id, StreamID sid) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::UNSUBSCRIBE; + m->broker_id = bid; + m->stream_id = sid; + m->sub_id = sub_id; + send(*m); +} + +void BrokerProxy::notify(BrokerID bid, StreamID sid, SubID sub_id, + Notification const &n) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::NOTIFY; + m->broker_id = bid; + m->stream_id = sid; + m->sub_id = sub_id; + m->notification = n; + send(*m); +} + +void BrokerProxy::local_subscribe(LocalSubID lsid, TopicFilter const &tf, + LocalEventHandler const &handler) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::LOCAL_SUBSCRIBE; + m->local_sub_id = lsid; + m->filter = tf; + m->local_handler = handler; + send(*m); +} + +void BrokerProxy::local_unsubscribe(LocalSubID lsid) { + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::LOCAL_SUBSCRIBE; + m->local_sub_id = lsid; + send(*m); +} + +void BrokerProxy::schedule_action (std::function const&action) +{ + auto m = _action_pool.construct(); + m->msg_type = BrokerMsgType::EXECUTE_ACTION; + m->action = action; + send(*m); +} + +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/broker/BrokerProxy.h b/src/lib/mercury/broker/BrokerProxy.h new file mode 100644 index 000000000..8ee0106e0 --- /dev/null +++ b/src/lib/mercury/broker/BrokerProxy.h @@ -0,0 +1,141 @@ +#pragma once + +#include "lib/mercury/broker/ILocalBroker.h" +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/topics/Topic.h" + +#include +#include +#include + +namespace bts { +namespace mercury { + +class BrokerProxy : public ILocalBroker { +protected: + friend class ActorBroker; + enum class BrokerMsgType { + ADD_NEIGHBOUR, + REMOVE_NEIGHBOUR, + ADVERTISE, + UNADVERTISE, + SUBSCRIBE, + UNSUBSCRIBE, + NOTIFY, + LOCAL_SUBSCRIBE, + LOCAL_UNSUBSCRIBE, + EXECUTE_ACTION + }; + + struct BrokerMsg { + BrokerMsgType msg_type; + BrokerID broker_id; + StreamID stream_id; + LocalSubID local_sub_id; + Notification notification; + TopicPtr topic; + SubID sub_id; + TopicFilter filter; + LocalEventHandler local_handler; + IRemoteBroker *neighbour; + std::function action; + }; + + public: + BrokerProxy(ILocalBroker &real_broker); + virtual ~BrokerProxy(); + + // ILocalBroker + BrokerID id() const override { return _id; } + void add_neighbour(IRemoteBroker &) override; + void remove_neighbour(BrokerID) override; + void advertise(BrokerID, StreamID, TopicPtr const &) override; + void unadvertise(BrokerID, StreamID) override; + void subscribe(BrokerID, SubID, StreamID) override; + void unsubscribe(BrokerID, SubID, StreamID) override; + void notify(BrokerID, StreamID, SubID, Notification const &) override; + void local_subscribe(LocalSubID, TopicFilter const &, + LocalEventHandler const &cb) override; + void local_unsubscribe(LocalSubID) override; + // ILocalBroker + + void schedule_action(std::function const &action); + + + // these are just for performance, we want to avoid to allow for + // notifications to be initialized in place but this class does not + // know how to do that, so we need to expose the notification + // member to the outside. + void alloc_notify(BrokerMsg **msg, Notification **n) + { + auto m = _action_pool.construct(); + *msg = m; + *n = &m->notification; + } + void send_notify(BrokerID bid, StreamID sid, SubID suid, BrokerMsg &m) + { + m.msg_type = BrokerMsgType::NOTIFY; + m.broker_id = bid; + m.stream_id = sid; + m.sub_id = suid; + send(m); + } + + void do_work() { + _outgoing.consume_all([this](BrokerMsg *m) { + switch (m->msg_type) { + case BrokerMsgType::ADD_NEIGHBOUR: + _real_broker.add_neighbour(*m->neighbour); + break; + case BrokerMsgType::REMOVE_NEIGHBOUR: + _real_broker.remove_neighbour(m->broker_id); + break; + case BrokerMsgType::ADVERTISE: + _real_broker.advertise(m->broker_id, m->stream_id, m->topic); + break; + case BrokerMsgType::UNADVERTISE: + _real_broker.unadvertise(m->broker_id, m->stream_id); + break; + case BrokerMsgType::SUBSCRIBE: + _real_broker.subscribe(m->broker_id, m->sub_id, m->stream_id); + break; + case BrokerMsgType::UNSUBSCRIBE: + _real_broker.unsubscribe(m->broker_id, m->sub_id, m->stream_id); + break; + case BrokerMsgType::NOTIFY: + _real_broker.notify(m->broker_id, m->stream_id, m->sub_id, + m->notification); + break; + case BrokerMsgType::LOCAL_SUBSCRIBE: + _real_broker.local_subscribe(m->local_sub_id, m->filter, + m->local_handler); + break; + case BrokerMsgType::LOCAL_UNSUBSCRIBE: + _real_broker.local_unsubscribe(m->local_sub_id); + break; + case BrokerMsgType::EXECUTE_ACTION: + m->action(); + break; + default: + bts_assert(false); + break; + } + _incoming.push(m); + }); + } + + private: + ILocalBroker &_real_broker; + const BrokerID _id; + boost::lockfree::spsc_queue _outgoing; + boost::lockfree::spsc_queue _incoming; + boost::object_pool _action_pool; + + void send(BrokerMsg &m) { + _outgoing.push(&m); + _incoming.consume_all([this](BrokerMsg *m) { _action_pool.destroy(m); }); + } +}; + +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/broker/CoreEventBroker.h b/src/lib/mercury/broker/CoreEventBroker.h deleted file mode 100644 index ca228e221..000000000 --- a/src/lib/mercury/broker/CoreEventBroker.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#include -#include "lib/mercury/broker/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/lib/mercury/broker/IEventBroker.cpp b/src/lib/mercury/broker/IEventBroker.cpp deleted file mode 100644 index 1968cda8c..000000000 --- a/src/lib/mercury/broker/IEventBroker.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "IEventBroker.h" - -namespace bts { -namespace mercury { - -IEventBroker::~IEventBroker(){} - -}} diff --git a/src/lib/mercury/broker/IEventBroker.h b/src/lib/mercury/broker/IEventBroker.h deleted file mode 100644 index 3022d89f8..000000000 --- a/src/lib/mercury/broker/IEventBroker.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include -#include "lib/mercury/mercury_utils/mercury_common.h" -#include "lib/mercury/topics/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/lib/mercury/broker/ILocalBroker.cpp b/src/lib/mercury/broker/ILocalBroker.cpp new file mode 100644 index 000000000..73d8624b0 --- /dev/null +++ b/src/lib/mercury/broker/ILocalBroker.cpp @@ -0,0 +1,6 @@ +#include "lib/mercury/broker/ILocalBroker.h" + +namespace bts { +namespace mercury { +ILocalBroker::~ILocalBroker() {} +}} diff --git a/src/lib/mercury/broker/ILocalBroker.h b/src/lib/mercury/broker/ILocalBroker.h new file mode 100644 index 000000000..e46c0166d --- /dev/null +++ b/src/lib/mercury/broker/ILocalBroker.h @@ -0,0 +1,16 @@ +#pragma once +#include "lib/mercury/broker/IRemoteBroker.h" + +namespace bts { +namespace mercury { + +class ILocalBroker : public IRemoteBroker { + public: + virtual void local_subscribe(LocalSubID, TopicFilter const &, + LocalEventHandler const &cb) = 0; + virtual void local_unsubscribe(LocalSubID) = 0; + virtual ~ILocalBroker(); +}; + +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/broker/IRemoteBroker.cpp b/src/lib/mercury/broker/IRemoteBroker.cpp new file mode 100644 index 000000000..f1602c12a --- /dev/null +++ b/src/lib/mercury/broker/IRemoteBroker.cpp @@ -0,0 +1,6 @@ +#include "lib/mercury/broker/IRemoteBroker.h" + +namespace bts { +namespace mercury { +IRemoteBroker::~IRemoteBroker() {} +}} diff --git a/src/lib/mercury/broker/IRemoteBroker.h b/src/lib/mercury/broker/IRemoteBroker.h new file mode 100644 index 000000000..c151edbdd --- /dev/null +++ b/src/lib/mercury/broker/IRemoteBroker.h @@ -0,0 +1,28 @@ +#pragma once + +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/topics/Topic.h" +#include + +namespace bts { +namespace mercury { + +class IRemoteBroker { + public: + virtual BrokerID id() const = 0; + + virtual void add_neighbour(IRemoteBroker &) = 0; + virtual void remove_neighbour(BrokerID) = 0; + + virtual void advertise(BrokerID, StreamID, TopicPtr const &) = 0; + virtual void unadvertise(BrokerID, StreamID) = 0; + + virtual void subscribe(BrokerID, SubID, StreamID) = 0; + virtual void unsubscribe(BrokerID, SubID, StreamID) = 0; + + virtual void notify(BrokerID, StreamID, SubID, Notification const &) = 0; + + virtual ~IRemoteBroker(); +}; +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/mercury_utils/FatWrapper.h b/src/lib/mercury/common/FatWrapper.h similarity index 89% rename from src/lib/mercury/mercury_utils/FatWrapper.h rename to src/lib/mercury/common/FatWrapper.h index 412edd725..b9ef24219 100644 --- a/src/lib/mercury/mercury_utils/FatWrapper.h +++ b/src/lib/mercury/common/FatWrapper.h @@ -6,7 +6,7 @@ #include "lib/utils/bts_assert.h" namespace bts { -namespace utils { +namespace mercury { template void fat_wrapper_copy(std::array *dst, @@ -31,11 +31,10 @@ void fat_wrapper_destroy(std::array &dst) } } -// A type safe(ish) wrapper for arbitrary types with the purpose of -// making it possible to use small object optimization to avoid heap -// allocations. This would not be needed if boost::variant wasn't a -// slow, complex POS. std::variant might do trick when its widely -// available. +// A type safe(ish) wrapper for arbitrary types making it possible to +// use small object optimization to avoid heap allocations. This would +// not be needed if boost::variant wasn't a slow, complex +// POS. std::variant might do trick when its widely available. template class FatWrapper { @@ -104,8 +103,8 @@ public: template T &unwrap() { - bts_assert(!empty()); - bts_assert(*_wrapped_type == typeid(T)); + bts_assert_d(!empty()); + bts_assert_d(*_wrapped_type == typeid(T)); if (sizeof(T) <= BufferSize) return *((T*) _buffer.data()); else diff --git a/src/lib/mercury/mercury_utils/mercury_common.cpp b/src/lib/mercury/common/mercury_common.cpp similarity index 100% rename from src/lib/mercury/mercury_utils/mercury_common.cpp rename to src/lib/mercury/common/mercury_common.cpp diff --git a/src/lib/mercury/common/mercury_common.h b/src/lib/mercury/common/mercury_common.h new file mode 100644 index 000000000..4cea2d210 --- /dev/null +++ b/src/lib/mercury/common/mercury_common.h @@ -0,0 +1,33 @@ +#pragma once + +#include +#include +#include +#include "lib/mercury/common/FatWrapper.h" +#include "lib/utils/ValueWrapper.h" + +namespace bts { +namespace mercury { + +class ITopic; +using TopicFilter = std::function ; + +using StreamID = utils::ValueWrapper; +using SubID = utils::ValueWrapper; +using Notification = FatWrapper<80>; +using LocalSubID = utils::ValueWrapper; +using BrokerID = utils::ValueWrapper; + +enum class EventType { + BEGIN_STREAM, + END_STREAM, + NEW_EVENT, + END_SUB +}; +using LocalEventHandler = std::function; + +StreamID gen_stream_id(); + +using TimeStampStr = utils::ValueWrapper> ; + +}} diff --git a/src/lib/mercury/events/Event.h b/src/lib/mercury/events/Event.h index 94c25f07b..cec8f05d9 100644 --- a/src/lib/mercury/events/Event.h +++ b/src/lib/mercury/events/Event.h @@ -1,11 +1,11 @@ #pragma once -#include -#include "lib/orderman/orderman_utils/orderman_common.h" -#include -#include "lib/mercury/synopsis/NoSynopsis.h" #include "lib/mercury/synopsis/CacheAll.h" #include "lib/mercury/synopsis/CacheLast.h" +#include "lib/mercury/synopsis/NoSynopsis.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include +#include namespace bts { namespace mercury { @@ -14,11 +14,11 @@ namespace mercury { // any given event. User events should derive from Event and use the // curiously recurrent template pattern (yeah, its a thing, google it). template > -class Event -{ -public: + typename TArray = boost::container::small_vector> +class Event { + public: using Array = TArray; }; -}} +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/events/Stream.h b/src/lib/mercury/events/Stream.h index 60917ee9a..5c7ab274a 100644 --- a/src/lib/mercury/events/Stream.h +++ b/src/lib/mercury/events/Stream.h @@ -1,17 +1,15 @@ #pragma once +#include "lib/mercury/common/mercury_common.h" #include -#include "lib/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { -template class Stream -{ -public: +template class Stream { + public: StreamID sid; }; - -}} - +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/events/TimerEvent.h b/src/lib/mercury/events/TimerEvent.h index 5c68474f3..41a55d691 100644 --- a/src/lib/mercury/events/TimerEvent.h +++ b/src/lib/mercury/events/TimerEvent.h @@ -2,7 +2,7 @@ #include #include "lib/mercury/events/Event.h" -#include "lib/mercury/mercury_utils/mercury_common.h" +#include "lib/mercury/common/mercury_common.h" #include "lib/utils/bts_chrono.h" #include "lib/mercury/synopsis/NoSynopsis.h" diff --git a/src/lib/mercury/events/Update.h b/src/lib/mercury/events/Update.h index de114ae1d..86dfaa553 100644 --- a/src/lib/mercury/events/Update.h +++ b/src/lib/mercury/events/Update.h @@ -1,7 +1,7 @@ #pragma once #include -#include "lib/mercury/mercury_utils/mercury_common.h" +#include "lib/mercury/common/mercury_common.h" #include namespace bts { diff --git a/src/lib/mercury/executor/Executor.cpp b/src/lib/mercury/executor/Executor.cpp new file mode 100644 index 000000000..a2e6fe50e --- /dev/null +++ b/src/lib/mercury/executor/Executor.cpp @@ -0,0 +1,44 @@ +#include "lib/mercury/executor/Executor.h" +#include "lib/mercury/broker/Broker.h" +#include "lib/mercury/broker/BrokerProxy.h" +#include "lib/mercury/actors/Actor.h" +#include "lib/mercury/actors/IPollableActor.h" + +namespace bts { +namespace mercury { + +Executor::Executor() : _broker(), _actor_broker(_broker),_actors() {} + +Executor::~Executor() { + for (auto &a : _actors) + a->deactivate(); +} + +void Executor::init_neighbours(std::vector const&neighbours) +{ + std::vector broker_neighbours; + for (auto e : neighbours) + if (e != this) + broker_neighbours.push_back(&e->make_proxy()); + for (auto n : broker_neighbours) + _broker.add_neighbour(*n); +} + + +void Executor::activate(Actor *actor) +{ + _actors.push_back(std::unique_ptr (actor)); + auto pollable = dynamic_cast (actor); + if (pollable) + _pollable_actors.push_back(pollable); + actor->activate(_actor_broker);} + + +BrokerProxy& Executor::make_proxy() +{ + _neighbour_proxies.push_back(std::make_unique(_broker)); + return *_neighbour_proxies.back(); +} + +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/executor/Executor.h b/src/lib/mercury/executor/Executor.h new file mode 100644 index 000000000..a5de258ee --- /dev/null +++ b/src/lib/mercury/executor/Executor.h @@ -0,0 +1,44 @@ +#pragma once + +#include "lib/mercury/actors/IPollableActor.h" +#include "lib/mercury/broker/Broker.h" +#include "lib/mercury/broker/BrokerProxy.h" +#include "lib/mercury/actors/ActorBroker.h" + +#include +#include + +namespace bts { +namespace mercury { +class Actor; +class BrokerProxy; +class Executor { + public: + Executor(); + ~Executor(); + void init_neighbours(std::vector const &neighbours); + + template void spawn(Args &&... args) { + activate(new A(std::forward(args)...)); + } + + void do_work() { + _actor_broker.do_work(); + for (auto p : _pollable_actors) + p->on_poll(); + for (auto &bp : _neighbour_proxies) + bp->do_work(); + } + + void activate(Actor *actor); + BrokerProxy &make_proxy(); + private: + + Broker _broker; + ActorBroker _actor_broker; + std::vector _pollable_actors; + std::vector> _neighbour_proxies; + std::vector> _actors; +}; +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/mercury_utils/Executor.cpp b/src/lib/mercury/mercury_utils/Executor.cpp deleted file mode 100644 index b7d42dbf9..000000000 --- a/src/lib/mercury/mercury_utils/Executor.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "Executor.h" - -namespace bts { -namespace mercury { - - -}} diff --git a/src/lib/mercury/mercury_utils/Executor.h b/src/lib/mercury/mercury_utils/Executor.h deleted file mode 100644 index 0bd53bead..000000000 --- a/src/lib/mercury/mercury_utils/Executor.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once - -#include -#include - -#include "lib/logging/logging.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/actors/ActorPtr.h" -#include "lib/mercury/broker/AsyncEventBroker.h" -#include "lib/mercury/mercury_utils/IPollableActor.h" - -namespace bts { -namespace mercury { - -class Executor { -public: - Executor(AsyncEventBroker &broker) - : _broker(broker), - _actors(), - _pollable_actors() - {} - - // Destruction is not thread safe, it is the responsability of the - // caller to ensure that no concurrent calls to do_work() or any - // other method are not being made at this point. - ~Executor() { - for (auto actor : _actors) - actor->deactivate(); - } - - void activate(ActorPtr const &actor) { - _broker.post_action([actor,this]() { - _actors.push_back(actor); - auto pollable = dynamic_cast (actor.get()); - if (pollable) - this->_pollable_actors.push_back(pollable); - actor->activate(this->_broker); - }); - } - - template void spawn(Args &&... args) { - activate(std::make_shared(std::forward(args)...)); - } - - bool do_work() { - for (auto pollable : _pollable_actors) - pollable->on_poll(); - return _broker.do_work(); - } - -private: - AsyncEventBroker &_broker; - std::vector _actors; - std::vector _pollable_actors; -}; -} -} diff --git a/src/lib/mercury/mercury_utils/mercury_common.h b/src/lib/mercury/mercury_utils/mercury_common.h deleted file mode 100644 index 5320b146d..000000000 --- a/src/lib/mercury/mercury_utils/mercury_common.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once - -#include -#include -#include -#include "lib/mercury/mercury_utils/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 = utils::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; - -StreamID gen_stream_id(); - -using TimeStampStr = utils::ValueWrapper> ; - -}} diff --git a/src/lib/mercury/synopsis/CacheAll.h b/src/lib/mercury/synopsis/CacheAll.h index 023b2858c..2a9d6c28e 100644 --- a/src/lib/mercury/synopsis/CacheAll.h +++ b/src/lib/mercury/synopsis/CacheAll.h @@ -1,5 +1,6 @@ #pragma once +#include "lib/mercury/synopsis/ISynopsisBuilder.h" #include namespace bts { @@ -7,26 +8,22 @@ namespace mercury { // Cache all previously published events and use that // as the synopsis -template -class CacheAll : public ISynopsisBuilder -{ -public: +template class CacheAll : public ISynopsisBuilder { + public: CacheAll() : _synopsis(), _empty(true) {} - EventPayload* get_synopsis () override - { + Notification *get_synopsis() override { if (!_empty) return &_synopsis; else return nullptr; } - - void update(EventPayload const&pl) override - { + + void update(Notification const &pl) override { if (_synopsis.empty()) _synopsis = pl; else { - auto const &update = pl.unwrap (); + auto const &update = pl.unwrap(); auto &previous = _synopsis.unwrap(); for (auto const &ev : update) previous.emplace_back(ev); @@ -34,11 +31,12 @@ public: _empty = false; } - void clear_synopsis() override {_empty = true;}; + void clear_synopsis() override { _empty = true; }; -private: - EventPayload _synopsis; + private: + Notification _synopsis; bool _empty; }; -}} +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/synopsis/CacheLast.h b/src/lib/mercury/synopsis/CacheLast.h index 0cd0f89dd..0849e92ff 100644 --- a/src/lib/mercury/synopsis/CacheLast.h +++ b/src/lib/mercury/synopsis/CacheLast.h @@ -1,34 +1,35 @@ #pragma once -#include +#include "lib/mercury/common/mercury_common.h" #include "lib/mercury/synopsis/ISynopsisBuilder.h" -#include "lib/mercury/mercury_utils/mercury_common.h" +#include namespace bts { namespace mercury { // Cache last event published and use that as the synopsis -class CacheLast : public ISynopsisBuilder -{ -public: +class CacheLast : public ISynopsisBuilder { + public: CacheLast() : _synopsis(), _empty(true) {} - EventPayload* get_synopsis () override - { + Notification *get_synopsis() override { if (!_empty) return &_synopsis; else return nullptr; } - - void update(EventPayload const&pl) override {_synopsis = pl; _empty= false;} - void clear_synopsis() override {_empty = true;} -private: - EventPayload _synopsis; + void update(Notification const &pl) override { + _synopsis = pl; + _empty = false; + } + void clear_synopsis() override { _empty = true; } + + private: + Notification _synopsis; bool _empty; }; - -}} +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/synopsis/ISynopsisBuilder.h b/src/lib/mercury/synopsis/ISynopsisBuilder.h index c4f3edd0c..7b7327787 100644 --- a/src/lib/mercury/synopsis/ISynopsisBuilder.h +++ b/src/lib/mercury/synopsis/ISynopsisBuilder.h @@ -1,20 +1,20 @@ #pragma once +#include "lib/mercury/common/mercury_common.h" #include -#include "lib/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { -class ISynopsisBuilder -{ -public: - virtual EventPayload* get_synopsis() = 0; - virtual void update(EventPayload const&) = 0; +class ISynopsisBuilder { + public: + virtual Notification *get_synopsis() = 0; + virtual void update(Notification const &) = 0; virtual void clear_synopsis() = 0; virtual ~ISynopsisBuilder() {} }; -using SynopsisBuilderPtr = std::shared_ptr ; +using SynopsisBuilderPtr = std::shared_ptr; -}} +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/synopsis/ISynopsysBuilder.h b/src/lib/mercury/synopsis/ISynopsysBuilder.h deleted file mode 100644 index 0fdd2a7d1..000000000 --- a/src/lib/mercury/synopsis/ISynopsysBuilder.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include -#include "lib/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/lib/mercury/synopsis/MergeByKey.h b/src/lib/mercury/synopsis/MergeByKey.h index a029d9d3f..2ef3d0be9 100644 --- a/src/lib/mercury/synopsis/MergeByKey.h +++ b/src/lib/mercury/synopsis/MergeByKey.h @@ -10,15 +10,15 @@ namespace mercury { // published for each key template class MergeByKey : public ISynopsisBuilder { public: - using RefConstKey = decltype(((EV *)nullptr)->key()); - using ConstKey = typename std::remove_reference::type; + using RefConstKey = decltype(((EV *)nullptr)->key()); + using ConstKey = typename std::remove_reference::type; using Key = typename std::remove_const::type; using TMap = std::unordered_map; MergeByKey() : _synopsis(), _empty(), _dirty() { clear_synopsis(); } - EventPayload *get_synopsis() override { + Notification *get_synopsis() override { if (!_empty) { if (_dirty) { // regen synopsis from merged map @@ -33,7 +33,7 @@ template class MergeByKey : public ISynopsisBuilder { return nullptr; } - void update(EventPayload const &pl) override { + void update(Notification const &pl) override { _dirty = true; _empty = false; auto const &update = pl.unwrap(); @@ -49,10 +49,10 @@ template class MergeByKey : public ISynopsisBuilder { }; private: - EventPayload _synopsis; + Notification _synopsis; TMap _merged; bool _empty; bool _dirty; }; -} -} +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/synopsis/NoSynopsis.h b/src/lib/mercury/synopsis/NoSynopsis.h index 1556b40dc..399e2c09f 100644 --- a/src/lib/mercury/synopsis/NoSynopsis.h +++ b/src/lib/mercury/synopsis/NoSynopsis.h @@ -1,22 +1,19 @@ #pragma once -#include +#include "lib/mercury/common/mercury_common.h" #include "lib/mercury/synopsis/ISynopsisBuilder.h" -#include "lib/mercury/mercury_utils/mercury_common.h" +#include namespace bts { namespace mercury { // do not keep a synopsis - -class NoSynopsis : public ISynopsisBuilder -{ -public: - EventPayload* get_synopsis() override {return nullptr;} - void update(EventPayload const&) override {}; - void clear_synopsis() override {}; +class NoSynopsis : public ISynopsisBuilder { + public: + Notification *get_synopsis() override { return nullptr; } + void update(Notification const &) override{}; + void clear_synopsis() override{}; }; - -}} - +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/synopsis/SynopsisBuilder.cpp b/src/lib/mercury/synopsis/SynopsisBuilder.cpp deleted file mode 100644 index 4f8a559dc..000000000 --- a/src/lib/mercury/synopsis/SynopsisBuilder.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "SynopsisBuilder.h" - -namespace bts { -namespace mercury { - -}} diff --git a/src/lib/mercury/synopsis/SynopsisBuilder.h b/src/lib/mercury/synopsis/SynopsisBuilder.h deleted file mode 100644 index 7af738bce..000000000 --- a/src/lib/mercury/synopsis/SynopsisBuilder.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include -#include "lib/mercury/mercury_utils/mercury_common.h" - -namespace bts { -namespace mercury { - -class SynopsisBuilder -{ -public: - EventPayload* get_synopsis(); - void update(EventPayload const&); - void reset(); -}; - -}} diff --git a/src/lib/mercury/topics/ITopic.cpp b/src/lib/mercury/topics/ITopic.cpp deleted file mode 100644 index b6f767b56..000000000 --- a/src/lib/mercury/topics/ITopic.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "ITopic.h" - -namespace bts { -namespace mercury { - -ITopic::~ITopic () {} - -}} diff --git a/src/lib/mercury/topics/ITopic.h b/src/lib/mercury/topics/ITopic.h index 692a618fa..1e34f0e7f 100644 --- a/src/lib/mercury/topics/ITopic.h +++ b/src/lib/mercury/topics/ITopic.h @@ -1,21 +1,21 @@ #pragma once -#include #include "lib/mercury/synopsis/ISynopsisBuilder.h" +#include namespace bts { namespace mercury { class SynopsisBuilder; -class ITopic -{ -public: +class ITopic { + public: virtual ~ITopic(); virtual SynopsisBuilderPtr make_synopsis_builder() const = 0; virtual std::string to_str() const = 0; }; -using TopicPtr = std::shared_ptr ; +using TopicPtr = std::shared_ptr; -}} +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/topics/Topic.cpp b/src/lib/mercury/topics/Topic.cpp new file mode 100644 index 000000000..c1b5bd070 --- /dev/null +++ b/src/lib/mercury/topics/Topic.cpp @@ -0,0 +1,9 @@ +#include "ITopic.h" + +namespace bts { +namespace mercury { + +ITopic::~ITopic() {} + +} // namespace mercury +} // namespace bts diff --git a/src/lib/mercury/topics/Topic.h b/src/lib/mercury/topics/Topic.h index 61cb3cfe2..2e7745318 100644 --- a/src/lib/mercury/topics/Topic.h +++ b/src/lib/mercury/topics/Topic.h @@ -1,59 +1,54 @@ #pragma once -#include -#include -#include "lib/utils/type_name.h" #include "lib/mercury/events/Event.h" +#include "lib/mercury/topics/ITopic.h" +#include "lib/utils/type_name.h" +#include +#include namespace bts { namespace mercury { +template using void_t = void; -template< class... > -using void_t = void; +template > struct has_tag : std::false_type {}; -template< class, class = void_t<> > -struct has_tag : std::false_type { }; - -template< class T > -struct has_tag> : std::true_type { }; +template +struct has_tag> : std::true_type {}; -template ::value> struct Topic2; +template ::value> struct Topic2; template ::value> class Topic; -template -class Topic : public ITopic -{ -public: +template class Topic : public ITopic { + public: using Tag = typename EV::Tag; - Topic (const Tag &t) : _tag(t) {} + 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()); + return fmt::format("{}/{}", std::string(utils::type_name()), tag()); } - Tag const& tag() const {return _tag;} - -private: + Tag const &tag() const { return _tag; } + + private: Tag _tag; }; -template -class Topic : public ITopic -{ -public: +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())); + return fmt::format("{}", std::string(utils::type_name())); } }; -}} +} // namespace mercury +} // namespace bts diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index 03167b9ee..1d586ed55 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -6,7 +6,7 @@ #include "lib/jetfix/codec/MessageDefinitions.h" #include "lib/mercury/events/Update.h" #include "lib/orderman/events/OutFIXMsgEvent.h" -#include "lib/mercury/mercury_utils/IPollableActor.h" +#include "lib/mercury/actors/IPollableActor.h" namespace bts { namespace metrics { class MetricsContainer;} diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 0c16a179f..5b01c9dd8 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -6,7 +6,7 @@ #include "lib/utils/TimeStamp.h" #include "lib/mercury/actors/Actor.h" #include "lib/mercury/events/TimerEvent.h" -#include "lib/mercury/mercury_utils/IPollableActor.h" +#include "lib/mercury/actors/IPollableActor.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/events/MDRequestEvent.h" #include "lib/tracing/bts_trace.h" diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 85a25fd29..73f0ffa4c 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -1,10 +1,11 @@ #include "ServiceBridge.h" #include "lib/api/public/ServiceContext.h" -#include "lib/utils/PBUtils.h" +#include "lib/mercury/broker/BrokerProxy.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" +#include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/StoredFillEvent.h" @@ -13,7 +14,7 @@ #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" -#include "lib/orderman/events/NewAdminDataEvent.h" +#include "lib/utils/PBUtils.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -24,12 +25,11 @@ namespace orderman { struct ServiceBridge::PImpl { PImpl(OnReady const &on_ready, OnOrders const &on_orders, - OnFills const &on_fills) + OnFills const &on_fills, mercury::BrokerProxy &service_call_marshaller) : on_ready(on_ready), on_orders(on_orders), on_fills(on_fills), have_orders(false), have_securities(false), order_manager_ready(false), sec_db(), order_router(), order_factory(sec_db, order_router), - known_orders() { - } + known_orders(), service_call_marshaller(service_call_marshaller) {} OnReady on_ready; OnOrders on_orders; @@ -47,20 +47,18 @@ struct ServiceBridge::PImpl { mercury::Stream new_admin_data_pub; std::unordered_set known_orders; std::vector> admin_data_updates; - + mercury::BrokerProxy &service_call_marshaller; std::promise ready; }; ServiceBridge::ServiceBridge(OnReady const &on_ready, OnOrders const &on_orders, - OnFills const &on_fills) - : me(new PImpl(on_ready, on_orders, on_fills)) {} + OnFills const &on_fills, + mercury::BrokerProxy &service_call_marshaller) + : me(new PImpl(on_ready, on_orders, on_fills, service_call_marshaller)) {} ServiceBridge::~ServiceBridge() {} -void ServiceBridge::block_until_ready() -{ - me->ready.get_future().wait(); -} +void ServiceBridge::block_until_ready() { me->ready.get_future().wait(); } void ServiceBridge::init() { subscribe([this](auto const &u) { this->on(u); }); @@ -125,8 +123,8 @@ void ServiceBridge::on(mercury::Update const &update) { } } -void ServiceBridge::on(mercury::Update const&update) { - if (update.events) +void ServiceBridge::on(mercury::Update const &update) { + if (update.events) for (auto ev : *(update.events)) me->order_router.update(*ev.admin_data); } @@ -139,7 +137,7 @@ ServiceBridge::create_order(api::orderman::Create const &c) { std::promise p; auto f = p.get_future(); - post_action([this, &c, &p]() { + schedule_action([this, &c, &p]() { api::orderman::Response r; if (is_ready()) { @@ -165,7 +163,7 @@ ServiceBridge::update_order(api::orderman::Update const &c) { std::promise p; auto f = p.get_future(); - post_action([this, &c, &p]() { + schedule_action([this, &c, &p]() { api::orderman::Response r; if (is_ready()) { @@ -192,7 +190,7 @@ ServiceBridge::cancel_order(api::orderman::Cancel const &c) { std::promise p; auto f = p.get_future(); - post_action([this, &c, &p]() { + schedule_action([this, &c, &p]() { api::orderman::Response r; if (is_ready()) { @@ -215,7 +213,7 @@ ServiceBridge::crack_order(api::orderman::Crack const &c) { std::promise p; auto f = p.get_future(); - post_action([this, &c, &p]() { + schedule_action([this, &c, &p]() { api::orderman::Response r; if (is_ready()) { @@ -233,12 +231,12 @@ ServiceBridge::crack_order(api::orderman::Crack const &c) { return f.get(); } -void ServiceBridge::update_admin_data(std::shared_ptr const&admin) -{ - post_action([this, admin]() { - me->admin_data_updates.push_back (admin); - publish(me->new_admin_data_pub,*admin); - }); +void ServiceBridge::update_admin_data( + std::shared_ptr const &admin) { + schedule_action([this, admin]() { + me->admin_data_updates.push_back(admin); + publish(me->new_admin_data_pub, *admin); + }); } bool ServiceBridge::is_ready() const { @@ -249,5 +247,5 @@ void ServiceBridge::maybe_signal_ready(bool old_ready) { if (!old_ready && is_ready()) me->on_ready(); } -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index 7672731e2..5293fbc76 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -1,14 +1,17 @@ #pragma once -#include -#include "lib/mercury/actors/Actor.h" #include "lib/config/protos/jetfix.pb.h" +#include "lib/mercury/actors/Actor.h" +#include // fwds namespace bts { +namespace mercury {class BrokerProxy;} namespace api { class ServiceContext; -namespace admin { class AdminData;} +namespace admin { +class AdminData; +} namespace orderman { class OrderRecord; class Fill; @@ -17,32 +20,36 @@ class Create; class Update; class Cancel; class Crack; -}} +} // namespace orderman +} // namespace api namespace orderman { class StoredFillEvent; class StoredOrderEvent; class NewSecuritiesEvent; class OrderManagerReadyEvent; class NewAdminDataEvent; -}} +} // namespace orderman +} // namespace bts // end fwds - // Provides a threading bridge between the quickbux/service world and // the mercury event broker. namespace bts { namespace orderman { -class ServiceBridge : public mercury::Actor -{ +class ServiceBridge : public mercury::Actor { public: - template using OnEv = std::function; + template using OnEv = std::function; using OnReady = std::function; - using OnOrders = std::function const& )>; - using OnFills = std::function const&)>; - - ServiceBridge(OnReady const&, OnOrders const&, OnFills const&); + using OnOrders = + std::function const &)>; + using OnFills = + std::function const &)>; + + ServiceBridge( + OnReady const &, OnOrders const &, OnFills const &, + mercury::BrokerProxy &service_call_marshaller); void init() override; ~ServiceBridge(); @@ -50,23 +57,25 @@ public: void block_until_ready(); // these can be called from any thread, after block_until_ready() returns - api::orderman::Response create_order(api::orderman::Create const&c); - api::orderman::Response update_order(api::orderman::Update const&c); - api::orderman::Response cancel_order(api::orderman::Cancel const&c); - api::orderman::Response crack_order(api::orderman::Crack const&c); - void update_admin_data(std::shared_ptr const &admin); - + api::orderman::Response create_order(api::orderman::Create const &c); + api::orderman::Response update_order(api::orderman::Update const &c); + api::orderman::Response cancel_order(api::orderman::Cancel const &c); + api::orderman::Response crack_order(api::orderman::Crack const &c); + void + update_admin_data(std::shared_ptr const &admin); + private: struct PImpl; std::unique_ptr me; - bool is_ready () const; + bool is_ready() const; void maybe_signal_ready(bool old_ready); - - void on(mercury::Update const&); - void on(mercury::Update const&); - void on(mercury::Update const&); - void on(mercury::Update const&); - void on(mercury::Update const&); + + void on(mercury::Update const &); + void on(mercury::Update const &); + void on(mercury::Update const &); + void on(mercury::Update const &); + void on(mercury::Update const &); }; -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/NewAdminDataEvent.h b/src/lib/orderman/events/NewAdminDataEvent.h index a66ce201e..224d3f6eb 100644 --- a/src/lib/orderman/events/NewAdminDataEvent.h +++ b/src/lib/orderman/events/NewAdminDataEvent.h @@ -2,7 +2,7 @@ #include "lib/api/services/AdminService.pb.h" -#include "lib/mercury/mercury_utils/mercury_common.h" +#include "lib/mercury/common/mercury_common.h" #include "lib/mercury/events/Event.h" #include "lib/mercury/synopsis/CacheLast.h" diff --git a/src/lib/orderman/events/NewExecutionReportEvent.h b/src/lib/orderman/events/NewExecutionReportEvent.h index 615f57e95..c1971d4ce 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.h +++ b/src/lib/orderman/events/NewExecutionReportEvent.h @@ -1,32 +1,30 @@ #pragma once - #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/common.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/mercury/mercury_utils/mercury_common.h" -#include +#include "lib/mercury/common/mercury_common.h" #include "lib/mercury/events/Event.h" #include "lib/mercury/synopsis/CacheAll.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include #include namespace bts { namespace orderman { -class NewExecutionReportEvent : public mercury::Event -{ -public: +class NewExecutionReportEvent : public mercury::Event { + public: using Tag = GatewayName; using SynopsisPolicy = mercury::CacheAll; ExecutionReport const *data; PerfTrace trace; // used by ContentSubscription - OrderKey key() const {return data->order_key;} - NewExecutionReportEvent(const ExecutionReport*dt, PerfTrace const&trace) : data(dt),trace(trace) {}; + OrderKey key() const { return data->order_key; } + NewExecutionReportEvent(const ExecutionReport *dt, PerfTrace const &trace) + : data(dt), trace(trace){}; }; - -}} - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib/orderman/orderman_utils/ExecutionReport.h index 3f48e6355..d59ae607f 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib/orderman/orderman_utils/ExecutionReport.h @@ -2,7 +2,7 @@ #include #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/mercury/mercury_utils/mercury_common.h" +#include "lib/mercury/common/mercury_common.h" #include "lib/config/protos/jetfix.pb.h" namespace bts { diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 27b85caf6..6cd021f25 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -6,8 +6,7 @@ #include "lib/config/protos/orderman_cfg.pb.h" #include "lib/md/MDConsumer.h" #include "lib/mercury/actors/Timer.h" -#include "lib/mercury/broker/AsyncEventBroker.h" -#include "lib/mercury/mercury_utils/Executor.h" +#include "lib/mercury/executor/Executor.h" #include "lib/metrics/metrics.h" #include "lib/orderman/actors/AsyncFactory.h" #include "lib/orderman/actors/ExecutionGateway.h" @@ -27,8 +26,7 @@ namespace orderman { struct ActorThread { ActorThread(const config::OrdermanCfg::OrdermanThread &cfg,metrics::MetricsContainer &stats) - : cfg(cfg), thread(), event_broker(new mercury::AsyncEventBroker()), - executor(*event_broker), loop_metric(), done(false) { + : cfg(cfg), thread(), executor(), loop_metric(), done(false) { std::array buckets; auto i = 0; for (auto &b : buckets) @@ -78,7 +76,6 @@ struct ActorThread { config::OrdermanCfg::OrdermanThread cfg; std::thread thread; - std::shared_ptr event_broker; mercury::Executor executor; std::shared_ptr> loop_metric; std::atomic done; @@ -104,7 +101,7 @@ struct OrderServiceServer::PImpl { admin_service(ctx.locate()), md_consumer(ss), stats(stats) {} - std::shared_ptr service_bridge; + ServiceBridge* service_bridge; std::vector> actor_threads; @@ -128,7 +125,7 @@ OrderServiceServer::OrderServiceServer( me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); - me->service_bridge = std::make_shared( + me->service_bridge = new ServiceBridge( [this]() { me->service_ready = true; }, [this, &ctx](auto const &orders) { @@ -139,15 +136,15 @@ OrderServiceServer::OrderServiceServer( ctx.post([this, fill] { this->on_fills(fill); }); }); - std::vector all_brokers; + std::vector all_executors; for (auto const &thread_cfg : config::get().thread()) { auto at = std::make_unique(thread_cfg,stats); - all_brokers.push_back(at->event_broker); + all_executors.push_back(&at->executor); me->actor_threads.push_back(std::move(at)); } for (auto &t : me->actor_threads) - t->event_broker->init_neighbours(all_brokers); + t->executor.init_neighbours(all_executors); // MDSource auto thread = find_thread_for_actor("MDSource", me->actor_threads); diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index c498b1531..1c89fc6b4 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -3,7 +3,7 @@ #include #include "lib/api/services/OrderService.pb.h" #include "lib/api/services/OrderService.server.pb.h" -#include "lib/mercury/mercury_utils/IPollableActor.h" +#include "lib/mercury/actors/IPollableActor.h" namespace bts { namespace api { class ISyntheticSecurityService; } diff --git a/src/lib/orderman/tests/fat_wrapper_tests.cpp b/src/lib/orderman/tests/fat_wrapper_tests.cpp index 284ae6efb..0472ca363 100644 --- a/src/lib/orderman/tests/fat_wrapper_tests.cpp +++ b/src/lib/orderman/tests/fat_wrapper_tests.cpp @@ -1,4 +1,4 @@ -#include "lib/mercury/mercury_utils/FatWrapper.h" +#include "lib/mercury/common/FatWrapper.h" #include namespace bts { @@ -14,12 +14,12 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") SECTION("fat_wrapper_works_small") { - utils::FatWrapper <128> fw; + mercury::FatWrapper <128> fw; A a {"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); - utils::FatWrapper<128> fw2; + mercury::FatWrapper<128> fw2; fw2 = fw; REQUIRE(a == fw2.unwrap()); @@ -29,12 +29,12 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") SECTION("fat_wrapper_works_big") { - utils::FatWrapper <32> fw; + mercury::FatWrapper <32> fw; A a {"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); - utils::FatWrapper<32> fw2; + mercury::FatWrapper<32> fw2; fw2 = fw; REQUIRE(a == fw2.unwrap()); @@ -44,8 +44,8 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") SECTION("empty_can_be_copied") { - utils::FatWrapper <64> fw; - utils::FatWrapper <64> fw2; + mercury::FatWrapper <64> fw; + mercury::FatWrapper <64> fw2; fw2=fw; } } diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index f9e4821ac..1a7dd6b01 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -1,21 +1,22 @@ #include "Benchmark.h" #include "lib/api/services/OrderService.server.pb.h" +#include "lib/jetfix/jetfix.h" +#include "lib/md/PriceSize.h" +#include "lib/mercury/common/FatWrapper.h" +#include "lib/os/os.h" #include "lib/utils/PBUtils.h" #include "lib/utils/Puid.h" #include "lib/utils/SpinLock.h" +#include "lib/utils/TimeStamp.h" #include "lib/utils/Uuid.h" #include "server/sparkd/cmds/CmdRegistry.h" -#include "lib/jetfix/jetfix.h" -#include "lib/mercury/broker/CoreEventBroker.h" -#include "lib/mercury/mercury_utils/FatWrapper.h" -#include "lib/utils/TimeStamp.h" -#include "lib/md/PriceSize.h" -#include "lib/os/os.h" #include #include #include #include +#include + #include #include #include @@ -157,7 +158,7 @@ BENCHMARK(copy_perf_trace); // static void serialize_order(benchmark::State &state) { // auto order_state = // utils::pb::from_string(order_state_str); -// auto +// auto // auto order_state_cpy = order_state; // for (auto _ : state) { // order_state_cpy = order_state; @@ -173,23 +174,23 @@ static void serialize_update(benchmark::State &state) { std::string buffer; buffer.resize(update.ByteSize()); - + bts_assert(update.SerializeToArray(&buffer[0], buffer.size())); for (auto _ : state) { - update.SerializeWithCachedSizesToArray((unsigned char*) &buffer[0]); + update.SerializeWithCachedSizesToArray((unsigned char *)&buffer[0]); } } BENCHMARK(serialize_update); static void serialize_order(benchmark::State &state) { auto order_state = - utils::pb::from_string(order_state_str); + utils::pb::from_string(order_state_str); std::string buffer; buffer.resize(order_state.ByteSize()); bts_assert(order_state.SerializeToArray(&buffer[0], buffer.size())); - for (auto _ : state) { - order_state.SerializeWithCachedSizesToArray((unsigned char*) &buffer[0]); + for (auto _ : state) { + order_state.SerializeWithCachedSizesToArray((unsigned char *)&buffer[0]); } } BENCHMARK(serialize_order); @@ -417,42 +418,6 @@ int Benchmark::execute(std::vector const &args) { return 0; } -struct Notify { - mercury::EventBrokerID id; - mercury::SubID suid; - mercury::StreamID sid; - utils::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(1000000); @@ -465,7 +430,7 @@ static void boost_lockless_queue(benchmark::State &state) { BENCHMARK(boost_lockless_queue); static void tbb_concurrent_queue(benchmark::State &state) { - + using FreeList = tbb::concurrent_queue; FreeList queue; for (auto _ : state) { @@ -489,26 +454,16 @@ static void moody_camel_queue(benchmark::State &state) { BENCHMARK(moody_camel_queue); -static void moody_camel_fat_push(benchmark::State &state) { - using Msg = utils::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; +static void boost_spsc(benchmark::State &state) { + boost::lockfree::spsc_queue q(10000); + int i = 0; for (auto _ : state) { - queue.enqueue(fw); - Msg fw2; - benchmark::DoNotOptimize(queue.try_dequeue(fw2)); + q.push(++i); + benchmark::DoNotOptimize(q.pop(i)); } } -BENCHMARK(moody_camel_fat_push); +BENCHMARK(boost_spsc); static void boost_lockless_stack(benchmark::State &state) { using FreeList = boost::lockfree::stack; @@ -521,7 +476,7 @@ static void boost_lockless_stack(benchmark::State &state) { } BENCHMARK(boost_lockless_stack); -using Msg = utils::FatWrapper<80>; +using Msg = mercury::FatWrapper<80>; struct PPQueue { std::atomic_flag _mutex = ATOMIC_FLAG_INIT; std::vector v; @@ -546,130 +501,6 @@ struct PPQueue { } }; -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) { - utils::FatWrapper<128> fw; - using Action = std::function; - - T t; - for (auto _ : state) { - benchmark::DoNotOptimize( - fw.wrap_in_place([]() { 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) { - utils::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); - static void get_thread_id(benchmark::State &state) { for (auto _ : state) { auto tid = std::this_thread::get_id(); diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index 27ed51d1c..8aaca8f45 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -1,40 +1,39 @@ #include "QuickTest.h" #include "ICmd.h" + #include "lib/mercury/actors/PingPong.h" -#include "lib/mercury/broker/AsyncEventBroker.h" -#include "lib/mercury/mercury_utils/Executor.h" +#include "lib/mercury/executor/Executor.h" #include namespace bts { namespace cmd { -int QuickTest::execute(std::vector const &) { +void test_ping_pong_mercury2() +{ using namespace mercury; - auto br1 = std::make_shared(); - Executor executor1(*br1); - auto br2 = std::make_shared(); - Executor executor2(*br2); + Executor ex1; + Executor ex2; - auto v = std::vector{br1, br2}; - br1->init_neighbours(v); - br2->init_neighbours(v); - - executor1.spawn(); - executor2.spawn(); + ex1.init_neighbours(std::vector {&ex2}); + ex2.init_neighbours(std::vector {&ex1}); - auto t = std::thread([&executor2]() { - cpu_set_t cpuset; - CPU_ZERO(&cpuset); - CPU_SET(1, &cpuset); - pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset); + ex1.spawn(); + ex1.spawn(); + //ex2.spawn(); - while (true) - executor2.do_work(); - }); + // auto t = std::thread([&ex2]() { + // cpu_set_t cpuset; + // CPU_ZERO(&cpuset); + // CPU_SET(1, &cpuset); + // pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset); - bts::sleep_for(2s); + // while (true) + // ex2.do_work(); + // }); + + // bts::sleep_for(2s); cpu_set_t cpuset; CPU_ZERO(&cpuset); @@ -42,15 +41,20 @@ int QuickTest::execute(std::vector const &) { pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset); while (true) { - executor1.do_work(); + ex1.do_work(); } +} + + +int QuickTest::execute(std::vector const &) { + test_ping_pong_mercury2(); return 0; } std::string QuickTest::help() { return "This is a place holder to make it easy to quickly write discardable " - "test code"; + "test code"; } } // namespace cmd } // namespace bts