From 968be6a99aa71574444d0264eb130b37716bd6d9 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 2 Jun 2020 17:13:53 -0400 Subject: [PATCH] Added storage for sessions. Still missing parsing of exec reports. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/jetfix/store/session_name.cpp | 48 ------ src/lib/jetfix/store/session_name.h | 13 -- src/lib/jetfix/tests/store_tests.cpp | 43 ----- .../actors/GLBXiLink3ExecutionGateway.cpp | 35 ++-- .../actors/GLBXiLink3ExecutionGateway.h | 2 +- src/lib/orderman/actors/ilink3/ILinkGW.h | 2 + src/lib/orderman/actors/ilink3/RawMsg.h | 11 ++ .../orderman/actors/ilink3/SessionManager.cpp | 17 -- .../orderman/actors/ilink3/SessionManager.h | 22 --- .../orderman/actors/ilink3/SessionStore.cpp | 162 ++++++++++++++++++ src/lib/orderman/actors/ilink3/SessionStore.h | 33 ++++ .../actors/ilink3/test/ILinkGWTests.cpp | 12 +- src/server/sparkd/cmds/CMECertCmd.cpp | 4 +- 14 files changed, 243 insertions(+), 163 deletions(-) create mode 100644 src/lib/orderman/actors/ilink3/RawMsg.h delete mode 100644 src/lib/orderman/actors/ilink3/SessionManager.cpp delete mode 100644 src/lib/orderman/actors/ilink3/SessionManager.h create mode 100644 src/lib/orderman/actors/ilink3/SessionStore.cpp create mode 100644 src/lib/orderman/actors/ilink3/SessionStore.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 02648172c..16c4609a8 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/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.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/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/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.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/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.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/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/GLBXiLink3ExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/ilink3/IL3ConnectionHandler.cpp;orderman/actors/ilink3/IL3ExecutionReportParser.cpp;orderman/actors/ilink3/IL3Reactor.cpp;orderman/actors/ilink3/ILink3ExecutionGateway.cpp;orderman/actors/ilink3/ILink3Utils.cpp;orderman/actors/ilink3/ILinkGW.cpp;orderman/actors/ilink3/SessionManager.cpp;orderman/actors/ilink3/test/ILinkGWTests.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.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/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.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/HedgerManager.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/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.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;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.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/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/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.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/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.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/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/GLBXiLink3ExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/ilink3/IL3ConnectionHandler.cpp;orderman/actors/ilink3/IL3ExecutionReportParser.cpp;orderman/actors/ilink3/IL3Reactor.cpp;orderman/actors/ilink3/ILink3ExecutionGateway.cpp;orderman/actors/ilink3/ILink3Utils.cpp;orderman/actors/ilink3/ILinkGW.cpp;orderman/actors/ilink3/SessionStore.cpp;orderman/actors/ilink3/test/ILinkGWTests.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.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/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.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/HedgerManager.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/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.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;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/jetfix/store/session_name.cpp b/src/lib/jetfix/store/session_name.cpp index 12dee897c..5542d41f7 100644 --- a/src/lib/jetfix/store/session_name.cpp +++ b/src/lib/jetfix/store/session_name.cpp @@ -133,54 +133,6 @@ std::string session_name (config::JetFIX::Connection const &session_cfg) parse_time (session_cfg.start_time ()), parse_time (session_cfg.end_time ())); } - - -datetime::PTime session_ptime (datetime::PTime const &ref_date, - boost::posix_time::time_duration time_of_day_start, - boost::posix_time::time_duration time_of_day_end) -{ - if (in_session (ref_date,time_of_day_start,time_of_day_end)) { - auto start_of_session = ref_date; - if (time_of_day_start > time_of_day_end && - start_of_session.time_of_day () <= time_of_day_end) - start_of_session -= boost::gregorian::date_duration (1); - start_of_session.time_of_day() = {}; - return start_of_session; - } - else - return {}; -} - -datetime::PTime session_ptime (datetime::PTime const &ref_date, - boost::gregorian::greg_weekday weekday_start, - boost::posix_time::time_duration time_of_day_start, - boost::gregorian::greg_weekday weekday_end, - boost::posix_time::time_duration time_of_day_end) -{ - if (in_session (ref_date,weekday_start,time_of_day_start,weekday_end,time_of_day_end)) - return session_ptime (closest_before (ref_date,weekday_start,time_of_day_start), - boost::posix_time::time_duration(0, 0, 0), - boost::posix_time::time_duration(0, 0, 1)); - else - return {}; -} - -datetime::PTime session_ptime (config::JetFIX::Connection const &session_cfg) { - auto now = datetime::local_now (); - - if (session_cfg.has_start_day ()) { - bts_assert (session_cfg.has_end_day ()); - return session_ptime (now, - parse_weekday (session_cfg.start_day ()), - parse_time (session_cfg.start_time ()), - parse_weekday (session_cfg.end_day ()), - parse_time (session_cfg.end_time ())); - } else - return session_ptime (now, - parse_time (session_cfg.start_time ()), - parse_time (session_cfg.end_time ())); -} - }} diff --git a/src/lib/jetfix/store/session_name.h b/src/lib/jetfix/store/session_name.h index abf4d53a0..e17bd46a3 100644 --- a/src/lib/jetfix/store/session_name.h +++ b/src/lib/jetfix/store/session_name.h @@ -46,18 +46,5 @@ std::string session_name(datetime::PTime const &ref_date, boost::posix_time::time_duration time_of_day_end); std::string session_name(config::JetFIX::Connection const &session_cfg); -// PTime of the start of a session. This will always be midnight of the day -// the session started regardless of the exact start time. -datetime::PTime -session_ptime(datetime::PTime const &ref_date, - boost::gregorian::greg_weekday weekday_start, - boost::posix_time::time_duration time_of_day_start, - boost::gregorian::greg_weekday weekday_end, - boost::posix_time::time_duration time_of_day_end); -datetime::PTime session_ptime(datetime::PTime const &ref_date, - boost::posix_time::time_duration time_of_day_start, - boost::posix_time::time_duration time_of_day_end); -datetime::PTime session_ptime(config::JetFIX::Connection const &session_cfg); - } // namespace jetfix } // namespace bts diff --git a/src/lib/jetfix/tests/store_tests.cpp b/src/lib/jetfix/tests/store_tests.cpp index 2ae16d76c..58095f3ac 100644 --- a/src/lib/jetfix/tests/store_tests.cpp +++ b/src/lib/jetfix/tests/store_tests.cpp @@ -128,49 +128,6 @@ TEST_CASE("JetFIX SessionNameTests", "[jetfix]") { boost::posix_time::time_duration(17, 50, 59), boost::posix_time::time_duration(17, 45, 59)) == ""); } - - SECTION("session_ptime_works") { - REQUIRE(session_ptime(datetime::make_ptime(2015, 7, 17, 17, 0, 0, 0), - boost::gregorian::Sunday, - boost::posix_time::time_duration(16, 59, 59), - - boost::gregorian::Friday, - boost::posix_time::time_duration(17, 0, 1)) == - datetime::make_ptime(2015, 07, 12)); - - REQUIRE(session_ptime(datetime::make_ptime(2015, 7, 17, 17, 0, 0, 0), - boost::gregorian::Sunday, - boost::posix_time::time_duration(16, 59, 59), - - boost::gregorian::Friday, - boost::posix_time::time_duration(16, 59, 59)) == - datetime::PTime{}); - - REQUIRE(session_ptime(datetime::make_ptime(2015, 7, 17, 17, 0, 0, 0), - boost::posix_time::time_duration(16, 59, 59), - boost::posix_time::time_duration(17, 59, 59)) == - datetime::make_ptime(2015, 07, 17)); - - REQUIRE(session_ptime(datetime::make_ptime(2015, 7, 17, 18, 0, 0, 0), - boost::posix_time::time_duration(16, 59, 59), - boost::posix_time::time_duration(17, 59, 59)) == - datetime::PTime{}); - - REQUIRE(session_ptime(datetime::make_ptime(2015, 7, 17, 17, 0, 0, 0), - boost::posix_time::time_duration(17, 50, 59), - boost::posix_time::time_duration(17, 45, 59)) == - datetime::make_ptime(2015, 07, 16)); - - REQUIRE(session_ptime(datetime::make_ptime(2015, 7, 17, 17, 51, 0, 0), - boost::posix_time::time_duration(17, 50, 59), - boost::posix_time::time_duration(17, 45, 59)) == - datetime::make_ptime(2015, 07, 17)); - - REQUIRE(session_ptime(datetime::make_ptime(2015, 7, 17, 17, 47, 0, 0), - boost::posix_time::time_duration(17, 50, 59), - boost::posix_time::time_duration(17, 45, 59)) == - datetime::PTime{}); - } } TEST_CASE("JetFIX FileStoreTests", "[jetfix]") { diff --git a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp b/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp index 187ca0de0..23c98009f 100644 --- a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp +++ b/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp @@ -6,9 +6,10 @@ #include "lib/orderman/actors/GLBXExecutionGateway.h" #include "lib/orderman/actors/ilink3/IL3Reactor.h" #include "lib/orderman/actors/ilink3/ILinkGW.h" -#include "lib/orderman/actors/ilink3/SessionManager.h" +#include "lib/orderman/actors/ilink3/SessionStore.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" +#include "lib/jetfix/store/session_name.h" namespace bts { namespace orderman { @@ -28,7 +29,7 @@ struct GLBXiLink3ExecutionGateway::PImpl { : state(), cfg(cfg), reactor(), start_of_pause(), on_exe_report(), on_gw_status_change(), on_cancel_reject(), perf_log(log), sec_oracle(o), securities(), securities_by_descriptor(), - gw_name(cfg.name()), session_manager(cfg.name()), gw(), + gw_name(cfg.name()), session_store(), gw(), connection(nullptr), connection_failures(0) { TCPEndpoint endpoint{cfg.socket_connect_host_ip(), (ushort)cfg.socket_connect_port()}; @@ -49,7 +50,7 @@ struct GLBXiLink3ExecutionGateway::PImpl { std::unordered_map securities_by_descriptor; GatewayName gw_name; - SessionManager session_manager; + std::optional session_store; std::optional gw; IL3Connection *connection; size_t connection_failures; @@ -106,8 +107,8 @@ void GLBXiLink3ExecutionGateway::on_time() { // At this point we are no longer in the pause window and we have // not exceed our connection failure limit. Are we within the // exchange's active session? - auto current_session = me->session_manager.get_current(); - if (!current_session) { + auto current_session = jetfix::session_name(me->cfg); + if (current_session.empty()) { LOG(OrderMan, Info, "Outside of session in ", me->gw_name.value()); return; } @@ -115,20 +116,34 @@ void GLBXiLink3ExecutionGateway::on_time() { connect(current_session); } -void GLBXiLink3ExecutionGateway::connect(Session const &s) { +void GLBXiLink3ExecutionGateway::connect(std::string const&session_name) { bts_assert(me->state == State::PAUSED); transition(State::CONNECTING); Config c; - me->gw.emplace(*me->connection, s, c); + c.cme_session = me->cfg.sender_compid().substr(0,3); + c.firm = me->cfg.sender_compid().substr(3); + c.failover_on_disconnect = false; + + me->session_store.emplace(session_name, me->cfg); + me->gw.emplace(*me->connection, me->session_store->starting_session_descriptor(), c); me->gw->subscribe_cancel_reject( - [this](auto k, auto const &msg) { me->on_cancel_reject(k, msg); }); + [this](auto k, auto const &msg) { + bts_assert(me->state == State::READY); + me->on_cancel_reject(k, msg); + }); me->gw->subscribe_execution_reports( - [this](auto er) { me->on_exe_report(*er, {}); }); + [this](auto er) { + bts_assert(me->state == State::READY); + me->on_exe_report(*er, {}); + }); me->gw->subscribe_session( - [this](auto const &s) { me->session_manager.store_current(s); }); + [this](auto const &s) { + bts_assert(me->state == State::READY); + me->session_store->async_update_session(s); + }); me->gw->subscribe_state([this](auto gw_state) { LOG(OrderMan, Info, diff --git a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.h b/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.h index c751cf3b7..17d42520f 100644 --- a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.h +++ b/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.h @@ -39,7 +39,7 @@ private: void transition(State); void pause(); - void connect(const Session&); + void connect(std::string const& session_nam); }; } // namespace orderman diff --git a/src/lib/orderman/actors/ilink3/ILinkGW.h b/src/lib/orderman/actors/ilink3/ILinkGW.h index a89a133a7..2b4f0dd36 100644 --- a/src/lib/orderman/actors/ilink3/ILinkGW.h +++ b/src/lib/orderman/actors/ilink3/ILinkGW.h @@ -13,6 +13,7 @@ #include "generated/MessageHeader.h" #include "IL3GeneratedFwd.h" #include "IL3ExecutionReportParser.h" +#include "lib/orderman/actors/ilink3/RawMsg.h" namespace bts { namespace orderman { @@ -42,6 +43,7 @@ struct Config { std::string cme_session; // NGG std::string firm; // 004 bool failover_on_disconnect; + std::function raw_message_logger; }; enum class State { diff --git a/src/lib/orderman/actors/ilink3/RawMsg.h b/src/lib/orderman/actors/ilink3/RawMsg.h new file mode 100644 index 000000000..ed7d610ed --- /dev/null +++ b/src/lib/orderman/actors/ilink3/RawMsg.h @@ -0,0 +1,11 @@ +#pragma once + +#include +#include + +namespace bts { +namespace orderman { +namespace ilink3 { +enum class RawMessageDirection {INCOMING, OUTGOING}; +using RawMsg = std::function; +}}} diff --git a/src/lib/orderman/actors/ilink3/SessionManager.cpp b/src/lib/orderman/actors/ilink3/SessionManager.cpp deleted file mode 100644 index 4d61ab3ff..000000000 --- a/src/lib/orderman/actors/ilink3/SessionManager.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "SessionManager.h" -#include "lib/orderman/actors/ilink3/ILinkGW.h" - - -namespace bts { -namespace orderman { -namespace ilink3 { - -struct SessionManager::PImpl {} ; - -SessionManager::SessionManager(std::string const&) : me (new PImpl()) {} -SessionManager::~SessionManager() = default; - -Session SessionManager::get_current() const { return {};} -void SessionManager::store_current(Session const&) {} - -}}} diff --git a/src/lib/orderman/actors/ilink3/SessionManager.h b/src/lib/orderman/actors/ilink3/SessionManager.h deleted file mode 100644 index e17ccae13..000000000 --- a/src/lib/orderman/actors/ilink3/SessionManager.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once -#include - -namespace bts { -namespace orderman { -namespace ilink3 { - -struct Session; - -class SessionManager { -public: - SessionManager(std::string const&) ; - ~SessionManager() ; - - Session get_current() const ; - void store_current(Session const&) ; -private: - struct PImpl; - std::unique_ptr me; -}; - -}}} diff --git a/src/lib/orderman/actors/ilink3/SessionStore.cpp b/src/lib/orderman/actors/ilink3/SessionStore.cpp new file mode 100644 index 000000000..5e4e4d8bb --- /dev/null +++ b/src/lib/orderman/actors/ilink3/SessionStore.cpp @@ -0,0 +1,162 @@ +#include "SessionStore.h" +#include "lib/orderman/actors/ilink3/ILinkGW.h" +#include "lib/orderman/orderman_utils/ExecutionReport.h" +#include "lib/utils/bts_chrono.h" +#include "lib/utils/file_utils.h" +#include "lib/utils/thread_manager.h" + +#include +#include +#include + +namespace bts { +namespace orderman { +namespace ilink3 { + +using Action = std::function; + +static std::string base_store_path(std::string base_path, + std::string const &connection_name, + std::string const &session_name) { + if (base_path.empty()) + base_path = os::bts_data_path(); + boost::filesystem::path result = utils::normalize_data_path(base_path); + result /= "link3"; + result /= connection_name; + result /= session_name; + if (!boost::filesystem::exists(result)) + bts_assert(boost::filesystem::create_directories(result)); + return result.string(); +} + +static std::string raw_msg_log_path(std::string const &store_path) { + boost::filesystem::path result = store_path; + result /= "raw_msgs"; + return result.string(); +} + +static std::string session_path(std::string const &store_path) { + boost::filesystem::path result = store_path; + result /= "session"; + return result.string(); +} + +static std::vector load_replay( + config::JetFIX::Connection const &cfg, std::string const &path) { + std::vector result; + if (boost::filesystem::exists(path)) { + std::ifstream f(path); + std::string line_buffer; + line_buffer.reserve(10 * 1024); + std::string date_buffer("20150427-19:05:17.032"); + + for (;;) { + std::getline(f, line_buffer); + if (!f.eof()) { + if (line_buffer[22] == '<') { + auto ts = + datetime::parse_FIX_timestamp(line_buffer.substr(0, 21)); + if (!datetime::is_at_least_secs_old(ts, + cfg.seconds_to_replay())) { + // figure out if its an execution report and if so + // load it + } + } + } else + break; + } + } + return result; +} + +static void save_raw_msg(std::ofstream &out, RawMessageDirection d, std::string const&msg) { + out << datetime::FIX_timestamp(datetime::now()) << " " + << (d == RawMessageDirection::OUTGOING? ">" : "<") << " "; + out.write(msg.data(), msg.size()); + out << std::endl; +} + +void save_session(std::string const &path, Session const &session) { + std::ofstream f(path); + f << session.uuid << session.to_cme << session.from_cme; +} + +Session load_session(std::string const &path) { + auto result = Session::none(); + if (boost::filesystem::exists(path)) { + Session result; + std::ifstream f(path); + f >> result.uuid >> result.to_cme >> result.from_cme; + } + return result; +} + +struct SessionStore::PImpl { + PImpl(std::string const &session_name, config::JetFIX::Connection const &cfg, + std::string const &base_path) + : cfg(cfg), + store_path(base_store_path(base_path, cfg.name(), session_name)), + replay_messages(load_replay(cfg, raw_msg_log_path(store_path))), + starting_session_descriptor(load_session(session_path(store_path))), + raw_msg_store() + { + raw_msg_store.open(raw_msg_log_path(store_path), std::ofstream::app); + } + + + const config::JetFIX::Connection cfg; + const std::string store_path; + const std::vector replay_messages; + const Session starting_session_descriptor; + std::atomic done = false; + tbb::concurrent_queue event_queue; + std::thread storage_thread; + std::ofstream raw_msg_store; +}; + +SessionStore::SessionStore(std::string const &session_name, + config::JetFIX::Connection const &cfg, + std::string base_path) + : me(new PImpl(session_name,cfg, base_path)) { + me->storage_thread = threading::make_thread_from_function( + "il3_store", [this]() { do_work(); }); +} + +std::vector const &SessionStore::replay() const { + return me->replay_messages; +} + +Session SessionStore::starting_session_descriptor() const { + return me->starting_session_descriptor; +} + +void SessionStore::async_update_session(Session const&s) { + me->event_queue.push(Action {[this,s]() { + save_session(me->store_path,s); + }}); +} + +void SessionStore::async_store_raw_msg(RawMessageDirection d, RawMsg const&ms) { + me->event_queue.push(Action {[this,d,ms]() { + save_raw_msg(me->raw_msg_store,d,ms()); + }}); +} + +void SessionStore::do_work() { + while (!me->done) { + Action a; + if (me->event_queue.try_pop(a)) + a(); + else + std::this_thread::sleep_for(100ms); + } +} + +SessionStore::~SessionStore() { + me->done = true; + me->storage_thread.join(); +} + +} // namespace ilink3 +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/ilink3/SessionStore.h b/src/lib/orderman/actors/ilink3/SessionStore.h new file mode 100644 index 000000000..651e9f824 --- /dev/null +++ b/src/lib/orderman/actors/ilink3/SessionStore.h @@ -0,0 +1,33 @@ +#pragma once + +#include +#include +#include +#include "lib/config/protos/jetfix.pb.h" +#include "RawMsg.h" + +namespace bts { +namespace orderman { +class ExecutionReport; +namespace ilink3 { + +struct Session; +class SessionStore { +public: + SessionStore(std::string const&session_name, + config::JetFIX::Connection const&, + std::string base_path=""); + ~SessionStore() ; + + Session starting_session_descriptor() const; + std::vector const &replay() const; + + void async_update_session(Session const&) ; + void async_store_raw_msg(RawMessageDirection, RawMsg const&); +private: + void do_work(); + struct PImpl; + std::unique_ptr me; +}; + +}}} diff --git a/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp b/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp index fa6fcc1d2..170ab4831 100644 --- a/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp +++ b/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp @@ -221,7 +221,7 @@ TEST_CASE("EstablishExistingSession", "[ilink3]") { Session session = Session::create(); // Set the exchange to know about our session exchange.session = session.uuid; - Config config { Session::none(), "NGG", "004", false }; + Config config { Session::none(), "NGG", "004", false , {}}; ILinkGW gw { connection, session, config }; gw.connect(); exchange.do_work(); @@ -257,7 +257,7 @@ TEST_CASE("BeginningOfWeekLogon", "[ilink3][cert]") { auto& connection = exchange.connect(); // New session starts at 1 Session session = Session::none(); - Config config { Session::none(), "NGG", "004", false }; + Config config { Session::none(), "NGG", "004", false,{} }; ILinkGW gw { connection, session, config }; gw.subscribe_session([&](auto&s) { session = s; }); @@ -275,7 +275,7 @@ TEST_CASE("PrimaryGatewayConnectionEnforcement", "[ilink3][il3cert]") { Session session = Session::create(); exchange.session = session.uuid; exchange.config.reject_establish_on_primary = true; - Config config { Session::none(), "NGG", "004", true }; + Config config { Session::none(), "NGG", "004", true, {} }; ILinkGW gw { connection, session, config }; gw.connect(); exchange.do_work(); @@ -300,7 +300,7 @@ TEST_CASE("Re-SettingUUID", "[ilink3][il3cert]") { // Existing session starts >1. Will attempt to establish { Session session { 1234, /*out*/ 5, /*in*/ 17 }; - Config config { Session::none(), "NGG", "004", false }; + Config config { Session::none(), "NGG", "004", false, {} }; ILinkGW gw { connection, session, config }; gw.connect(); exchange.do_work(); @@ -309,7 +309,7 @@ TEST_CASE("Re-SettingUUID", "[ilink3][il3cert]") { } Session session = Session::none(); - Config config { Session::none(), "NGG", "004", false }; + Config config { Session::none(), "NGG", "004", false, {} }; ILinkGW gw { connection, session, config }; // send establish gw.connect(); @@ -356,7 +356,7 @@ TEST_CASE("OutrightVanillaOrder", "[ilink3][execution]") { auto& connection = exchange.connect(); // New session starts at 1 Session session = Session::none(); - Config config { Session::none(), "NGG", "004", false }; + Config config { Session::none(), "NGG", "004", false, {} }; ILinkGW gw { connection, session, config }; gw.subscribe_session([&](auto&s) { session = s; }); diff --git a/src/server/sparkd/cmds/CMECertCmd.cpp b/src/server/sparkd/cmds/CMECertCmd.cpp index a1fbee96d..daa7d2b2c 100644 --- a/src/server/sparkd/cmds/CMECertCmd.cpp +++ b/src/server/sparkd/cmds/CMECertCmd.cpp @@ -196,7 +196,7 @@ int CMECert::execute(const std::vector&) { // Typically a timestamp SessionSaver ss; ss.load(); - Config config { Session::none(), "NGG", "004", false }; + Config config { Session::none(), "NGG", "004", false, {} }; Reactor reactor; auto& connection = reactor.register_connection({ // local dev @@ -300,4 +300,4 @@ std::string CMECert::help() { ////////////////////////////////////////// // This code worked once ////////////////////////////////////////// -}}//namespace \ No newline at end of file +}}//namespace