From 096787d7102b8b22a866b925e75b224f48f6ecf3 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 5 Dec 2018 16:50:48 -0500 Subject: [PATCH] Merge --- CMakeLists.txt | 3 +- doc/dev/dev_process.md | 71 -- doc/user/docs/release_notes.md | 11 +- .../api/service_helpers/AdminServiceUtils.cpp | 1 - src/lib/jetfix/codec/FIXMsg.h | 8 +- src/lib/jetfix/common/InMsgBuffer.h | 8 +- src/lib/jetfix/connection/AsyncReader.cpp | 14 +- src/lib/jetfix/connection/AsyncReader.h | 2 - src/lib/jetfix/connection/IConnection.h | 4 +- .../jetfix/connection/SocketConnection.cpp | 66 +- src/lib/jetfix/connection/SocketConnection.h | 8 +- src/lib/jetfix/gateway/CoreGateway.cpp | 58 +- src/lib/jetfix/gateway/CoreGateway.h | 6 +- src/lib/jetfix/gateway/JetFIXGateway.h | 15 +- src/lib/jetfix/gateway/Session.cpp | 12 +- src/lib/jetfix/gateway/Session.h | 5 +- src/lib/jetfix/tests/async_reader_tests.cpp | 8 +- src/lib/mercury/actors/Actor.h | 10 - src/lib/mercury/actors/ContentSubscription.h | 12 +- src/lib/orderman/actors/AsyncFactory.cpp | 104 +-- src/lib/orderman/actors/ExecutionGateway.cpp | 90 +- src/lib/orderman/actors/ExecutionGateway.h | 61 +- src/lib/orderman/actors/FillStore.cpp | 15 +- src/lib/orderman/actors/MDSource.h | 16 +- .../orderman/actors/MDSupplementarySource.cpp | 67 +- src/lib/orderman/actors/SODPosition.cpp | 223 +++-- src/lib/orderman/actors/SecuritySrc.cpp | 25 +- src/lib/orderman/actors/ServiceBridge.cpp | 12 +- src/lib/orderman/actors/ServiceBridge.h | 4 +- .../actors/order_manager/ChildOrder.h | 92 +- .../actors/order_manager/OrderBuilder.cpp | 4 +- .../actors/order_manager/OrderBuilder.h | 111 +-- .../actors/order_manager/OrderManager.cpp | 228 ++--- .../actors/order_manager/OrderManager.h | 52 +- .../actors/order_manager/OrderServices.h | 283 ++----- .../order_manager/OrderServicesData.cpp | 15 +- .../actors/order_manager/OrderServicesData.h | 54 +- src/lib/orderman/events/ActivateOrderEvent.h | 5 +- src/lib/orderman/events/BookUpdateEvent.h | 5 +- src/lib/orderman/events/CancelOrderEvent.h | 5 +- src/lib/orderman/events/CancelRejectEvent.cpp | 5 +- src/lib/orderman/events/CrackOrderEvent.h | 5 +- .../events/NewExecutionReportEvent.cpp | 6 +- .../orderman/events/NewExecutionReportEvent.h | 6 +- .../orderman/events/OrderStateUpdateEvent.h | 9 +- src/lib/orderman/events/OutFIXMsgEvent.h | 32 + src/lib/orderman/events/UpdateOrderEvent.h | 5 +- src/lib/orderman/limiter/LimitStore.cpp | 112 ++- src/lib/orderman/limiter/Limiter.cpp | 137 +-- src/lib/orderman/limiter/ProductLimitNode.cpp | 33 +- src/lib/orderman/limiter/ProductLimitTree.cpp | 40 +- .../orderman/limiter/SecurityLimitNode.cpp | 32 +- .../orderman/limiter/SecurityLimitTree.cpp | 38 +- .../orderman/limiter/tests/limit_tests.cpp | 217 ++--- .../order_factory/DynamicOrderRegistry.cpp | 1 + .../orderman/order_factory/OrderFactory.cpp | 4 +- src/lib/orderman/order_router/OrderRouter.cpp | 4 +- src/lib/orderman/orderman_utils/EventStream.h | 33 +- src/lib/orderman/orders/DynamicOrder.cpp | 8 +- src/lib/orderman/orders/DynamicOrder.h | 8 +- src/lib/orderman/orders/IcebergOrder.cpp | 20 +- src/lib/orderman/orders/IcebergOrder.h | 8 +- src/lib/orderman/orders/NativeOrder.cpp | 63 +- src/lib/orderman/orders/NativeOrder.h | 12 +- src/lib/orderman/orders/Order.cpp | 19 +- src/lib/orderman/orders/Order.h | 15 +- src/lib/orderman/orders/TimeBoxOrder.cpp | 85 +- src/lib/orderman/orders/TimeBoxOrder.h | 8 +- src/lib/orderman/orders/TriggerOrder.cpp | 787 +++++++++--------- src/lib/orderman/orders/TriggerOrder.h | 8 +- .../orderman/orders/book_algos/BookAlgo.cpp | 326 ++++---- src/lib/orderman/orders/book_algos/BookAlgo.h | 8 +- .../orderman/orders/book_algos/CoverOrder.cpp | 114 +-- .../orderman/orders/book_algos/JoinOrder.cpp | 148 ++-- .../orderman/orders/book_algos/LeanOrder.cpp | 287 ++++--- .../orders/book_algos/OffsetOrder.cpp | 105 +-- .../orderman/orders/book_algos/TickOrder.cpp | 234 +++--- .../orderman/orders/book_algos/TopOrder.cpp | 175 ++-- .../spreader_orders/ISpreaderStateWorker.h | 4 +- .../orders/spreader_orders/SpreaderOrder.cpp | 29 +- .../orders/spreader_orders/SpreaderOrder.h | 14 +- .../spreader/SingleFillHedger.cpp | 4 +- .../spreader/SingleFillHedger.h | 6 +- .../spreader/SingleLegQuoter.cpp | 2 +- .../spreader/SingleLegQuoter.h | 6 +- .../spreader/SpreaderBookkeepingData.cpp | 4 +- .../spreader/SpreaderBookkeepingData.h | 2 +- .../spreader/SpreaderChildOrderState.h | 9 +- .../spreader/hedger/IHedgerStateWorker.h | 3 +- .../hedger_states/HedgerEndStateWorker.cpp | 2 +- .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 2 +- .../hedger_states/HedgerStartStateWorker.h | 2 +- .../HedgerWaitingForCancelAckStateWorker.cpp | 2 +- .../HedgerWaitingForCancelAckStateWorker.h | 2 +- ...WaitingForFirstAckCancelledStateWorker.cpp | 2 +- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 2 +- .../HedgerWaitingForFirstAckStateWorker.h | 2 +- .../HedgerWorkingStateWorker.cpp | 2 +- .../hedger_states/HedgerWorkingStateWorker.h | 2 +- .../spreader/quoter/IQuoterStateWorker.h | 2 +- .../quoter_states/QuoterEndStateWorker.cpp | 2 +- .../quoter_states/QuoterEndStateWorker.h | 2 +- .../quoter_states/QuoterStartStateWorker.cpp | 2 +- .../quoter_states/QuoterStartStateWorker.h | 2 +- .../QuoterWaitingForCancelAckStateWorker.cpp | 2 +- .../QuoterWaitingForCancelAckStateWorker.h | 2 +- ...uoterWaitingForFirstAckCancelledWorker.cpp | 2 +- .../QuoterWaitingForFirstAckCancelledWorker.h | 2 +- .../QuoterWaitingForFirstAckWorker.cpp | 2 +- .../QuoterWaitingForFirstAckWorker.h | 2 +- .../QuoterWaitingForIOCWorker.cpp | 2 +- .../quoter_states/QuoterWaitingForIOCWorker.h | 2 +- .../QuoterWaitingForSizeStateWorker.cpp | 6 +- .../QuoterWaitingForSizeStateWorker.h | 4 +- .../QuoterWorkingStateWorker.cpp | 8 +- .../quoter_states/QuoterWorkingStateWorker.h | 6 +- .../SpreaderEndStateWorker.cpp | 4 +- .../spreader_states/SpreaderEndStateWorker.h | 4 +- .../SpreaderStartStateWorker.cpp | 20 +- .../SpreaderStartStateWorker.h | 4 +- ...SpreaderWaitingForCancelAllStateWorker.cpp | 4 +- .../SpreaderWaitingForCancelAllStateWorker.h | 4 +- ...readerWaitingForInitialDataStateWorker.cpp | 4 +- ...SpreaderWaitingForInitialDataStateWorker.h | 6 +- .../SpreaderWorkingStateWorker.cpp | 4 +- .../SpreaderWorkingStateWorker.h | 4 +- .../spreader_orders/tests/spreader_tests.cpp | 60 +- .../spreader_orders/tests/tests_common.h | 8 +- .../orderman/server/OrderServiceServer.cpp | 38 +- src/lib/orderman/server/OrderServiceServer.h | 4 +- src/lib/orderman/tests/fat_wrapper_tests.cpp | 35 +- src/lib/orderman2/IOrderManagerObserver.h | 28 + src/lib/orderman2/OrderManager2.cpp | 7 + src/lib/orderman2/OrderManager2.h | 37 + src/lib/orderman2/orders/NativeOrder.cpp | 2 - src/lib/orderman2/orders/NativeOrder.h | 57 -- src/lib/orderman2/orders/Order.cpp | 2 - src/lib/orderman2/orders/Order.h | 70 -- src/sdk/examples/order_plugin_example.cpp | 20 +- src/sdk/sdk_shell.sh | 1 + src/server/sparkd/cmds/Benchmark.cpp | 20 +- src/server/sparkd/cmds/QuickTest.cpp | 22 +- src/server/sparkd/cmds/Run.cpp | 29 +- src/server/sparkd/cmds/Web.cpp | 4 +- src/server/sparkd/http/WebServer.cpp | 14 +- src/server/sparkd/http/WebServer.h | 4 +- 148 files changed, 2782 insertions(+), 2845 deletions(-) delete mode 100644 doc/dev/dev_process.md create mode 100644 src/lib/orderman/events/OutFIXMsgEvent.h create mode 100644 src/lib/orderman2/IOrderManagerObserver.h create mode 100644 src/lib/orderman2/OrderManager2.cpp create mode 100644 src/lib/orderman2/OrderManager2.h delete mode 100644 src/lib/orderman2/orders/NativeOrder.cpp delete mode 100644 src/lib/orderman2/orders/NativeOrder.h delete mode 100644 src/lib/orderman2/orders/Order.cpp delete mode 100644 src/lib/orderman2/orders/Order.h diff --git a/CMakeLists.txt b/CMakeLists.txt index a4395bfcf..b497a3092 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,9 +39,8 @@ else () set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ -fPIC -Wall -pedantic -Wextra -Werror \ -Wno-missing-braces -Wno-ignored-qualifiers \ - --std=c++17 -fdiagnostics-color") + --std=c++17 -fdiagnostics-color -Wl,--no-undefined") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3") - set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef") add_subdirectory(src/server/sparkd) add_subdirectory(src/lib) add_subdirectory(src/web) diff --git a/doc/dev/dev_process.md b/doc/dev/dev_process.md deleted file mode 100644 index 20e02e94d..000000000 --- a/doc/dev/dev_process.md +++ /dev/null @@ -1,71 +0,0 @@ -# The BTS Development Process # - -## The Big Picture ## - -Our development work is organized in projects. A project is an effort -to specifiy, develop and validate a related set of additions to our -Spark platform. A project can be assigned to one more developers and a -developer might concurrently be assigned to multiple -projects. Projects typically start out with specification work, -proceed to implementation and finish with validation efforts. At any -given time there will be multiple projects being worked on -concurrently. A project is concluded when the features it implements -are merged into the product and deployed to customers. - -## The Details ## -Typically project ideas come from sales interactions, opposition -research and customer feedback, alltough on occasion development or -operational requirements will also suggest potentially valuable -ideas. Whatever the source of a project idea the final decision of -which projects to pursue is always done by management. Once a project -idea has been selected for implementation the corresponding project -will go through several phases: inception, specification, development -and merge. We detail each of these phases below. - -* Inception. In this phase we create the infrastructure for the -project. Typically this means selecting a team, creating a project -case in Jira (that is a case assigned to the team@bluetradesys.com -Jira user) and possibly creating a new branch for the project. This -phase is mostly mechanical and the responsibility of Pedro. - -* Specification. The specification phase turns a usually vague and -ill-considered idea project idea into a concrete, implementable -specification that attempts to maximize the value/cost ratio of the -project. It is hard to exaggerate the impact of a this phase on the -rest of the project. *Nothing* has more impact on our ability to -quickly deliver value to customers than good specification -work. Specification typically take the form of shared google docs, -using a mix of text and UI mockups to capture both user requirements -and suggested implementation strategies. Taha is responsible for this -phase. - -* Development. Once a specification is complete, a team of developers -will use a project specific branch to implement the -specification. Periodically, typically once a week, progress on the -project is assessed by Pedro, possibly with the help of others. This -assessment takes the form of code reviews, demos, or just one-on-one -conversations. To ensure development does not go off on sub-optimal -tangents, developers are expected to continuously merge master into -the project branch as well as encouraged to create Pull Requests (PRs) -early in the project implementation, so that their work is kept -visible and integrated with that of the rest of the group. During the -implementation phase developers should reach out to Pedro for UI -reviews, architecture and design concerns as well as specification -trade off concerns. - -* Merge. Once a project is considered complete by developers, a PR -that includes Pedro should be created (unless, as mentioned above, an -early PR was already created in the development phase). Whether the PR -already existed or not, its description should be changed to start -with the "Ready To Merge" statement. This marks the project as ready -to be merged into master. Once a week, typically on Mondays, Pedro -will go through every PR marked as "Ready To Merge", build it, check -it out and if everything looks good merge it to master. At the end of -the day the resulting master will be tagged with a new version -number. This version will be go through some additional testing by -Brian and will then be deployed by Karl and Pete to customers -throughout the rest of the week. - -## Tools ## - * Pre-Merge checklist - * Code Review tutorial diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index c4a49f9b5..87f5766c2 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -6,18 +6,9 @@ ### Bug Fixes - Shell no longer crashes when removing a security from the synthetics window - It is now possible to create a new synthetic using the same name as a previously deleted synthetic -### SDK Improvements - - Improved Client and Server SDK clarity and documentation ### Performance Improvements - Synthetic calculation speed was improved by 400%. -### Risk / Entitlement System - - Risk Admin UI - - Spark users now have separate Trading, RiskAdmin, and/or MDAdmin permissions - - Spark users can now only add other users or accounts if permissioned to do so. - - Market Data Entitlement - - Automated market data reporting - - + ## 1.4.1 ### Tabs diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index ca30f9f61..ae6641719 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -1303,7 +1303,6 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ //associate users bts::api::admin::UserAccountPermissionUnit permission_unit; permission_unit.mutable_trading_permission()->set_submit_market_orders(true); - permission_unit.mutable_trading_permission()->set_has_permissions(true); permission_unit.mutable_admin_permission()->set_has_permissions(true); bts::api::admin::UserAccountPermissions account_permissions; account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(parent_account->id(), permission_unit)); diff --git a/src/lib/jetfix/codec/FIXMsg.h b/src/lib/jetfix/codec/FIXMsg.h index 519946cbc..1d587802c 100644 --- a/src/lib/jetfix/codec/FIXMsg.h +++ b/src/lib/jetfix/codec/FIXMsg.h @@ -11,7 +11,7 @@ #include "lib/jetfix/codec/IFIXMsg.h" #include "lib/jetfix/common/InMsgBuffer.h" #include "lib/utils/meta_programming.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { namespace jetfix { @@ -73,8 +73,8 @@ public: } } - void set_trace (trace::CorID const&trace) {_trace = trace;} - trace::CorID const&trace() const {return _trace;} + void set_trace (PerfTrace const&trace) {_trace = trace;} + PerfTrace const&trace() const {return _trace;} private: typedef std::tuple FieldTuple; @@ -103,7 +103,7 @@ private: FieldTuple _fields; std::bitset::value> _has_value; std::vector> _field_idx; - trace::CorID _trace; + PerfTrace _trace; }; diff --git a/src/lib/jetfix/common/InMsgBuffer.h b/src/lib/jetfix/common/InMsgBuffer.h index bd1c76f9f..f01426120 100644 --- a/src/lib/jetfix/common/InMsgBuffer.h +++ b/src/lib/jetfix/common/InMsgBuffer.h @@ -6,7 +6,7 @@ #include #include "lib/utils/bts_assert.h" #include "lib/jetfix/codec/MessageTypes.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { namespace jetfix { @@ -114,16 +114,16 @@ public: std::string get_test_req_id () const {return get_string_field ("\001112=",sizeof("\001112=")-1);} - trace::CorID const&trace() const {return _trace;} + PerfTrace const&trace() const {return _trace;} - void set_trace(trace::CorID const&t) {_trace = t;} + void set_trace(PerfTrace const&t) {_trace = t;} private: const char *_data; size_t _size; MessageTypes _type; std::shared_ptr _buffer; - trace::CorID _trace; + PerfTrace _trace; MessageTypes get_type () const { diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib/jetfix/connection/AsyncReader.cpp index 93129e2d0..4c513f5a5 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib/jetfix/connection/AsyncReader.cpp @@ -72,7 +72,6 @@ struct AsyncReader::PImpl PImpl(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, - trace::PerfLog &l, size_t buffer_sz, size_t high_water_mark) : @@ -82,7 +81,6 @@ struct AsyncReader::PImpl write_cursor (0), reader_thread (), sink (sink), - perf_log(l), high_water_mark (high_water_mark), connection_name(connection_name) {} @@ -100,8 +98,6 @@ struct AsyncReader::PImpl std::thread reader_thread; // an observer that will process the messages we frame ICoreGatewayEventSink &sink; - // For performance analysis - trace::PerfLog &perf_log; // a position in the current buffer that if reached signals the // need to increase the buffer size uint32_t high_water_mark; @@ -111,9 +107,8 @@ struct AsyncReader::PImpl AsyncReader::AsyncReader (IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, - trace::PerfLog &log, size_t buffer_sz, size_t high_water_mark): - me (new PImpl(connection,connection_name,sink,log,buffer_sz,high_water_mark)) + me (new PImpl(connection,connection_name,sink,buffer_sz,high_water_mark)) {} void AsyncReader::start () @@ -142,9 +137,8 @@ void AsyncReader::dispatch () for (;;) { // read as many bytes as we have buffer space for auto read_count = me->connection.read (cursor (),free_bytes ()); - auto read_time = utils::TimeStamp::now(); - trace::CorID trace; - trace.channel = "fix"; + PerfTrace trace; + trace.fix_socket_r = utils::TimeStamp::now(); // signal a disconnect if the connection broke if (read_count <= 0) { @@ -168,8 +162,6 @@ void AsyncReader::dispatch () me->first_pending_msg += first_unprocessed_offset; for (auto &msg : framed_msgs) { - trace.sn = msg.get_seq_num(); - me->perf_log.log(trace,read_time,"fix_socket_r"); msg.set_trace(trace); LOG(Latency, Diag, "perf_event AsyncReader.on_fix"); tracepoint(bts_trace, trace_order, (char *)"AsyncReader.on_fix", 0, diff --git a/src/lib/jetfix/connection/AsyncReader.h b/src/lib/jetfix/connection/AsyncReader.h index 5ef506a28..85063d1c7 100644 --- a/src/lib/jetfix/connection/AsyncReader.h +++ b/src/lib/jetfix/connection/AsyncReader.h @@ -3,7 +3,6 @@ #include namespace bts { -namespace trace {class PerfLog;} namespace jetfix { class IConnection; @@ -17,7 +16,6 @@ public: AsyncReader(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, - trace::PerfLog &l, size_t buffer_sz, // initial buffer size to use size_t high_water_mark); // when do we allocate a new buffer void start (); diff --git a/src/lib/jetfix/connection/IConnection.h b/src/lib/jetfix/connection/IConnection.h index ab8b9b214..3673788b9 100644 --- a/src/lib/jetfix/connection/IConnection.h +++ b/src/lib/jetfix/connection/IConnection.h @@ -1,9 +1,9 @@ #pragma once #include +#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { -namespace trace {struct CorID;} namespace jetfix { class IConnection @@ -14,7 +14,7 @@ public: virtual bool connect () = 0; virtual void shutdown () = 0; virtual int read (char* to_buffer,size_t read_count) = 0; - virtual int write (WriteVec const&vec,size_t vec_size,trace::CorID trace) = 0; + virtual int write (WriteVec const&vec,size_t vec_size,PerfTrace const&trace) = 0; virtual ~IConnection() {}; }; diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index a3b390a45..10fd1907f 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -1,11 +1,11 @@ #include "SocketConnection.h" #include "lib/jetfix/store/session_name.h" #include "lib/logging/logging.h" +#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" #include "lib/utils/helper_macros.h" -#include "lib/tracing/PerfLog.h" #include #include @@ -19,7 +19,7 @@ namespace bts { namespace jetfix { SocketConnection::SocketConnection(bts::config::JetFIX::Connection const &cfg, - trace::PerfLog &perf_log) + PerfTraceLog &perf_log) : _fd(-1), _cfg(cfg), _log(cfg.log_fix_stream()), _in_log(), _out_log(), _perf_log(perf_log) { if (_log) { @@ -98,7 +98,7 @@ int SocketConnection::read(char *to_buffer, size_t read_count) { } int SocketConnection::write(WriteVec const &vec, size_t vec_size, - trace::CorID trace) { + PerfTrace const &trace) { bts_assert(_fd >= 0); struct iovec iv[MaxWriteVecSz]; @@ -107,9 +107,65 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, iv[i].iov_len = vec[i].second; } - _perf_log.log(trace,"before_fix_socket_w"); + auto trace_cpy = trace; + trace_cpy.fix_socket_w = utils::TimeStamp::now(); + + utils::TimeStamp::Interval s2s; + if (trace.md.to_uint64()) { + s2s = (trace_cpy.fix_socket_w - trace_cpy.md); + tracepoint(bts_trace, trace_order, + (char *)"SocketConnection.tick_to_order.pre_write", 0, + trace.md_sn, s2s.microseconds()); + } else { + s2s = (trace_cpy.fix_socket_w - trace_cpy.fix_socket_r); + tracepoint(bts_trace, trace_order, + (char *)"SocketConnection.fill_to_order.pre_write", 0, + trace.md_sn, s2s.microseconds()); + } + + LOG(Latency, Diag, "perf_event before_socket_write"); auto result = ::writev(_fd, iv, (int)vec_size); - _perf_log.log(trace,"after_fix_socket_w"); + + if (trace.md.to_uint64()) { + LOG(Latency, Info, + "perf_event:tick_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " + "md:{} " + "md_src:{} spreader_on_book:{} spreader_modify_order:{} " + "spreader_on_child_order_update:{} " + "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " + "send_fix_buffer:{}", + s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), + trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), + trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), + trace_cpy.spreader_modify_order.to_uint64(), + trace_cpy.spreader_on_child_order_update.to_uint64(), + trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), + trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, + trace_cpy.order_key, trace.send_fix_buffer.to_uint64()); + _perf_log.log(trace_cpy); + } + + if (trace.fix_socket_r.to_uint64()) { + LOG(Latency, Info, + "perf_event:fill_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " + "md:{} md_src:{} " + "spreader_on_book:{} spreader_modify_order:{} " + "spreader_on_child_order_update:{} " + "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " + "send_fix_buffer:{} ", + s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), + trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), + trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), + trace_cpy.spreader_modify_order.to_uint64(), + trace_cpy.spreader_on_child_order_update.to_uint64(), + trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), + trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, trace_cpy.order_key, + trace_cpy.send_fix_buffer.to_uint64()); + _perf_log.log(trace_cpy); + } + + tracepoint(bts_trace, trace_order, (char *)"SocketConnection.post_write", 0, + trace.md_sn, 0); if (_log && result > 0) { for (size_t i = 0; i < vec_size; i++) diff --git a/src/lib/jetfix/connection/SocketConnection.h b/src/lib/jetfix/connection/SocketConnection.h index ebdf75828..6246d3e5f 100644 --- a/src/lib/jetfix/connection/SocketConnection.h +++ b/src/lib/jetfix/connection/SocketConnection.h @@ -7,19 +7,19 @@ #include "lib/metrics/metrics.h" namespace bts { -namespace trace {class PerfLog;struct CorID;} +class PerfTraceLog; namespace jetfix { class SocketConnection : public IConnection { public: - SocketConnection(bts::config::JetFIX::Connection const &cfgl,trace::PerfLog &log); + SocketConnection(bts::config::JetFIX::Connection const &cfgl,PerfTraceLog &log); ~SocketConnection(); bool connect () override; void shutdown () override; int read (char* to_buffer,size_t read_count) override; - int write (WriteVec const&vec,size_t vec_size,trace::CorID ) override; + int write (WriteVec const&vec,size_t vec_size,const PerfTrace &trace) override; private: int _fd; @@ -27,7 +27,7 @@ private: bool _log; std::ofstream _in_log; std::ofstream _out_log; - trace::PerfLog &_perf_log; + PerfTraceLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index e6bac0847..1f062ea2f 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -1,26 +1,26 @@ #include "CoreGateway.h" +#include "lib/logging/logging.h" +#include "lib/utils/TimeStamp.h" +#include "lib/utils/bts_chrono.h" +#include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/connection/AsyncReader.h" #include "lib/jetfix/connection/IConnection.h" #include "lib/jetfix/gateway/ICoreGatewayObserver.h" #include "lib/jetfix/gateway/Session.h" #include "lib/jetfix/store/IFIXStore.h" -#include "lib/logging/logging.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/tracing/bts_trace.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/thread_manager.h" #include +#include "lib/utils/thread_manager.h" #include #include #include #include -#include #include +#include namespace bts { namespace jetfix { @@ -50,17 +50,22 @@ struct CoreGateway::EventData { : handler(src.handler), out_msgs(src.out_msgs), in_msg(src.in_msg), trace(src.trace), ts(src.ts) {} - EventData() : handler(), out_msgs(), in_msg(), trace(), ts() {} + EventData() + : handler(), out_msgs(), in_msg(), trace(), + ts() {} EventData(Handler handler) : handler(handler), out_msgs(), in_msg(), trace(), ts() {} - EventData(Handler handler, trace::CorID const &trace, OutFIXPtr const &out_msgs) + EventData(Handler handler, PerfTrace const &trace, + OutFIXPtr const &out_msgs) : handler(handler), out_msgs(out_msgs), in_msg(), trace(trace), ts() {} EventData(Handler handler, InMsgBuffer const &in_msg) - : handler(handler), out_msgs(), in_msg(in_msg), trace(), ts() {} + : handler(handler), out_msgs(), in_msg(in_msg), + trace(), ts() {} EventData(Handler handler, std::shared_ptr const &ts) - : handler(handler), out_msgs(), in_msg(), trace(), ts(ts) {} + : handler(handler), out_msgs(), in_msg(), + trace(), ts(ts) {} EventData &operator=(EventData &src) { handler = src.handler; @@ -82,19 +87,19 @@ struct CoreGateway::EventData { Handler handler; OutFIXPtr out_msgs; InMsgBuffer in_msg; - trace::CorID trace; + PerfTrace trace; std::shared_ptr ts; }; struct CoreGateway::PImpl { PImpl(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory, trace::PerfLog &l) + StoreFactory const &store_factory) : cfg(cfg), observer(observer), make_connection(conn_factory), make_store(store_factory), state(State::OFF), start_of_pause(), session_info(), event_queue(), timer_thread(), destroy(false), is_on(false), has_replayed(false), send_batch(), recv_batch(), - connection_attempts(0), perf_log(l) { + connection_attempts(0) { send_batch.reserve(1024); recv_batch.reserve(1024); } @@ -107,7 +112,7 @@ struct CoreGateway::PImpl { State state; datetime::PTime start_of_pause; std::unique_ptr session_info; - tbb::concurrent_queue event_queue; + tbb::concurrent_queue event_queue; std::thread timer_thread; std::atomic destroy; bool is_on; @@ -115,21 +120,18 @@ struct CoreGateway::PImpl { std::vector send_batch; std::vector recv_batch; uint32_t connection_attempts; - trace::PerfLog &perf_log; }; std::thread CoreGateway::make_timer_thread() { - auto thread_name = fmt::format("jf_tmr_{}", me->cfg.name()); - return threading::make_thread(thread_name, - std::bind(&CoreGateway::call_time, this)); + auto thread_name = fmt::format ("jf_tmr_{}", me->cfg.name()); + return threading::make_thread(thread_name, std::bind(&CoreGateway::call_time, this)); } CoreGateway::CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory, - trace::PerfLog &perf_trace) - : me(new PImpl(cfg, observer, conn_factory, store_factory, perf_trace)) { + StoreFactory const &store_factory) + : me(new PImpl(cfg, observer, conn_factory, store_factory)) { me->timer_thread = make_timer_thread(); } @@ -143,7 +145,8 @@ CoreGateway::~CoreGateway() { me->timer_thread.join(); } -void CoreGateway::send(OutFIXPtr const &fix, trace::CorID trace) { +void CoreGateway::send(PerfTrace const &trace, OutFIXPtr const &fix) { + tracepoint(bts_trace, trace_order, (char *)"CoreGateway.send", 0, trace.md_sn,0); me->event_queue.push(EventData(&CoreGateway::sync_send, trace, fix)); } @@ -258,6 +261,8 @@ void CoreGateway::sync_stop(EventData const &) { } void CoreGateway::sync_send(EventData const &ev) { + tracepoint(bts_trace, trace_order, (char *)"CoreGateway.sync_send", 0, + ev.trace.md_sn,0); switch (me->state) { case State::OFF: bts_assert(false); @@ -268,7 +273,7 @@ void CoreGateway::sync_send(EventData const &ev) { case State::WSESSION_TERMINATE: break; case State::READY: - me->session_info->session->send(ev.out_msgs,ev.trace); + me->session_info->session->send(ev.trace, ev.out_msgs); break; default: bts_assert(false); @@ -472,8 +477,7 @@ void CoreGateway::sync_time(EventData const &ev) { []() { return utils::TimeStamp::now(); })); me->session_info->reader.reset(new AsyncReader( *me->session_info->connection, me->cfg.name(), *this, - me->perf_log, me->cfg.msg_buffer_sz(), - me->cfg.msg_high_water_mark())); + me->cfg.msg_buffer_sz(), me->cfg.msg_high_water_mark())); me->session_info->reader->start(); me->session_info->session->start(); transition(State::CONNECTING); @@ -569,5 +573,5 @@ const char *CoreGateway::state_name(State st) { bts_assert(false); } } -} // namespace jetfix -} // namespace bts +} +} diff --git a/src/lib/jetfix/gateway/CoreGateway.h b/src/lib/jetfix/gateway/CoreGateway.h index fcba9510b..dba302441 100644 --- a/src/lib/jetfix/gateway/CoreGateway.h +++ b/src/lib/jetfix/gateway/CoreGateway.h @@ -10,7 +10,6 @@ #include "lib/config/protos/jetfix.pb.h" namespace bts { -namespace trace {class PerfLog;} namespace jetfix { class ICoreGatewayObserver; class IConnection; @@ -26,13 +25,12 @@ public: CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory, - trace::PerfLog &); + StoreFactory const &store_factory); ~CoreGateway(); void start (); void stop (); - void send (OutFIXPtr const &msgs, trace::CorID trace); + void send (PerfTrace const&, OutFIXPtr const &msgs); void dispatch_events (); // for certification use only diff --git a/src/lib/jetfix/gateway/JetFIXGateway.h b/src/lib/jetfix/gateway/JetFIXGateway.h index 6454aab8f..6578bb8fd 100644 --- a/src/lib/jetfix/gateway/JetFIXGateway.h +++ b/src/lib/jetfix/gateway/JetFIXGateway.h @@ -8,12 +8,11 @@ #include "lib/jetfix/store/FIXFileStore.h" #include "lib/utils/meta_programming.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" namespace bts { -namespace trace {class PerfLog;} +class PerfTraceLog; namespace jetfix { // A parsing layer over CoreGateway @@ -21,7 +20,7 @@ template class JetFIXGateway : ICoreGatewayObserver { public: - JetFIXGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) + JetFIXGateway(config::JetFIX::Connection const &cfg, PerfTraceLog &log) : _core (cfg,*this, @@ -29,16 +28,13 @@ public: {return new SocketConnection (cfg,log);}, [] (config::JetFIX::Connection const &cfg) - { return new FIXFileStore (cfg);}, - - log), + { return new FIXFileStore (cfg);}), _dispatchers (), _dispatcher_idx (), _on_ready ([](){}), _on_disconnect ([](){}), _on_begin_replay ([](){}), - _on_end_replay ([](){}), - _perf_log(log) + _on_end_replay ([](){}) { std::vector disp_vec; meta::collect_tuple_items (_dispatchers,&disp_vec); @@ -49,7 +45,7 @@ public: void start () {_core.start ();} void stop () {_core.stop ();} - void send (OutFIXPtr const &msgs,trace::CorID trace ) {_core.send (msgs,trace);} + void send (PerfTrace const &trace, OutFIXPtr const &msgs) {_core.send (trace,msgs);} void dispatch_events () {_core.dispatch_events ();} @@ -127,7 +123,6 @@ private: std::function _on_disconnect; std::function _on_begin_replay; std::function _on_end_replay; - trace::PerfLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index ba7a69069..232469c06 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -106,7 +106,8 @@ void Session::start() { *me->current_time, me->cfg)); } -void Session::send(OutFIXPtr const &msgs,trace::CorID trace) { +void Session::send(PerfTrace const &trace, OutFIXPtr const &msgs) { + tracepoint(bts_trace, trace_order, (char *)"Session.send", 0, trace.md_sn, 0); switch (me->state) { case State::READY: case State::CERT_MODE: @@ -546,10 +547,10 @@ void Session::buffer_or_deliver(InMsgBuffer const &msg) { } void Session::internal_send(OutFIXPtr const &msgs) { - internal_send(trace::CorID {},msgs); + internal_send(PerfTrace(), msgs); } -void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { +void Session::internal_send(PerfTrace const &trace, OutFIXPtr const &msgs) { IConnection::WriteVec data_vec; bts_assert(msgs->fix.size() < IConnection::MaxWriteVecSz); @@ -561,10 +562,13 @@ void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { data_vec[i].first = s.data(); data_vec[i].second = s.size(); } + tracepoint(bts_trace, trace_order, (char *)"Session.internal_send.pre_write", 0, trace.md_sn,0); if (me->connection.write(data_vec, msgs->fix.size(), trace) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } + tracepoint(bts_trace, trace_order, + (char *)"Session.internal_send.post_write", 0, trace.md_sn, 0); me->last_sent_msg_timestamp = me->now(); me->store.store(msgs); msgs->set_ts(OutFIX::POST_STORE, utils::TimeStamp::now()); @@ -677,7 +681,7 @@ void Session::send_seq_reset(uint32_t sn, uint32_t new_sn) { IConnection::WriteVec data_vec; data_vec[0].first = stream.data(); data_vec[0].second = stream.size(); - if (me->connection.write(data_vec, 1, trace::CorID()) < 0) { + if (me->connection.write(data_vec, 1, PerfTrace()) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } else { diff --git a/src/lib/jetfix/gateway/Session.h b/src/lib/jetfix/gateway/Session.h index 3808a78d1..86ac8472d 100644 --- a/src/lib/jetfix/gateway/Session.h +++ b/src/lib/jetfix/gateway/Session.h @@ -8,7 +8,6 @@ #include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" @@ -32,7 +31,7 @@ public: ~Session(); void start (); - void send (OutFIXPtr const&, trace::CorID); + void send (PerfTrace const &, OutFIXPtr const&); void receive (InMsgBuffer const&); void shutdown (); void time (std::shared_ptr const&time_str); @@ -60,7 +59,7 @@ private: void buffer (InMsgBuffer const &msg); void buffer_or_deliver (InMsgBuffer const&msg); - void internal_send (trace::CorID , OutFIXPtr const&); + void internal_send (PerfTrace const&, OutFIXPtr const&); void internal_send (OutFIXPtr const&); void logout (JetFIXError::Code reason); void logout (JetFIXError::Code reason,std::string const &extra_info); diff --git a/src/lib/jetfix/tests/async_reader_tests.cpp b/src/lib/jetfix/tests/async_reader_tests.cpp index d75fff0f2..362bb0211 100644 --- a/src/lib/jetfix/tests/async_reader_tests.cpp +++ b/src/lib/jetfix/tests/async_reader_tests.cpp @@ -111,7 +111,7 @@ struct Connection : public IConnection return str.gcount (); } - int write (WriteVec const&,size_t, trace::CorID ) + int write (WriteVec const&,size_t, PerfTrace const&) {return -1;} std::istream &str; @@ -119,8 +119,6 @@ struct Connection : public IConnection TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") { - trace::PerfLog l; - SECTION ("jeftix_smoke") { std::stringstream str; @@ -130,7 +128,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,l,10,5); + AsyncReader r (c,"test",ob,10,5); r.start (); } @@ -146,7 +144,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,l,10,5); + AsyncReader r (c,"test",ob,10,5); r.start (); } REQUIRE (ob.got_eof); diff --git a/src/lib/mercury/actors/Actor.h b/src/lib/mercury/actors/Actor.h index 61e67cec1..2ca4e9416 100644 --- a/src/lib/mercury/actors/Actor.h +++ b/src/lib/mercury/actors/Actor.h @@ -37,10 +37,6 @@ class Actor { // Implement if you need special cleanup at actor destruction time virtual void finit(){}; - // Implement this if you want to be called before/after an event is dispatched - virtual void before_event() {} - virtual void after_event() {} - // subscribe to events using a specific tag template SubHandle subscribe(typename EV::Tag const &tag, CB const &cb) { @@ -71,12 +67,10 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); - before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); - after_event(); }; auto result = _subscribe(filter, handler); @@ -113,12 +107,10 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); - before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); - after_event(); }; auto result = _subscribe(filter, handler); @@ -154,12 +146,10 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); - before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); - after_event(); }; auto result = _subscribe(filter, handler); diff --git a/src/lib/mercury/actors/ContentSubscription.h b/src/lib/mercury/actors/ContentSubscription.h index 92a6cccf5..bc549e4c7 100644 --- a/src/lib/mercury/actors/ContentSubscription.h +++ b/src/lib/mercury/actors/ContentSubscription.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "lib/utils/bts_assert.h" @@ -30,9 +29,6 @@ template class ContentSubscription { using Key = decltype((*((KE *)nullptr))(*((EV *)nullptr))); using CB = std::function; struct SubID { - SubID() : k(), sid(0) {} - SubID(Key k, uint32_t sid) : k(k), sid(sid) {} - Key k; uint32_t sid; bool operator==(SubID const &rhs) const { @@ -43,7 +39,7 @@ template class ContentSubscription { ContentSubscription(Actor &actor) : _actor(&actor), _sub(_actor->subscribe( [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(1), + _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub([](auto) {}) {} ContentSubscription(Actor &actor, std::function const &pscb) @@ -56,7 +52,7 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(1), + _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub([](auto) {}) {} template @@ -65,7 +61,7 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(1), + _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub(pscb) {} template SubID sub(Key k, CBT const &cb) { @@ -101,7 +97,7 @@ template class ContentSubscription { CB cb; }; - using SubList = boost::container::small_vector; + using SubList = std::vector; using Subscriptions = std::unordered_map; Actor *_actor; diff --git a/src/lib/orderman/actors/AsyncFactory.cpp b/src/lib/orderman/actors/AsyncFactory.cpp index 91b76045e..6a9bdd497 100644 --- a/src/lib/orderman/actors/AsyncFactory.cpp +++ b/src/lib/orderman/actors/AsyncFactory.cpp @@ -1,24 +1,29 @@ #include "AsyncFactory.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" -#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" -#include "lib/orderman/events/CreateOrderReplyEvent.h" #include "lib/orderman/events/CreateOrderRequestEvent.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/events/CreateOrderReplyEvent.h" +#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" +#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/jetfix/common/OutFIX.h" #include "lib/orderman/securities/MapSecurityDB.h" +#include "lib/config/protos/jetfix.pb.h" +#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/events/NewAdminDataEvent.h" namespace bts { namespace orderman { -struct AsyncFactory::PImpl { - PImpl(DynamicOrderRegistry const &b) - : orders_stream(), fix_buffer_stream(), db(), order_router(), - order_factory(db, order_router, b) {} +struct AsyncFactory::PImpl +{ + PImpl(DynamicOrderRegistry const&b) : + orders_stream(), + fix_buffer_stream(), + db(), + order_router(), + order_factory(db,order_router,b) + {} mercury::Stream orders_stream; mercury::Stream fix_buffer_stream; @@ -27,49 +32,48 @@ struct AsyncFactory::PImpl { OrderFactory order_factory; }; -AsyncFactory::AsyncFactory(DynamicOrderRegistry const &b) : me(new PImpl(b)) {} -AsyncFactory::~AsyncFactory() {} +AsyncFactory::AsyncFactory(DynamicOrderRegistry const&b) : me(new PImpl(b)) {} +AsyncFactory::~AsyncFactory () {} -void AsyncFactory::init() { +void AsyncFactory::init() +{ me->orders_stream = make_stream(); - me->fix_buffer_stream = make_stream(); + me->fix_buffer_stream = make_stream (); subscribe([this](auto const &u) { - if (u.events) - for (auto ev : *(u.events)) - me->order_router.update(*ev.admin_data); - }); + if (u.events) + for (auto ev : *(u.events)) + me->order_router.update(*ev.admin_data); + }); - subscribe([this](auto const &u) { - if (u.events) - for (auto const &ev : *(u.events)) - me->db.securities[SecurityKey(ev.security->id())] = ev.security; - }); + subscribe([this] (auto const&u) { + if (u.events) + for (auto const &ev : *(u.events)) + me->db.securities[SecurityKey(ev.security->id())] = ev.security; + }); + + subscribe([this] (const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_orders); + while (response.size() < ev.n_orders) + response.push_back(&me->order_factory.create(ev.parent_key,*ev.def)); + this->publish(me->orders_stream,ev.request_id,std::move(response)); + } + }); - subscribe([this](const auto &u) { - if (u.events) - for (auto const &ev : *u.events) { - std::vector response; - response.reserve(ev.n_orders); - while (response.size() < ev.n_orders) - response.push_back( - &me->order_factory.create(ev.parent_key, *ev.def)); - this->publish(me->orders_stream, ev.request_id, - std::move(response)); - } - }); - - subscribe([this](const auto &u) { - if (u.events) - for (auto const &ev : *u.events) { - std::vector response; - response.reserve(ev.n_buffers); - while (response.size() < ev.n_buffers) - response.push_back(std::make_shared(*ev.cfg)); - this->publish(me->fix_buffer_stream, std::move(response), ev.cfg); - } - }); + subscribe([this] (const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_buffers); + while (response.size() < ev.n_buffers) + response.push_back(std::make_shared (*ev.cfg)); + this->publish(me->fix_buffer_stream,std::move(response),ev.cfg); + } + }); } -} // namespace orderman -} // namespace bts + +}} diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index c50d75ad2..fbc4c53f0 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -24,10 +24,11 @@ using JFGw = fix::RejectMsg, fix::CancelRejectMsg>; struct ExecutionGateway::PImpl { - PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) - : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), - securities(), securities_by_descriptor(), gw_name(cfg.name()), - cfg(cfg), perf_log(l) {} + PImpl(config::JetFIX::Connection const &cfg, PerfTraceLog &log) + : gw(cfg, log), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), + securities(), securities_by_descriptor(), exe_report_stream(), + gw_status_change_stream(), cancel_reject_stream(), gw_name(cfg.name()), + cfg(cfg) {} JFGw gw; boost::object_pool exe_report_pool; @@ -35,21 +36,26 @@ struct ExecutionGateway::PImpl { std::unordered_map securities; std::unordered_map securities_by_descriptor; + mercury::Stream exe_report_stream; + mercury::Stream gw_status_change_stream; + mercury::Stream cancel_reject_stream; GatewayName gw_name; config::JetFIX::Connection cfg; - OnExeReport on_exe_report; - OnGwStatusChange on_gw_status_change; - OnCancelReject on_cancel_reject; - trace::PerfLog &perf_log; }; ExecutionGateway::ExecutionGateway(config::JetFIX::Connection const &cfg, - trace::PerfLog &log) - : me(new PImpl(cfg, log)) { - me->state = State::WAITING_FOR_SECURITIES; -} + PerfTraceLog &log) + : me(new PImpl(cfg, log)) {} ExecutionGateway::~ExecutionGateway() {} +void ExecutionGateway::init() { + me->state = State::WAITING_FOR_SECURITIES; + subscribe( + [this](auto const &sec_update) { this->on_securities(sec_update); }); + subscribe( + me->gw_name, [this](auto const &fix) { this->on_outgoing_fix(fix); }); +} + void ExecutionGateway::on_securities( const mercury::Update &update) { if (update.events) { @@ -90,22 +96,24 @@ void ExecutionGateway::on_securities( me->gw.on() = [this](auto const &m) { this->on_session_reject(m); }; + + // stream of execution reports + me->exe_report_stream = + make_stream(me->gw_name); + + // stream for gateway status + me->gw_status_change_stream = + make_stream(me->gw_name); + + // stream for cancel rejects + me->cancel_reject_stream = make_stream(me->gw_name); + + // start the gateway + me->gw.start(); } } } -void ExecutionGateway::start() { me->gw.start(); } - -OnExeReport &ExecutionGateway::on_exe_report() { return me->on_exe_report; } - -OnGwStatusChange &ExecutionGateway::on_gw_status_change() { - return me->on_gw_status_change; -} - -OnCancelReject &ExecutionGateway::on_cancel_reject() { - return me->on_cancel_reject; -} - void ExecutionGateway::on_exe_report( const jetfix::fix::ExecutionReportMsg &msg) { auto start = Timer::now(); @@ -186,6 +194,8 @@ void ExecutionGateway::on_exe_report( data->exec_type = api::orderman::ExecType(msg.get()); data->msg_seq_num = msg.get(); + tracepoint(bts_trace, trace_order, + (char *)"ExecutionGateway.on_exe_report", 0, 0, 0); // copy data from fix msg to our structure if (msg.has()) @@ -248,8 +258,9 @@ void ExecutionGateway::on_exe_report( str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; - me->perf_log.log(msg.trace(),"exe_gw"); - me->on_exe_report(*data, msg.trace()); + auto trace = msg.trace(); + trace.exe_gw = utils::TimeStamp::now(); + publish(me->exe_report_stream, data, trace); LOG(Latency, Info, "Finished handling of execution report for order {}. {}ns", ok.value(), ns_diff(Timer::now(), start)); @@ -268,7 +279,7 @@ void ExecutionGateway::on_cancel_reject( else if (msg.has()) reject_msg = fmt::format("Order cancel was rejected with error code {}", msg.get()); - me->on_cancel_reject(ok, reject_msg); + publish(me->cancel_reject_stream, ok, reject_msg); } void ExecutionGateway::on_connection_status_change(bool is_connected) { @@ -276,7 +287,8 @@ void ExecutionGateway::on_connection_status_change(bool is_connected) { me->gw_name.value(), is_connected ? std::string("connected") : std::string("disconnected")); - me->on_gw_status_change(is_connected); + publish(me->gw_status_change_stream, + GatewayStatusChangeEvent(me->gw_name, is_connected)); } void ExecutionGateway::on_business_reject( @@ -296,15 +308,21 @@ void ExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { m.has() ? m.get() : std::string("Unknown")); } -void ExecutionGateway::dispatch_incoming_fix_messages() { - me->gw.dispatch_events(); -} +void ExecutionGateway::on_poll() { me->gw.dispatch_events(); } -void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, - trace::CorID trace) { - me->perf_log.log(trace,"exe_gw"); - me->gw.send(fix,trace); - me->gw.dispatch_events(); +void ExecutionGateway::on_outgoing_fix( + mercury::Update const &msg) { + if (msg.events) + for (auto const &ev : *(msg.events)) { + LOG(Latency, Info, "on_outgoing_fix sn: {} ok: {}", ev.trace.md_sn, + ev.trace.order_key); + tracepoint(bts_trace, trace_order, (char *)"on_outgoing_fix", 0, + ev.trace.md_sn, 0); + auto trace = ev.trace; + trace.exe_gw = utils::TimeStamp::now(); + me->gw.send(trace, ev.msg); + me->gw.dispatch_events(); + } } } // namespace orderman diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index b94d56afa..001773fac 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -1,51 +1,44 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/orderman_utils/orderman_common.h" - #include +#include "lib/config/protos/jetfix.pb.h" +#include "lib/mercury/actors/Actor.h" +#include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/mercury/events/Update.h" +#include "lib/orderman/events/OutFIXMsgEvent.h" +#include "lib/mercury/actors/IPollableActor.h" +#include "lib/mercury/actors/PingPong.h" namespace bts { -namespace trace {struct CorID;class PerfLog;} +class PerfTraceLog; +namespace mercury { class PollEvent;} namespace orderman { class NewSecuritiesEvent; -class ExecutionReport; - -using OnExeReport = - std::function; -using OnGwStatusChange = std::function; -using OnCancelReject = std::function; // fix execution gateway for a single FIX session -class ExecutionGateway { - public: - ExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); +class ExecutionGateway : public mercury::Actor, + public mercury::IPollableActor +{ +public: + ExecutionGateway(config::JetFIX::Connection const&, PerfTraceLog& ); ~ExecutionGateway(); + void init() override; - void start(); - void dispatch_incoming_fix_messages(); - void on_securities(const mercury::Update &); - void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace); - - OnExeReport& on_exe_report(); - OnGwStatusChange& on_gw_status_change(); - OnCancelReject &on_cancel_reject(); - - private: - enum class State { WAITING_FOR_SECURITIES, READY }; +private: + enum class State {WAITING_FOR_SECURITIES,READY}; struct PImpl; std::unique_ptr me; - // fix gateway events - void on_exe_report(jetfix::fix::ExecutionReportMsg const &); - void on_cancel_reject(jetfix::fix::CancelRejectMsg const &); + void on_poll() override; + + void on_securities(const mercury::Update &); + void on_exe_report(jetfix::fix::ExecutionReportMsg const&); + void on_cancel_reject(jetfix::fix::CancelRejectMsg const&); void on_connection_status_change(bool connected); - void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const &); - void on_session_reject(jetfix::fix::RejectMsg const &); + void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const&); + void on_session_reject(jetfix::fix::RejectMsg const&); + void on_outgoing_fix(const mercury::Update &); }; -} // namespace orderman -} // namespace bts +}} + diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index a7d2fab18..fe368bb32 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -19,7 +19,7 @@ enum class FillStore::State { WAIT_SEC, READY }; struct FillStore::UnresolvedFills { std::vector fills; - api::Security const *security; + api::Security const* security; }; struct FillStore::PImpl { @@ -145,13 +145,13 @@ void FillStore::on_execution_report( fill.mutable_timestamp()->set_seconds(tv.tv_sec); fill.mutable_timestamp()->set_nanos(tv.tv_usec * 1000); + auto order_def = me->known_orders[er.order_key]; if (order_def) fill.set_account(order_def->account()); else - me->fills_with_unresolved_accounts[er.order_key] - .fills.push_back(fill); - + me->fills_with_unresolved_accounts[er.order_key].fills.push_back(fill); + auto fv = utils::pb::to_string(fill); me->store->insert(fills_ns, fk, fv); publish(me->fill_stream, fill, *er.security); @@ -167,7 +167,7 @@ void FillStore::on_execution_report( void FillStore::on_order_state_update( mercury::Update const &u) { if (u.events) - for (auto const &ev : *u.events) { + for (auto const &ev : *u.events) { me->known_orders[ev.key] = ev.definition; // see if we can resolve the accounts for any fills that we @@ -177,12 +177,11 @@ void FillStore::on_order_state_update( f.set_account(ev.definition->account()); auto fv = utils::pb::to_string(f); me->store->update(fills_ns, f.fill_key(), fv); - publish(me->fill_stream, f, *unresolved_fills.security); + publish(me->fill_stream,f, *unresolved_fills.security); } unresolved_fills.fills.clear(); // end fill resolution } } -} // namespace orderman -} // namespace bts +}} // namespace orderman diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 83f58a387..5a8e506e4 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -10,7 +10,6 @@ #include "lib/orderman/events/MDRequestEvent.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -22,8 +21,8 @@ namespace orderman { class MDSource : public mercury::Actor, public mercury::IPollableActor { public: - MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats, trace::PerfLog &log) - : _handles(), _md_consumer(consumer), _book_update(), _perf_log(log),_stats(stats), _loop_timer() {} + MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats) + : _handles(), _md_consumer(consumer), _book_update(), _stats(stats), _loop_timer() {} void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); bts_assert_msg(_md_consumer.all_heartbeats_ok(), "Marketdata heartbeats are bad. MDConsumer will not recover from this condition. Please run 'sparkd md cleanup' and restart sparkd"); @@ -78,15 +77,21 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { void on_poll() override { Book book; + PerfTrace trace; auto start = utils::TimeStamp::now(); + trace.do_work_begin = start; + for (auto &h : _handles) { auto &handle = h.handle; if (handle.get_book(h.last, std::tuple_size(), &book.bid()[0], &book.ask()[0]) == md::HandleReadResult::SUCCESS) { book._security_key = SecurityKey(handle.key()); - trace::CorID trace {"md",handle.sequence()}; - _perf_log.log(trace,h.last,"md",handle.key()); + trace.md_src = utils::TimeStamp::now(); + trace.md_sn = trace.md_src.to_uint64(); + trace.md = h.last; + + tracepoint(bts_trace, trace_order, "MDSource", 0, trace.md_sn, 0); publish(_book_update, book, trace); } } @@ -102,7 +107,6 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { std::vector _handles; md::MDConsumer _md_consumer; mercury::Stream _book_update; - trace::PerfLog &_perf_log; metrics::MetricsContainer &_stats; std::shared_ptr> _loop_timer; }; diff --git a/src/lib/orderman/actors/MDSupplementarySource.cpp b/src/lib/orderman/actors/MDSupplementarySource.cpp index ae41824b1..a9630b987 100644 --- a/src/lib/orderman/actors/MDSupplementarySource.cpp +++ b/src/lib/orderman/actors/MDSupplementarySource.cpp @@ -1,9 +1,10 @@ #include "MDSupplementarySource.h" -#include "lib/logging/logging.h" -#include "lib/md/MDConsumer.h" -#include "lib/md/MDConsumerHandle.h" #include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/SettlementUpdateEvent.h" +#include "lib/logging/logging.h" +#include "lib/md/MDConsumerHandle.h" +#include "lib/md/MDConsumer.h" +#include "lib/md/MDConsumer.h" #include "lib/os/os.h" namespace bts { @@ -14,36 +15,45 @@ struct HandleRecord { md::IntPrice settlement_price; }; -struct MDSupplementarySource::PImpl { - PImpl(md::MDConsumer &md_consumer) - : md_consumer(md_consumer), handle_map(), settlement_update() {} +struct MDSupplementarySource::PImpl +{ + PImpl(md::MDConsumer& md_consumer) + : + md_consumer(md_consumer), + handle_map(), + settlement_update(){ + } md::MDConsumer md_consumer; // list of sec subscriptions vs their handles std::map handle_map; mercury::Stream settlement_update; }; -MDSupplementarySource::MDSupplementarySource(md::MDConsumer &md_consumer) - : me(new PImpl(md_consumer)) {} +MDSupplementarySource::MDSupplementarySource(md::MDConsumer& md_consumer) +: +me(new PImpl(md_consumer)){ +} -MDSupplementarySource::~MDSupplementarySource() {} +MDSupplementarySource::~MDSupplementarySource(){ +} -void MDSupplementarySource::init() { - me->settlement_update = make_stream(); +void MDSupplementarySource::init(){ + me->settlement_update=make_stream(); subscribe([this](auto const &update) { if (update.events) { for (auto const &ev : *update.events) { auto k = ev.security_key.value(); auto it = me->handle_map.find(k); - if (it == me->handle_map.end()) { + if(it ==me->handle_map.end()){ LOG(OrderMan, Info, "MDSupplementarySource::init key:{}", k); - me->handle_map[k] = {me->md_consumer.get_handle(k), md::INT_NAN}; - } else { + me->handle_map[k]={me->md_consumer.get_handle(k),md::INT_NAN}; + } + else { // late joiners auto const &hr = it->second; if (!hr.settlement_price.is_nan()) { - SettlementUpdateEvent ev(hr.settlement_price, SecurityKey(k)); - publish(me->settlement_update, ev); + SettlementUpdateEvent ev(hr.settlement_price,SecurityKey(k)); + publish(me->settlement_update,ev); } } } @@ -51,22 +61,21 @@ void MDSupplementarySource::init() { }); } -void MDSupplementarySource::on_poll() { - for (auto &kvp : me->handle_map) { - SecurityKey key(kvp.first); - HandleRecord &hr = kvp.second; +void MDSupplementarySource::on_poll(){ + for(auto& kvp : me->handle_map){ + SecurityKey key(kvp.first); + HandleRecord& hr=kvp.second; auto settlement_price = hr.handle.settlement_price(); - if (!settlement_price.is_nan() && - settlement_price != hr.settlement_price) { + if(!settlement_price.is_nan() && + settlement_price!=hr.settlement_price){ LOG(OrderMan, Info, - "MDSupplementarySource::on_poll new settle key:{} price:{}", key, - hr.settlement_price.price()); - hr.settlement_price = settlement_price; - SettlementUpdateEvent ev(settlement_price, key); - publish(me->settlement_update, ev); + "MDSupplementarySource::on_poll new settle key:{} price:{}", + key, hr.settlement_price.price()); + hr.settlement_price=settlement_price; + SettlementUpdateEvent ev(settlement_price,key); + publish(me->settlement_update,ev); } } } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index ee9515be7..e5a09e0ca 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -1,134 +1,134 @@ #include "lib/orderman/actors/SODPosition.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" -#include "lib/config/protos/toggles.pb.h" #include "lib/logging/logging.h" -#include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" -#include +#include "lib/config/protos/toggles.pb.h" +#include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "lib/config/config.h" +#include "lib/utils/PBUtils.h" #include +#include -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ SODPosition::SODPosition() - : _enabled(config::get().enabled()), - _sod_time(_get_fills_sod_time()) { - LOG(persist, Info, "SODPosition enabled:{} sec:{}", _enabled, - _sod_time.tv_sec); +: +_enabled (config::get().enabled()), +_sod_time(_get_fills_sod_time()){ + LOG(persist, Info, "SODPosition enabled:{} sec:{}", + _enabled, _sod_time.tv_sec); } // returns the timeval for today's hh,mm,ss // timeval is the microsecons from epoch) -timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss) { - bts_assert(hh < 24); - bts_assert(mm < 60); - bts_assert(ss < 60); +timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss){ + bts_assert(hh<24); + bts_assert(mm<60); + bts_assert(ss<60); time_t secs; - time(&secs); // seconds since epoch (utc) - struct tm *ptm = gmtime(&secs); - ptm->tm_hour = hh; - ptm->tm_min = mm; - ptm->tm_sec = ss; - ptm->tm_isdst = -1; - secs = mktime(ptm); + time (&secs); // seconds since epoch (utc) + struct tm* ptm = gmtime (&secs); + ptm->tm_hour=hh; + ptm->tm_min=mm; + ptm->tm_sec=ss; + ptm->tm_isdst=-1; + secs=mktime(ptm); timeval rv; - rv.tv_sec = secs; - rv.tv_usec = 0; + rv.tv_sec=secs; + rv.tv_usec=0; return rv; } -timeval SODPosition::_subtract_days(const timeval &tv, uint32_t n_days) { - uint32_t secs_in_day = 86400 * n_days; - timeval rv = tv; - rv.tv_sec = (rv.tv_sec > secs_in_day) ? rv.tv_sec - secs_in_day : 0; +timeval SODPosition::_subtract_days(const timeval& tv, uint32_t n_days){ + uint32_t secs_in_day=86400*n_days; + timeval rv=tv; + rv.tv_sec=(rv.tv_sec > secs_in_day) ? rv.tv_sec-secs_in_day : 0; return rv; } -timeval SODPosition::_get_fills_sod_time() { - const auto &sod_time = config::get(); - timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); +timeval SODPosition::_get_fills_sod_time(){ + const auto& sod_time = config::get(); + timeval sod=_to_timeval(sod_time.sod_hh(),sod_time.sod_mm(),0); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday - if (sod.tv_sec >= now.tv_sec) - sod = _subtract_days(sod); + if(sod.tv_sec >= now.tv_sec) + sod=_subtract_days(sod); return sod; } -timeval SODPosition::get_orders_start_time() { - const auto &sod_time = config::get(); - timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); - const auto &orders_cleanup = config::get(); +timeval SODPosition::get_orders_start_time(){ + const auto& sod_time = config::get(); + timeval sod=_to_timeval(sod_time.sod_hh(),sod_time.sod_mm(),0); + const auto& orders_cleanup = config::get(); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday - if (sod.tv_sec >= now.tv_sec) - sod = _subtract_days(sod); - sod = _subtract_days(sod, orders_cleanup.extra_days()); + if(sod.tv_sec >= now.tv_sec) + sod=_subtract_days(sod); + sod=_subtract_days(sod,orders_cleanup.extra_days()); return sod; } timeval SODPosition::get_order_cutoff_time( - const std::map &order_map) { - // returns true is t1 >= t2 - auto compare_ts = [&](google::protobuf::Timestamp t1, - google::protobuf::Timestamp t2) -> bool { + const std::map& order_map){ + //returns true is t1 >= t2 + auto compare_ts = [&](google::protobuf::Timestamp t1, google::protobuf::Timestamp t2) -> bool + { if (t1.seconds() > t2.seconds()) return true; else if (t1.seconds() < t2.seconds()) return false; else return t1.nanos() >= t2.nanos(); - }; + }; google::protobuf::Timestamp max_ts; max_ts.set_seconds(0); max_ts.set_nanos(0); - for (auto const &kvp : order_map) { + for (auto const &kvp : order_map){ OrderRecord trec; - if (utils::pb::from_string(kvp.second, - &trec)) { - const auto &ts = trec.state().created(); - if (compare_ts(ts, max_ts)) + if (utils::pb::from_string(kvp.second, &trec)){ + const auto& ts = trec.state().created(); + if(compare_ts(ts,max_ts)) (&max_ts)->CopyFrom(ts); - } else + } + else LOG(OrderMan, Error, "Could not recover order {} from storage. " "This should be investigated", kvp.first); } timeval rv; - rv.tv_sec = max_ts.seconds(); - rv.tv_usec = static_cast(max_ts.nanos()) / 1000; - const auto &orders_cleanup = config::get(); - return _subtract_days(rv, orders_cleanup.extra_days()); + rv.tv_sec=max_ts.seconds(); + rv.tv_usec=static_cast(max_ts.nanos())/1000; + const auto& orders_cleanup = config::get(); + return _subtract_days(rv,orders_cleanup.extra_days()); } -std::string SODPosition::_sod_fill_id(const Fill &fill, api::Side side) { - // sod:acct:long/short:sec +std::string SODPosition::_sod_fill_id(const Fill& fill,api::Side side){ + //sod:acct:long/short:sec std::ostringstream oss; - oss << "sod:" << fill.account() - << (side == api::Side::SIDE_BUY ? ":L:" : ":S:") << fill.security_key(); - return oss.str(); + oss << "sod:" << fill.account() << (side==api::Side::SIDE_BUY ? ":L:" : ":S:") + << fill.security_key(); + return oss.str(); } -void SODPosition::_merge_pos(Fill &pos, const Fill &fill) { - bts_assert(pos.security_key() == fill.security_key()); - bts_assert(pos.account() == fill.account()); - bts_assert(pos.side() == fill.side()); - double total_qty = pos.last_shares() + fill.last_shares(); - double avg_price = (pos.avg_price() * pos.last_shares() + - fill.last_price() * fill.last_shares()) / - total_qty; +void SODPosition::_merge_pos(Fill& pos, const Fill& fill){ + bts_assert(pos.security_key()==fill.security_key()); + bts_assert(pos.account()==fill.account()); + bts_assert(pos.side()==fill.side()); + double total_qty=pos.last_shares()+fill.last_shares(); + double avg_price=(pos.avg_price()*pos.last_shares()+ + fill.last_price()*fill.last_shares())/total_qty; pos.set_avg_price(avg_price); pos.set_last_price(avg_price); pos.set_last_shares(total_qty); } -void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { +void SODPosition::_zero_pos(Fill& pos, const Fill& fill, api::Side side){ pos.set_security_key(fill.security_key()); pos.set_account(fill.account()); pos.set_side(side); @@ -136,61 +136,60 @@ void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { pos.mutable_timestamp()->set_nanos(0); pos.set_fill_kind(Fill::FILL_KIND_SOD); pos.set_order_key(0); - pos.set_fill_key(_sod_fill_id(fill, side)); + pos.set_fill_key(_sod_fill_id(fill,side)); pos.set_last_shares(0); } -bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { - if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) { - uint32_t seckey = fill.security_key(); - const std::string &acct = fill.account(); - auto acct_it = _sod_map.find(acct); - if (acct_it == _sod_map.end()) - _sod_map[acct] = SecPosMap(); - acct_it = _sod_map.find(fill.account()); - bts_assert(acct_it != _sod_map.end()); - SecPosMap &sec_map = acct_it->second; - auto sec_it = sec_map.find(seckey); - if (sec_it == sec_map.end()) { +bool SODPosition::add_fill_to_sod_pos(const Fill& fill){ + if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec){ + uint32_t seckey=fill.security_key(); + const std::string& acct=fill.account(); + auto acct_it=_sod_map.find(acct); + if(acct_it==_sod_map.end()) + _sod_map[acct]=SecPosMap(); + acct_it=_sod_map.find(fill.account()); + bts_assert(acct_it!=_sod_map.end()); + SecPosMap& sec_map=acct_it->second; + auto sec_it=sec_map.find(seckey); + if(sec_it==sec_map.end()){ Fill long_pos, short_pos; - _zero_pos(long_pos, fill, api::Side::SIDE_BUY); - _zero_pos(short_pos, fill, api::Side::SIDE_SELL); - sec_map[seckey] = std::pair(long_pos, short_pos); + _zero_pos(long_pos,fill,api::Side::SIDE_BUY); + _zero_pos(short_pos,fill,api::Side::SIDE_SELL); + sec_map[seckey]=std::pair(long_pos,short_pos); } - sec_it = sec_map.find(seckey); - bts_assert(sec_it != sec_map.end()); - std::pair &pos = sec_it->second; - if (fill.side() == api::Side::SIDE_BUY) - _merge_pos(pos.first, fill); + sec_it=sec_map.find(seckey); + bts_assert(sec_it!=sec_map.end()); + std::pair& pos=sec_it->second; + if(fill.side()==api::Side::SIDE_BUY) + _merge_pos(pos.first,fill); else - _merge_pos(pos.second, fill); + _merge_pos(pos.second,fill); return true; - } else + } + else return false; } -void SODPosition::add_sod_pos_as_fill_events( - std::vector &fe, - std::map sec_map) { - if (_enabled) - for (auto &acct_p : _sod_map) { - for (auto &sec_p : acct_p.second) { - Fill &long_pos = sec_p.second.first; - Fill &short_pos = sec_p.second.second; - bts_assert(long_pos.security_key() == short_pos.security_key()); - auto sec_it = sec_map.find(SecurityKey(long_pos.security_key())); - if (sec_it == sec_map.end()) +void SODPosition::add_sod_pos_as_fill_events(std::vector& fe, + std::map sec_map){ + if(_enabled) + for (auto& acct_p : _sod_map){ + for(auto& sec_p : acct_p.second){ + Fill& long_pos=sec_p.second.first; + Fill& short_pos=sec_p.second.second; + bts_assert(long_pos.security_key()==short_pos.security_key()); + auto sec_it=sec_map.find(SecurityKey(long_pos.security_key())); + if(sec_it==sec_map.end()) LOG(persist, Error, - "Could not recover fill for key:{} from storage. " - "This should be investigated", - long_pos.security_key()); - else { - fe.emplace_back(long_pos, *sec_it->second); - fe.emplace_back(short_pos, *sec_it->second); + "Could not recover fill for key:{} from storage. " + "This should be investigated", + long_pos.security_key()); + else{ + fe.emplace_back(long_pos,*sec_it->second); + fe.emplace_back(short_pos,*sec_it->second); } } - } + } } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/actors/SecuritySrc.cpp b/src/lib/orderman/actors/SecuritySrc.cpp index 8067ef85f..854ea8eba 100644 --- a/src/lib/orderman/actors/SecuritySrc.cpp +++ b/src/lib/orderman/actors/SecuritySrc.cpp @@ -1,8 +1,8 @@ #include "SecuritySrc.h" #include "lib/md/MDConsumer.h" +#include "lib/utils/bts_chrono.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/utils/bts_chrono.h" #include @@ -10,7 +10,7 @@ namespace bts { namespace orderman { struct SecuritySrc::PImpl { - PImpl(md::MDConsumer &md) : last_scan(Timer::now()), md_consumer(md) {} + PImpl(md::MDConsumer& md) : last_scan(Timer::now()),md_consumer(md) {} TimeStamp last_scan; mercury::Stream new_securities_stream; std::vector to_publish; @@ -18,19 +18,18 @@ struct SecuritySrc::PImpl { std::vector> securities_keep_alive; }; -SecuritySrc::SecuritySrc(md::MDConsumer &md) : me(new PImpl(md)) {} +SecuritySrc::SecuritySrc(md::MDConsumer& md) : me(new PImpl(md)) {} SecuritySrc::~SecuritySrc() {} void SecuritySrc::init() { me->new_securities_stream = make_stream(); - me->md_consumer.on_security( - [this](api::Security const &s, md::MDConsumerHandle) { - auto sec = std::make_unique(s); - auto sec_ptr = sec.get(); - me->securities_keep_alive.push_back(std::move(sec)); - me->to_publish.push_back(sec_ptr); - }); - + me->md_consumer.on_security([this](api::Security const &s, md::MDConsumerHandle) { + auto sec = std::make_unique (s); + auto sec_ptr = sec.get(); + me->securities_keep_alive.push_back(std::move(sec)); + me->to_publish.push_back(sec_ptr); + }); + subscribe([this](auto) { this->on_scan_securities(); }); } @@ -48,5 +47,5 @@ void SecuritySrc::on_scan_securities() { } } } -} // namespace orderman -} // namespace bts +} +} diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index de8f85dd6..f8d0cd3a7 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -15,7 +15,6 @@ #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/utils/PBUtils.h" -#include "lib/tracing/PerfLog.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -26,9 +25,7 @@ namespace orderman { struct ServiceBridge::PImpl { PImpl(OnReady const &on_ready, OnOrders const &on_orders, - OnFills const &on_fills, - DynamicOrderRegistry const &dyn_order_registry, - mercury::BrokerProxy &service_call_marshaller) + OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, 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(), @@ -58,9 +55,8 @@ struct ServiceBridge::PImpl { ServiceBridge::ServiceBridge(OnReady const &on_ready, OnOrders const &on_orders, OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, - mercury::BrokerProxy &service_call_marshaller) - : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, - service_call_marshaller)) {} + mercury::BrokerProxy &service_call_marshaller) + : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, service_call_marshaller)) {} ServiceBridge::~ServiceBridge() {} @@ -151,7 +147,7 @@ ServiceBridge::create_order(api::orderman::Create const &c) { me->order_factory.create(null_order_key(), c.new_order()); me->known_orders.insert(order.key()); publish(me->activate_order_pub, order, Price(c.price()), - Quantity(c.quantity()), trace::CorID()); + Quantity(c.quantity()), PerfTrace()); r.set_order_key(order.key().value()); r.set_error_code(api::orderman::ORDER_ERROR_OK); } else diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index f78f0a6c6..440b6e0fd 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -49,9 +49,7 @@ class ServiceBridge : public mercury::Actor { std::function const &)>; ServiceBridge(OnReady const &, OnOrders const &, OnFills const &, - DynamicOrderRegistry const &, - - mercury::BrokerProxy &service_call_marshaller); + DynamicOrderRegistry const &, mercury::BrokerProxy &service_call_marshaller); void init() override; ~ServiceBridge(); diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index ed506a3d2..6a985aa4f 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -1,78 +1,96 @@ #pragma once -#include "lib/orderman/actors/order_manager/OrderServices.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_assert.h" #include +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/utils/bts_assert.h" namespace bts { namespace orderman { -class ChildOrder { - public: - ChildOrder() - : _order(nullptr), _parent_order_services(nullptr), _active(false) {} +class ChildOrder{ +public: + ChildOrder () + : _order(nullptr), + _order_services(nullptr), + _active(false) + {} - ChildOrder(Order &o, OrderServices &services) - : _order(&o), _parent_order_services(&services), - _child_order_services(nullptr), _active(false) {} + ChildOrder (Order &o, OrderServices &services) + : _order(&o) , + _order_services(&services), + _active(false) + {} - ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } + ChildOrder (ChildOrder &&src) + { + operator=(std::move(src)); + } - ChildOrder &operator=(ChildOrder &&src) { + ChildOrder& operator=(ChildOrder &&src) + { _order = src._order; - _parent_order_services = src._parent_order_services; - _child_order_services = src._child_order_services; + _order_services = src._order_services; _active = src._active; - + src._order = nullptr; - src._parent_order_services = nullptr; - src._child_order_services = nullptr; + src._order_services = nullptr; src._active = false; return *this; } - OrderKey key() const { - bts_assert_d(_order); + OrderKey key() const + { + bts_assert(_order); return _order->key(); } - bool is_active() const { return _active; } - - void activate(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { + bool is_active() const {return _active;} + + void activate(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) + { bts_assert(_order); bts_assert(!_active); - _child_order_services = - &_parent_order_services->activate_child(*_order, p, q, trace); + _order_services->send_activate(*_order,p,q, trace); _active = true; } - void update(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { + void update(Price p, Quantity q) + { + PerfTrace trace; + update(p,q,trace); + } + + void update(Price p, Quantity q, PerfTrace &trace) + { bts_assert(_order); bts_assert(_active); - _child_order_services->update(p, q, trace); + _order_services->send_update(_order->key(),p,q,trace); } - void crack(trace::CorID const &trace = trace::CorID()) { + void crack(PerfTrace const &trace = PerfTrace()) + { bts_assert(_order); bts_assert(_active); - _child_order_services->crack(trace); + _order_services->send_crack(_order->key(),trace); } - void cancel(trace::CorID const &trace = trace::CorID()) { + void cancel(PerfTrace const &trace = PerfTrace()) + { bts_assert(_order); bts_assert(_active); - _child_order_services->cancel(trace); + _order_services->send_cancel(_order->key(),trace); } - - private: + +private: friend class OrderBuilder; - Order *_order; - OrderServices *_parent_order_services; - OrderServices *_child_order_services; + Order* _order; + OrderServices *_order_services; bool _active; }; -} // namespace orderman -} // namespace bts + +}} + + diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp b/src/lib/orderman/actors/order_manager/OrderBuilder.cpp index 1c2783534..1a19a6c56 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.cpp @@ -4,5 +4,5 @@ namespace bts { namespace orderman { std::atomic OrderBuilder::_current_builder_id(0); -} -} // namespace bts + +}} diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 1a446d59e..fcc43c062 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -1,85 +1,93 @@ #pragma once +#include +#include +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/orderman/orders/PreActivationOrderServices.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/logging/logging.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include -#include namespace bts { namespace orderman { -class OrderBuilder { - public: +class OrderBuilder +{ +public: OrderBuilder() - : _parent_key(null_order_key()), _definition(), _reserve_sz(0), - _order_stash(), _builder_id(), _order_services(nullptr) {} + : _parent_key(null_order_key()), + _definition(), + _reserve_sz(0), + _order_stash(), + _builder_id(), + _order_services(nullptr) + {} - OrderBuilder(OrderBuilder &&src) { operator=(std::move(src)); } - - OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, - PreActivationOrderServices const &srv, size_t reserve_sz = 1) - : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), - _order_stash(), _builder_id(++_current_builder_id), - _order_services(nullptr) + OrderBuilder(OrderBuilder&&src) {operator=(std::move(src));} + OrderBuilder(OrderKey parent_key, + api::orderman::OrderDefinition const&def, + PreActivationOrderServices const &srv, + size_t reserve_sz = 1) + : _parent_key(parent_key), + _definition(def) , + _reserve_sz(reserve_sz), + _order_stash(), + _builder_id(++_current_builder_id), + _order_services(nullptr) + { bts_assert(parent_key != null_order_key()); while (_order_stash.size() != reserve_sz) - _order_stash.push_back( - &srv.order_factory.create(parent_key, _definition)); + _order_stash.push_back(&srv.order_factory.create(parent_key,_definition)); } - void activate(OrderServices &order_services) { + void activate(OrderServices &order_services) + { bts_assert(!_order_services); _order_services = &order_services; - _order_services->subscribe_to_order_creation_reply( - _builder_id, [this](auto const &order_ev) { - _order_stash.insert(_order_stash.end(), order_ev.orders.begin(), - order_ev.orders.end()); - }); + _order_services->order_creations.sub(_builder_id,[this] (auto const&order_ev) { + _order_stash.insert(_order_stash.end(),order_ev.orders.begin(),order_ev.orders.end()); + }); } - - ChildOrder build() { - bts_assert_msg( - _order_services, - "OrderBuilder::activate() must be called before orders can be built"); + + ChildOrder build() + { + bts_assert_msg(_order_services,"OrderBuilder::activate() must be called before orders can be built"); ChildOrder result; if (_order_stash.size()) { - result = ChildOrder(*_order_stash.back(), *_order_services); + result = ChildOrder( *_order_stash.back(), + *_order_services); _order_stash.pop_back(); - } else { - LOG(OrderMan, Warn, - "Ran out of pre-allocated child orders for order {}. Will " - "allocate directly. " - "This will have an impact on performance", - _parent_key); - result = ChildOrder( - _order_services->order_factory().create(_parent_key, _definition), - *_order_services); + } + else { + LOG(OrderMan,Warn, + "Ran out of pre-allocated child orders for order {}. Will allocate directly. " + "This will have an impact on performance", _parent_key); + result = ChildOrder (_order_services->order_factory().create(_parent_key,_definition), + *_order_services); } if (_reserve_sz > _order_stash.size()) { auto need = _reserve_sz - _order_stash.size(); - _order_services->send_order_create_req(_builder_id, _parent_key, - _definition, need); + _order_services->send_order_create_req(_builder_id,_parent_key,_definition,need); } return result; } - - OrderBuilder &operator=(OrderBuilder &&src) { + + OrderBuilder& operator=(OrderBuilder &&src) + { move_here(src); return *this; } - private: - void move_here(OrderBuilder &src) { +private: + void move_here(OrderBuilder &src) + { bts_assert(!_order_services); _parent_key = src._parent_key; - _definition = src._definition; + _definition= src._definition; _reserve_sz = src._reserve_sz; _order_stash = src._order_stash; _builder_id = src._builder_id; @@ -88,16 +96,15 @@ class OrderBuilder { src._order_services = nullptr; bts_assert(_parent_key != null_order_key()); } - + OrderKey _parent_key; api::orderman::OrderDefinition _definition; size_t _reserve_sz; - std::vector _order_stash; - size_t _builder_id; + std::vector _order_stash; + size_t _builder_id ; OrderServices *_order_services; - + static std::atomic _current_builder_id; }; -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index d65304712..fe06f382d 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -14,8 +14,8 @@ #include "lib/utils/inplace_function.h" #include -#include #include +#include namespace bts { namespace orderman { @@ -30,20 +30,37 @@ enum class OrderManager::State { READY }; +struct OrderManager::OrderInfo { + OrderInfo(Order &o, OrderServicesData &data) + : order(&o), order_services(std::make_unique(o, data)) {} + + OrderInfo() = default; + OrderInfo(OrderInfo &&src) = default; + OrderInfo &operator=(OrderInfo &&src) = default; + + Order *order; + std::unique_ptr order_services; +}; + struct OrderManager::PImpl { - PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l) - : state(State::WAIT_ADMIN), services_data(owner, b, l) {} + PImpl(OrderManager &owner, DynamicOrderRegistry const &b) + : state(State::WAIT_ADMIN), services_data(owner, b) { + pending_order_events.reserve(1000); + } State state; - std::unordered_map orders; + std::unordered_map orders; + + std::vector pending_order_events; + mercury::Actor::SubHandle stored_order_sub; mercury::Actor::SubHandle stored_fills_sub; OrderServicesData services_data; mercury::Stream pub_ready; }; -OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l) - : me(new PImpl(*this, b, l)) {} +OrderManager::OrderManager(DynamicOrderRegistry const &b) + : me(new PImpl(*this, b)) {} OrderManager::~OrderManager() {} void OrderManager::init() { @@ -73,11 +90,6 @@ void OrderManager::on_admin_data(const mercury::Update &m) { void OrderManager::on_securities( const mercury::Update &update) { - - // forward to execution gateways - for (auto &osd : me->services_data.sessions) - osd->gw.on_securities(update); - if (update.events) { // update our security db and accumulate for the sake of the limiter @@ -113,10 +125,8 @@ void OrderManager::on_fill_recovery( me->state = State::WAIT_ORDERS; for (auto const &ev : *(update.events)) { - auto trimmed_account_name = - boost::algorithm::trim_copy(ev.fill.account()); - me->services_data.limiter.add(*ev.security, trimmed_account_name, - ev.fill.side(), + auto trimmed_account_name = boost::algorithm::trim_copy(ev.fill.account()); + me->services_data.limiter.add(*ev.security, trimmed_account_name,ev.fill.side(), Quantity(ev.fill.last_shares())); } @@ -148,14 +158,13 @@ void OrderManager::on_order_recovery( for (auto const &ev : *(update.events)) { auto &order = me->services_data.order_factory.recover(ev.order_record); - order.init_order_services(me->services_data); - - auto r = me->orders.emplace(order.key(), &order); - bts_assert(r.second); auto const &ostate = ev.order_record.state(); + OrderInfo oi{order, me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[order.key()] = std::move(oi); order.on_activate(Price(ostate.price()), - Quantity(ostate.quantity()), *order._services, - trace::CorID()); + Quantity(ostate.quantity()), *serv_ptr, + PerfTrace()); } // signal that we are ready @@ -185,73 +194,91 @@ void OrderManager::on_execution_report( auto order = &me->services_data.order_factory.recreate_from_exe_report( *report.data); - order->init_order_services(me->services_data); - auto r = me->orders.emplace(order->key(), order); - bts_assert(r.second); + OrderInfo oi{*order, me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[order->key()] = std::move(oi); order->on_activate(report.data->price, report.data->quantity, - *order->_services, trace::CorID()); + *serv_ptr, PerfTrace()); } } } +void OrderManager::queue_order_event(PendingOrderEvent const &event_handler) { + me->pending_order_events.push_back(event_handler); +} + void OrderManager::on_activate_order( const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) { - auto order = ev.order; - order->init_order_services(me->services_data); - auto r = me->orders.emplace(order->key(), order); - bts_assert(r.second); - order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); - } + for (auto const &ev : *m.events) + queue_order_event(ev); +} + +void OrderManager::handle_order_event(ActivateOrderEvent const &ev) { + auto order = ev.order; + auto k = order->key(); + bts_assert(me->orders.find(k) == me->orders.end()); + OrderInfo oi{*order, me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[k] = std::move(oi); + order->on_activate(ev.price, ev.quantity, *serv_ptr, ev.trace); } void OrderManager::on_update_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second->on_update(ev.price, ev.quantity, ev.trace); - else { - LOG(OrderMan, Error, - "Received an update request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } - } + for (auto const &ev : *m.events) + queue_order_event(ev); +} + +void OrderManager::handle_order_event(UpdateOrderEvent const &ev) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_update(ev.price, ev.quantity, ev.trace); + else { + LOG(OrderMan, Error, + "Received an update request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } } void OrderManager::on_cancel_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second->on_cancel(ev.trace); - else { - LOG(OrderMan, Error, - "Received a cancel request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } - } + for (auto const &ev : *m.events) + queue_order_event(ev); +} + +void OrderManager::handle_order_event(CancelOrderEvent const &ev) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_cancel(ev.trace); + else { + LOG(OrderMan, Error, + "Received a cancel request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } } void OrderManager::on_crack_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second->on_crack(ev.trace); - else { - LOG(OrderMan, Error, - "Received a crack request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } - } + for (auto const &ev : *m.events) + queue_order_event(ev); +} + +void OrderManager::handle_order_event(CrackOrderEvent const &ev) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_crack(ev.trace); + else { + LOG(OrderMan, Error, + "Received a crack request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } } void OrderManager::on_gateway_state( @@ -263,16 +290,6 @@ void OrderManager::on_gateway_state( } } -OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, - Price p, Quantity q, - trace::CorID const &trace) { - order.init_order_services(me->services_data, parent); - auto r = me->orders.emplace(order.key(), &order); - bts_assert(r.second); - order.on_activate(p, q, *order._services, trace); - return *order._services; -} - void OrderManager::on_new_fix_buffer( const mercury::Update &m) { if (m.events) @@ -353,24 +370,8 @@ void OrderManager::init_order_services() { s->gateway_status_subs = std::make_unique< ContentSubscription>(*this, gw_name); - // publishers for execution reports, gateway status and cancel - // reject evets - auto s_ptr = s.get(); - s->exe_report_pub = make_stream(gw_name); - s->gw.on_exe_report() = [s_ptr,this] (auto const &er, auto const &t) { - publish(s_ptr->exe_report_pub, &er,t); - }; - s->gw_status_change_pub = make_stream(gw_name); - s->gw.on_gw_status_change() = [s_ptr,this,gw_name] (bool b) { - publish(s_ptr->gw_status_change_pub, gw_name,b); - }; - s->cancel_reject_pub = make_stream(gw_name); - s->gw.on_cancel_reject() = [s_ptr,this] (auto const &k,auto const&msg) { - publish(s_ptr->cancel_reject_pub, k,msg); - }; - // handlers are ready so we can start processing fix events - s->gw.start(); - + // FIX output + s->out_fix_pub = make_stream(gw_name); reload_fix_buffer(*s); } @@ -393,6 +394,11 @@ void OrderManager::init_order_services() { [this](auto const &ev) { this->on_new_fix_buffer(ev); }); // Outputs + me->services_data.activate_order_pub = make_stream(); + me->services_data.update_order_pub = make_stream(); + me->services_data.cancel_order_pub = make_stream(); + me->services_data.crack_order_pub = make_stream(); + me->services_data.create_order_req_pub = make_stream(); me->services_data.create_fix_req_pub = @@ -401,9 +407,12 @@ void OrderManager::init_order_services() { me->services_data.settlement_request_pub = make_stream(); me->services_data.report_order_state_pub = - make_stream(); + make_stream(); me->pub_ready = make_stream(); + me->services_data.child_order_subs = + std::make_unique>( + *this); // md subs are peculiar in that we try to make them on demand, so // we publish an event announcing the subscription std::function on_md_sub = [this](SecurityKey k) { @@ -423,36 +432,35 @@ void OrderManager::init_order_services() { std::make_unique>(*this); } -void OrderManager::after_event() { +void OrderManager::on_poll() { if (me->state == State::READY) { + for (size_t i = 0; i < me->pending_order_events.size(); i++) + me->pending_order_events[i](*this); + me->pending_order_events.clear(); for (auto &osd : me->services_data.sessions) { auto &fix_stream = osd->current_buffer->first_stream(); if (fix_stream.n_msgs()) { fix_stream.close(); - osd->gw.send_fix(osd->current_buffer, osd->current_trace); + publish(osd->out_fix_pub, osd->current_buffer, osd->current_traces); + osd->current_traces.clear(); reload_fix_buffer(*osd); } } } } -void OrderManager::reload_fix_buffer(SessionServicesData &osd) { - if (osd.free_buffers.size()) { - osd.current_buffer = osd.free_buffers.back(); - osd.free_buffers.pop_back(); +void OrderManager::reload_fix_buffer(SessionServicesData &dt) { + if (dt.free_buffers.size()) { + dt.current_buffer = dt.free_buffers.back(); + dt.free_buffers.pop_back(); } else { LOG(OrderMan, Warn, "Ran out of fix buffers in {}. Will allocate directly. " "This will have an impact on performance", - osd.cfg.name()); - osd.current_buffer = std::make_shared(osd.cfg); + dt.cfg.name()); + dt.current_buffer = std::make_shared(dt.cfg); } } -void OrderManager::on_poll() { - for (auto &osd : me->services_data.sessions) - osd->gw.dispatch_incoming_fix_messages(); -} - } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index a8ec11582..3b6d403a9 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -4,17 +4,16 @@ #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/actors/Actor.h" #include "lib/mercury/actors/IPollableActor.h" +#include "lib/utils/inplace_function.h" #include "lib/orderman/events/ActivateOrderEvent.h" +#include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" -#include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/utils/inplace_function.h" #include // fwd namespace bts { -namespace trace {class PerfLog;} namespace mercury { class TimerEvent; } @@ -27,14 +26,13 @@ class CancelOrderEvent; class CrackOrderEvent; class StoredOrderEvent; class StoredFillEvent; -class OrderServices; class CreateFIXBufferReplyEvent; class GatewayStatusChangeEvent; class NewAdminDataEvent; struct SessionServicesData; class DynamicOrderRegistry; -} // namespace orderman -} // namespace bts +} +} namespace bts { namespace orderman { @@ -51,6 +49,8 @@ namespace orderman { // - security creation events // - timer updates // - order state changes +// - order update/cancel/crack events +// // // Additionally handles order maintenance events: // - create @@ -58,16 +58,16 @@ namespace orderman { // - crack // - update -class OrderManager : public mercury::Actor, public mercury::IPollableActor { +class OrderManager : public mercury::Actor, + public mercury::IPollableActor +{ public: - OrderManager(DynamicOrderRegistry const &dyn_order_builder, trace::PerfLog &); + OrderManager(DynamicOrderRegistry const&dyn_order_builder); ~OrderManager(); void init() override; private: friend class OrderServices; - - // external events void on_securities(const mercury::Update &); void on_fill_recovery(const mercury::Update &); void on_order_recovery(const mercury::Update &); @@ -80,22 +80,34 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void on_gateway_state(const mercury::Update &); void on_timer(const mercury::Update &); void on_admin_data(const mercury::Update &); - void on_poll() override; - // end external events void init_order_services(); + void on_poll() override; + + using PendingOrderEvent = stdext::inplace_function< + void(OrderManager &), + std::max({128ul, sizeof(ActivateOrderEvent), sizeof(UpdateOrderEvent), + sizeof(CancelOrderEvent), sizeof(CrackOrderEvent)})>; + + template + void queue_order_event(EV const&ev) { + queue_order_event(PendingOrderEvent( [ev] (auto &om) { + om.handle_order_event(ev); + })); + } + void queue_order_event(PendingOrderEvent const&ev); + void handle_order_event(ActivateOrderEvent const &); + void handle_order_event(UpdateOrderEvent const &); + void handle_order_event(CancelOrderEvent const &); + void handle_order_event(CrackOrderEvent const&); void reload_fix_buffer(SessionServicesData &dt); - - void after_event() override; - OrderServices &activate_child(OrderServices &parent, Order &, Price, - Quantity, trace::CorID const &); - - std::vector &free_buffers(std::string const &); + + std::vector &free_buffers(std::string const&); enum class State; struct OrderInfo; struct PImpl; std::unique_ptr me; }; -} // namespace orderman -} // namespace bts +} +} diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index d80f5c274..ac5826b57 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -8,8 +8,6 @@ #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" -#include "lib/tracing/PerfLog.h" -#include #include @@ -19,34 +17,11 @@ namespace orderman { class SessionServices { public: - SessionServices(SessionServices &&ss) { operator=(std::move(ss)); } - - SessionServices(SessionServices const &ss) { operator=(ss); } - SessionServices(SessionServicesData &session_data) - : _exe_reports(*session_data.exe_report_subs), - _cancel_rejects(*session_data.cancel_reject_subs), - _gateway_status(*session_data.gateway_status_subs), - _session_data(&session_data), _gateway_status_sub() {} - - SessionServices &operator=(SessionServices &&src) { - _exe_reports = std::move(src._exe_reports); - _cancel_rejects = std::move(src._cancel_rejects); - _gateway_status = std::move(src._gateway_status); - _session_data = src._session_data; - src._session_data = nullptr; - _gateway_status_sub = src._gateway_status_sub; - return *this; - } - - SessionServices &operator=(SessionServices const &src) { - _exe_reports = src._exe_reports; - _cancel_rejects = src._cancel_rejects; - _gateway_status = src._gateway_status; - _session_data = src._session_data; - _gateway_status_sub = src._gateway_status_sub; - return *this; - } + : exe_reports(*session_data.exe_report_subs), + cancel_rejects(*session_data.cancel_reject_subs), + gateway_status(*session_data.gateway_status_subs), + _session_data(&session_data) {} std::string const &session_name() const { return _session_data->session; } @@ -54,222 +29,122 @@ class SessionServices { return _session_data->cfg; } - void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, - trace::CorID const &trace) { + void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const&f,PerfTrace const&trace) { auto &stream = _session_data->current_buffer->first_stream(); stream.new_msg(mt).append(f); - - if (stream.n_msgs() == 1) - _session_data->current_trace = trace; + _session_data->current_traces.push_back(trace); } - + bool is_gateway_connected() const { return _session_data->gw_connected; } Governor &governor() { return _session_data->governor; } - // Subscriptions - using ExeReportSubID = EventStream::SubID; - using CancelRejectSubID = EventStream::SubID; - - template - ExeReportSubID subscribe_to_exe_report(OrderKey k, CB &&cb) { - return _exe_reports.sub(k, std::forward(cb)); - } - void unsubscribe_from_exe_report(ExeReportSubID sid) { - _exe_reports.unsub(sid); - } - - template - CancelRejectSubID subscribe_to_cancel_reject(OrderKey k, CB &&cb) { - return _cancel_rejects.sub(k, std::forward(cb)); - } - void unsubscribe_from_cancel_reject(CancelRejectSubID sid) { - _cancel_rejects.unsub(sid); - } - - template void subscribe_to_gateway_status(CB &&cb) { - _gateway_status_sub = _gateway_status.sub(std::forward(cb)); - } - void unsubscribe_from_gateway_status() { - _gateway_status.unsub(_gateway_status_sub); - } + EventStream exe_reports; + EventStream cancel_rejects; + EventStream gateway_status; private: - EventStream _exe_reports; - EventStream _cancel_rejects; - EventStream _gateway_status; SessionServicesData *_session_data; - EventStream::SubID - _gateway_status_sub; }; class OrderServices { public: - OrderServices(Order &owner) - : _busy(false), _pending_calls(), _owner(&owner), _data(), - _parent(nullptr), _child_update_cb([](auto const &) {}), - _book_updates(), _settlement_updates(), _time_change(), _sessions(), - _create_order_reply() {} - - void init(OrderServicesData &data, OrderServices &parent) { - _parent = &parent; - init(data); - } - - void init(OrderServicesData &data) { - _data = &data; - _book_updates.init(*data.md_subs); - _settlement_updates.init(*data.settlement_subs); - _time_change.init(*data.time_subs); + OrderServices(Order &owner, OrderServicesData &data) + : book_updates(*data.md_subs), settlement_updates(*data.settlement_subs), + child_updates(*data.child_order_subs), time_change(*data.time_subs), + order_creations(*data.order_creation_subs), _owner(owner), _data(data), + _sessions() { for (auto &sd : data.sessions) - _sessions.emplace_back(*sd); - _create_order_reply.init(*data.order_creation_subs); + _sessions.push_back(std::make_unique(*sd)); } - securities::ISecurityDB &sec_db() { return _data->sec_db; } + EventStream book_updates; + EventStream settlement_updates; + EventStream child_updates; + EventStream time_change; + + securities::ISecurityDB &sec_db() { return _data.sec_db; } mercury::TimeStampStr const &get_time_str() const { - return _data->last_timer_ev.ts_str; + return _data.last_timer_ev.ts_str; } - void log(trace::CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, - uint32_t uint32_2 = 0, const char *txt_1 = "", - uint64_t uint64_1 = 0) { - _data->log.log(cid,entry_kind,uint32_1,uint32_2,txt_1,uint64_1); - } + TimeStamp const &get_time() const { return _data.last_timer_ev.ts; } void report_state(const api::orderman::OrderState &state, - trace::CorID const &trace = trace::CorID()) { + PerfTrace const &trace = PerfTrace()) { - OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), - _owner->definition(), state, trace); - - on_inter_order_call([ev](OrderServices &self) { - self._data->owner.publish(self._data->report_order_state_pub, ev); - if (orderman::in_terminal_state(ev.status)) { - LOG(OrderMan, Info, - "Order {} transitioned to a terminal state. Canceling all " - "subscriptions", - self._owner->key().value()); - self.unsubscribe_from_child_updates(); - self._book_updates.unsub_all(); - self._settlement_updates.unsub_all(); - self._time_change.unsub_all(); - self._create_order_reply.unsub_all(); - } - if (self._parent) - self._parent->_child_update_cb(ev); - }); - } - - Limiter &limiter() { return _data->limiter; } - - SessionServices &get_session_services(std::string const &for_session) { - for (auto &s : _sessions) - if (s.session_name() == for_session) - return s; - bts_assert(false); - } - - // Subscriptions ------------------------------ - using BookSubID = EventStream::SubID; - template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { - return _book_updates.sub(k, std::forward(cb)); - } - void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } - - using SettlementSubID = EventStream::SubID; - template - SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb) { - return _settlement_updates.sub(k, std::forward(cb)); - } - void unsubscribe_from_settlements(SettlementSubID sid) { - _settlement_updates.unsub(sid); - } - - template void subscribe_to_time(CB &&cb) { - _time_change_sub = _time_change.sub(std::forward(cb)); - } - void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); } - - template void subscribe_to_child_updates(CB &&cb) { - _child_update_cb = cb; - } - void unsubscribe_from_child_updates() { - _child_update_cb = [](auto const &) {}; - } - // End Subscriptions ------------------------------ - - private: - friend class OrderBuilder; - - template void on_inter_order_call(C const &c) { - if (_busy) - _pending_calls.emplace_back(c); - else { - _busy = true; - c(*this); - for (size_t i = 0; i < _pending_calls.size(); i++) { - auto c = _pending_calls[i]; - c(*this); - } - _pending_calls.clear(); - _busy = false; + _data.owner.publish(_data.report_order_state_pub, _owner.key(), + _owner.parent_key(), _owner.definition(), state, + trace); + if (orderman::in_terminal_state(state.status())) { + LOG(OrderMan, Info, + "Order {} transitioned to a terminal state. Canceling all " + "subscriptions", + _owner.key().value()); + book_updates.unsub_all(); + child_updates.unsub_all(); + time_change.unsub_all(); } } - IOrderFactory &order_factory() { return _data->order_factory; } + Limiter &limiter() { return _data.limiter; } - using CreateOrderReplySubID = EventStream::SubID; - - template - CreateOrderReplySubID subscribe_to_order_creation_reply(size_t req_id, - CB &&cb) { - return _create_order_reply.sub(req_id, std::forward(cb)); - } - void unsubscribe_from_order_creation_reply(CreateOrderReplySubID sid) { - _create_order_reply.unsub(sid); + SessionServices &get_session_services(std::string const &for_session) { + for (auto &s : _sessions) + if (s->session_name() == for_session) + return *s; + bts_assert(false); } + void schedule_action(std::function const &action) { + _data.owner.schedule_action(action); + } + + private: + friend class OrderBuilder; + IOrderFactory &order_factory() { return _data.order_factory; } + + EventStream order_creations; void send_order_create_req(size_t builder_id, OrderKey pk, api::orderman::OrderDefinition const &def, size_t n_orders) { - _data->owner.publish(_data->create_order_req_pub, builder_id, pk, def, - n_orders); + _data.owner.publish(_data.create_order_req_pub, builder_id, pk, def, + n_orders); } friend class ChildOrder; - OrderServices &activate_child(Order &o, Price p, Quantity q, - trace::CorID const &trace) { - return _data->owner.activate_child(*this, o, p, q, trace); + template void queue_order_op(const OP &op) { + _data.owner.queue_order_event(op); } - void update(Price p, Quantity q, trace::CorID const &trace) { - on_inter_order_call([p, q, trace](OrderServices &self) { - self._owner->on_update(p, q, trace); - }); + void send_activate(Order &o, Price p, Quantity q, PerfTrace const &trace) { + queue_order_op(ActivateOrderEvent{o, p, q, trace}); } - void crack(trace::CorID const &trace) { - on_inter_order_call( - [trace](OrderServices &self) { self._owner->on_crack(trace); }); + void send_activate(Order &o, Price p, Quantity q) { + queue_order_op(ActivateOrderEvent{o, p, q, PerfTrace()}); } - void cancel(trace::CorID const &trace) { - on_inter_order_call( - [trace](OrderServices &self) { self._owner->on_cancel(trace); }); + void send_update(OrderKey k, Price p, Quantity q, PerfTrace const &trace) { + queue_order_op(UpdateOrderEvent{k, p, q, trace}); + } + void send_update(OrderKey k, Price p, Quantity q) { + queue_order_op(UpdateOrderEvent{k, p, q, PerfTrace()}); + } + void send_crack(OrderKey k, PerfTrace const &trace) { + queue_order_op(CrackOrderEvent{k, trace}); + } + void send_crack(OrderKey k) { + queue_order_op(CrackOrderEvent{k, PerfTrace()}); + } + void send_cancel(OrderKey k, PerfTrace const &trace) { + queue_order_op(CancelOrderEvent{k, trace}); + } + void send_cancel(OrderKey k) { + queue_order_op(CancelOrderEvent{k, PerfTrace()}); } - bool _busy; - boost::container::small_vector, 10> - _pending_calls; - Order *_owner; - OrderServicesData *_data; - OrderServices *_parent; - std::function _child_update_cb; - EventStream _book_updates; - EventStream _settlement_updates; - EventStream _time_change; - boost::container::small_vector _sessions; - EventStream::SubID _time_change_sub; - EventStream _create_order_reply; + Order &_owner; + OrderServicesData &_data; + std::vector> _sessions; }; } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index 5b19f6e44..15969fc0e 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -5,18 +5,15 @@ namespace bts { namespace orderman { -OrderServicesData::OrderServicesData(OrderManager &owner, - DynamicOrderRegistry const &b, - trace::PerfLog &l) - : owner(owner), log(l), order_router(), - order_factory(sec_db, order_router, b), +OrderServicesData::OrderServicesData(OrderManager &owner,DynamicOrderRegistry const&b) + : owner(owner), order_router(), order_factory(sec_db, order_router,b), last_timer_ev( Timer::now(), to(datetime::FIX_timestamp(datetime::now()))) { auto &all_connections = config::get().connection(); - for (auto const &c : all_connections) - sessions.push_back(std::make_unique(c, l)); + for (auto const &c : all_connections) + sessions.push_back (std::make_unique(c)); +} +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 06fe8bca2..4b0f86f0b 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -7,10 +7,11 @@ #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/securities/MapSecurityDB.h" +#include "lib/utils/datetime.h" #include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" +#include "lib/orderman/events/SettlementUpdateEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CancelRejectEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" @@ -20,16 +21,15 @@ #include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/GatewayStatusChangeEvent.h" #include "lib/orderman/events/MDRequestEvent.h" +#include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/events/SettlementRequestEvent.h" -#include "lib/orderman/events/SettlementUpdateEvent.h" +#include "lib/orderman/events/OutFIXMsgEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/governor/Governor.h" #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" -#include "lib/utils/datetime.h" +#include "lib/orderman/governor/Governor.h" #include @@ -44,13 +44,19 @@ struct ParentKey { }; struct SessionServicesData { - SessionServicesData(config::JetFIX::Connection const &cfg, trace::PerfLog &log) - : session(cfg.name()), gw_connected(false), cfg(cfg), - governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), - gw(cfg, log) {} + SessionServicesData(config::JetFIX::Connection const&cfg) + : session(cfg.name()), + gw_connected(false), + cfg(cfg), + governor(cfg.max_order_msgs_per_window(), + cfg.window_duration_msecs()) + { + current_traces.reserve(1000); + } std::string session; std::vector free_buffers; + mercury::Stream out_fix_pub; bool gw_connected; config::JetFIX::Connection cfg; std::unique_ptr> @@ -63,34 +69,34 @@ struct SessionServicesData { Governor governor; jetfix::OutFIXPtr current_buffer; - trace::CorID current_trace; - ExecutionGateway gw; - mercury::Stream exe_report_pub; - mercury::Stream gw_status_change_pub; - mercury::Stream cancel_reject_pub; + std::vector current_traces; }; class OrderServicesData { - public: - - OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, - trace::PerfLog &l); - +public: + OrderServicesData(OrderManager &owner,DynamicOrderRegistry const&b); OrderManager &owner; - trace::PerfLog &log; securities::MapSecurityDB sec_db; OrderRouter order_router; Limiter limiter; OrderFactory order_factory; + std::unique_ptr> md_subs; - std::unique_ptr> - settlement_subs; + std::unique_ptr> settlement_subs; + std::unique_ptr< + mercury::ContentSubscription> + child_order_subs; + std::unique_ptr< mercury::ContentSubscription> time_subs; std::unique_ptr> order_creation_subs; + mercury::Stream activate_order_pub; + mercury::Stream update_order_pub; + mercury::Stream cancel_order_pub; + mercury::Stream crack_order_pub; mercury::Stream create_order_req_pub; mercury::Stream create_fix_req_pub; mercury::Stream md_request_pub; @@ -107,5 +113,5 @@ class OrderServicesData { bts_assert(false); } }; -} // namespace orderman -} // namespace bts +} +} diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib/orderman/events/ActivateOrderEvent.h index 91f0f5f46..874b79f99 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib/orderman/events/ActivateOrderEvent.h @@ -4,7 +4,6 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -19,14 +18,14 @@ public: order (&o),price(p),quantity(q), trace() {} - ActivateOrderEvent (Order &o,Price p, Quantity q,trace::CorID trace) : + ActivateOrderEvent (Order &o,Price p, Quantity q,PerfTrace trace) : order (&o),price(p),quantity(q), trace(trace) {} Order* order; Price price; Quantity quantity; - trace::CorID trace; + PerfTrace trace; }; }} diff --git a/src/lib/orderman/events/BookUpdateEvent.h b/src/lib/orderman/events/BookUpdateEvent.h index bf71357a8..cd2fe6aa1 100644 --- a/src/lib/orderman/events/BookUpdateEvent.h +++ b/src/lib/orderman/events/BookUpdateEvent.h @@ -5,7 +5,6 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -14,10 +13,10 @@ class BookUpdateEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; Book book; - trace::CorID trace; + PerfTrace trace; SecurityKey key() const { return book.security_key(); } - BookUpdateEvent(const Book &b, trace::CorID const &trace) + BookUpdateEvent(const Book &b, PerfTrace const &trace) : book(b), trace(trace) {} }; } diff --git a/src/lib/orderman/events/CancelOrderEvent.h b/src/lib/orderman/events/CancelOrderEvent.h index cdc2fa563..9593dcd3c 100644 --- a/src/lib/orderman/events/CancelOrderEvent.h +++ b/src/lib/orderman/events/CancelOrderEvent.h @@ -4,7 +4,6 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -15,12 +14,12 @@ public: using SynopsisPolicy = mercury::NoSynopsis; CancelOrderEvent (OrderKey k) : k (k), trace() {} - CancelOrderEvent (OrderKey k,trace::CorID const&trace) : k (k), trace(trace) {} + CancelOrderEvent (OrderKey k,PerfTrace const&trace) : k (k), trace(trace) {} // used by ContentSubscription OrderKey key() const {return k;} OrderKey k; - trace::CorID trace; + PerfTrace trace; }; }} diff --git a/src/lib/orderman/events/CancelRejectEvent.cpp b/src/lib/orderman/events/CancelRejectEvent.cpp index 00f60fde9..10fcf5bfc 100644 --- a/src/lib/orderman/events/CancelRejectEvent.cpp +++ b/src/lib/orderman/events/CancelRejectEvent.cpp @@ -1,5 +1,6 @@ #include "CancelRejectEvent.h" namespace bts { -namespace orderman {} -} // namespace bts +namespace orderman { + +}} diff --git a/src/lib/orderman/events/CrackOrderEvent.h b/src/lib/orderman/events/CrackOrderEvent.h index 115826241..833df23ba 100644 --- a/src/lib/orderman/events/CrackOrderEvent.h +++ b/src/lib/orderman/events/CrackOrderEvent.h @@ -4,7 +4,6 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -16,13 +15,13 @@ class CrackOrderEvent : public mercury::Event { CrackOrderEvent(OrderKey k) : k(k), trace() {} - CrackOrderEvent(OrderKey k, trace::CorID const &trace) + CrackOrderEvent(OrderKey k, PerfTrace const &trace) : k(k), trace(trace) {} // used by ContentSubscription OrderKey key() const { return k; } OrderKey k; - trace::CorID trace; + PerfTrace trace; }; } } diff --git a/src/lib/orderman/events/NewExecutionReportEvent.cpp b/src/lib/orderman/events/NewExecutionReportEvent.cpp index ae949d917..54b32a164 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.cpp +++ b/src/lib/orderman/events/NewExecutionReportEvent.cpp @@ -1,5 +1,7 @@ #include "NewExecutionReportEvent.h" namespace bts { -namespace orderman {} -} // namespace bts +namespace orderman { + + +}} diff --git a/src/lib/orderman/events/NewExecutionReportEvent.h b/src/lib/orderman/events/NewExecutionReportEvent.h index 87fb02224..c1971d4ce 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.h +++ b/src/lib/orderman/events/NewExecutionReportEvent.h @@ -7,8 +7,6 @@ #include "lib/mercury/synopsis/CacheAll.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" - #include #include @@ -21,10 +19,10 @@ class NewExecutionReportEvent : public mercury::Event { using Tag = GatewayName; using SynopsisPolicy = mercury::CacheAll; ExecutionReport const *data; - trace::CorID trace; + PerfTrace trace; // used by ContentSubscription OrderKey key() const { return data->order_key; } - NewExecutionReportEvent(const ExecutionReport *dt, trace::CorID const &trace) + NewExecutionReportEvent(const ExecutionReport *dt, PerfTrace const &trace) : data(dt), trace(trace){}; }; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 1083866ba..5e888040c 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -2,11 +2,10 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/PerfTrace.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/tracing/PerfLog.h" - #include +#include "lib/api/services/OrderService.pb.h" + namespace bts { namespace orderman { @@ -16,7 +15,7 @@ class OrderStateUpdateEvent : public mercury::Event { OrderStateUpdateEvent(OrderKey key, OrderKey parent_key, api::orderman::OrderDefinition const &def, api::orderman::OrderState const &state, - trace::CorID const &trace = trace::CorID()) + PerfTrace const &trace = PerfTrace()) : key(key), parent_key(parent_key), trace(trace), definition(&def) { status = state.status(); @@ -52,7 +51,7 @@ class OrderStateUpdateEvent : public mercury::Event { double avg_price; std::string last_msg; - trace::CorID trace; + PerfTrace trace; api::orderman::OrderState::CustomCase custom; // native order state diff --git a/src/lib/orderman/events/OutFIXMsgEvent.h b/src/lib/orderman/events/OutFIXMsgEvent.h new file mode 100644 index 000000000..5b0556fba --- /dev/null +++ b/src/lib/orderman/events/OutFIXMsgEvent.h @@ -0,0 +1,32 @@ +#pragma once +#include "lib/jetfix/common/OutFIXPtr.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/mercury/events/Event.h" +#include "lib/mercury/synopsis/CacheAll.h" + + +namespace bts { +namespace orderman { + +class OutFIXMsgEvent : public mercury::Event { +public: + using Tag = GatewayName; + + // there is no need to store synopsis for this event because no one + // should be sending fix events (OutFIXMsgEvent) until they receive + // an event from the FIX gateway regarding the status of the FIX + // connection. Receipt of this connection event guarantees to + // potential publishers of OutFIXMsgEvent that the gateway is + // already subscribed to OutFIXMsgEvent and so no events will be + // missed. + using SynopsisPolicy = mercury::NoSynopsis; + + OutFIXMsgEvent (jetfix::OutFIXPtr const&fix,std::vector const&traces) : + msg(fix),trace(traces[0]) + {} + + jetfix::OutFIXPtr msg; + PerfTrace trace; +}; + +}} diff --git a/src/lib/orderman/events/UpdateOrderEvent.h b/src/lib/orderman/events/UpdateOrderEvent.h index c514c9649..80c0f3c54 100644 --- a/src/lib/orderman/events/UpdateOrderEvent.h +++ b/src/lib/orderman/events/UpdateOrderEvent.h @@ -4,7 +4,6 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -18,7 +17,7 @@ public: k(k), price(p), quantity(q), trace() {} - UpdateOrderEvent (OrderKey k, Price p, Quantity q,trace::CorID const&trace) : + UpdateOrderEvent (OrderKey k, Price p, Quantity q,PerfTrace const&trace) : k(k), price(p), quantity(q), trace(trace) {} @@ -28,7 +27,7 @@ public: OrderKey k; Price price; Quantity quantity; - trace::CorID trace; + PerfTrace trace; }; }} diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index e25807d7c..ae8395f9f 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -1,91 +1,77 @@ #include "LimitStore.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ -LimitStore::LimitStore(const bts::api::admin::AdminData &admin_data, - const std::map &sec_map) - : _admin_data(bts::admin::AdminServiceUtils::sort_limits(admin_data)), - _account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) { - for (auto it = sec_map.begin(); it != sec_map.end(); it++) { - const api::Security &security = *(it->second); +LimitStore::LimitStore(const bts::api::admin::AdminData& admin_data, + const std::map& sec_map) +: +_admin_data (bts::admin::AdminServiceUtils::sort_limits(admin_data)), +_account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) +{ + for(auto it=sec_map.begin(); it!=sec_map.end(); it++){ + const api::Security& security = *(it->second); _add_product_entry(security, _admin_data); - } - for (auto it = sec_map.begin(); it != sec_map.end(); it++) { + } + for(auto it=sec_map.begin(); it!=sec_map.end(); it++){ // pos limit - const api::Security &security = *(it->second); - ProductLimitTree *product_tree_ptr = _find_product_for_security(security); - bts_assert(product_tree_ptr != nullptr); - _sec_map.insert(std::pair( - security.id(), SecurityLimitTree(security, *product_tree_ptr, - _admin_data, _zero_security_limit))); + const api::Security& security = *(it->second); + ProductLimitTree* product_tree_ptr = _find_product_for_security (security); + bts_assert(product_tree_ptr!=nullptr); + _sec_map.insert(std::pair(security.id(),SecurityLimitTree(security, *product_tree_ptr, _admin_data, _zero_security_limit))); } _set_user_data(); } -void LimitStore::copy_positions_from(LimitStore &source) { +void LimitStore::copy_positions_from(LimitStore& source){ // copy securities - for (auto it = _sec_map.begin(); it != _sec_map.end(); it++) { - SecurityLimitTree *source_security_limit_tree = - source._find_security(it->first); - if (source_security_limit_tree != nullptr) + for (auto it=_sec_map.begin(); it!=_sec_map.end(); it++){ + SecurityLimitTree* source_security_limit_tree = source._find_security(it->first); + if(source_security_limit_tree != nullptr) it->second.copy_positions_from(*source_security_limit_tree); } } -void LimitStore::_add_product_entry( - const api::Security &security, - const bts::api::admin::AdminData &admin_data) { - ProductLimitTree *product_tree_ptr = _find_product_for_security(security); - if (product_tree_ptr == nullptr) { +void LimitStore::_add_product_entry(const api::Security& security, + const bts::api::admin::AdminData& admin_data){ + ProductLimitTree* product_tree_ptr = _find_product_for_security(security); + if (product_tree_ptr==nullptr){ api::Product product; - product.set_exchange(security.exchange()); - product.set_type(bts::admin::AdminServiceUtils::security_type(security)); - product.set_symbol(security.symbol()); - _prod_map.emplace_back(product, admin_data, _zero_product_limit); + product.set_exchange(security.exchange()); product.set_type(bts::admin::AdminServiceUtils::security_type(security)); product.set_symbol(security.symbol()); + _prod_map.emplace_back(product, admin_data, _zero_product_limit); } } -void LimitStore::_set_user_data() { - for (const auto &user : _admin_data.users()) { - if (user.is_present()) { +void LimitStore::_set_user_data (){ + for(const auto& user : _admin_data.users()){ + if (user.is_present()){ UserData user_data; user_data.user = &user; - bts::admin::AdminServiceUtils::find_user_trading_accounts( - _admin_data, user.id(), user_data.accounts); - _user_data_map.insert( - std::pair(user.id(), user_data)); + bts::admin::AdminServiceUtils::find_user_trading_accounts(_admin_data, user.id(), user_data.accounts); + _user_data_map.insert(std::pair(user.id(), user_data)); } + } +} +ProductLimitTree* LimitStore::_find_product_for_security(const api::Security& security){ + api::Product product; + product.set_exchange(security.exchange()); product.set_type(bts::admin::AdminServiceUtils::security_type(security)); product.set_symbol(security.symbol()); + return _find_product(product); } -} -ProductLimitTree * -LimitStore::_find_product_for_security(const api::Security &security) { - api::Product product; - product.set_exchange(security.exchange()); - product.set_type(bts::admin::AdminServiceUtils::security_type(security)); - product.set_symbol(security.symbol()); - return _find_product(product); -} -ProductLimitTree *LimitStore::_find_product(const api::Product &product) { - for (ProductLimitTree &plt : _prod_map) - if (product.exchange() == plt.product().exchange() && - product.type() == plt.product().type() && - product.symbol() == plt.product().symbol()) +ProductLimitTree* LimitStore::_find_product(const api::Product& product){ + for(ProductLimitTree& plt : _prod_map) + if(product.exchange() == plt.product().exchange() && product.type() == plt.product().type() && product.symbol() == plt.product().symbol()) return &plt; return nullptr; } -const SecurityLimitNode * -LimitStore::test_only_func_find_security_node(AccountID account_id, - uint32_t security_id) { - const SecurityLimitTree *sec_data = _find_security(security_id); - if (sec_data != nullptr) +const SecurityLimitNode* LimitStore::test_only_func_find_security_node(AccountID account_id, + uint32_t security_id){ + const SecurityLimitTree* sec_data = _find_security(security_id); + if(sec_data != nullptr) return sec_data->find_account(account_id.value()); return nullptr; } -const ProductLimitNode * -LimitStore::test_only_func_find_product_node(AccountID account_id, - const api::Product &product) { - ProductLimitTree *prod_data = _find_product(product); - if (prod_data != nullptr) +const ProductLimitNode* LimitStore::test_only_func_find_product_node(AccountID account_id, + const api::Product& product){ + ProductLimitTree* prod_data = _find_product(product); + if(prod_data != nullptr) return prod_data->find_account(account_id.value()); return nullptr; } -} // namespace orderman -} // namespace bts \ No newline at end of file +}} \ No newline at end of file diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index bfa21a12c..713672a5d 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -1,131 +1,144 @@ #include "Limiter.h" #include "LimitStore.h" -#include "lib/api/services/AdminService.server.pb.h" #include "lib/domain_model/Security.pb.h" +#include "lib/api/services/AdminService.server.pb.h" namespace bts { namespace orderman { struct Limiter::PImpl { - std::map sec_map; + std::map sec_map; std::unique_ptr limit_store; PImpl() - : sec_map(), limit_store(std::make_unique( - bts::api::admin::AdminData(), sec_map)) {} + : + sec_map(), + limit_store(std::make_unique(bts::api::admin::AdminData(), + sec_map)) + { + } }; Limiter::Limiter() : me(new PImpl()) {} Limiter::~Limiter() {} -void Limiter::update(api::admin::AdminData const &admin_data) { +void Limiter::update(api::admin::AdminData const& admin_data) { LOG(OrderMan, Info, "Limiter::update"); _reset(admin_data); } -void Limiter::add_securities( - std::vector const &new_securities) { +void Limiter::add_securities(std::vector const& new_securities){ LOG(OrderMan, Info, "Limiter::add_securities {} securities", - me->sec_map.size()); - for (const api::Security *s : new_securities) + me->sec_map.size()); + for(const api::Security* s : new_securities) _add_security(s); _reset(me->limit_store->admin_data()); } -void Limiter::add_security(api::Security const &security) { +void Limiter::add_security(api::Security const & security) { _add_security(&security); _reset(me->limit_store->admin_data()); } -void Limiter::add(api::Security const &security, AccountID account_id, - api::Side side, Quantity quantity) { +void Limiter::add(api::Security const &security, + AccountID account_id, + api::Side side, + Quantity quantity){ if (!_contains_security(&security)) add_security(security); - if (!me->limit_store->has_account(account_id)) { + if (!me->limit_store->has_account(account_id)){ // add a temporary account, so trades can go in there _add_account_and_reset(account_id); } me->limit_store->add_position(security, account_id, side, quantity); } -void Limiter::remove(api::Security const &security, AccountID account_id, - api::Side side, Quantity quantity) { +void Limiter::remove(api::Security const &security, + AccountID account_id, + api::Side side, + Quantity quantity) { if (!_contains_security(&security)) add_security(security); - if (!me->limit_store->has_account(account_id)) { + if (!me->limit_store->has_account(account_id)){ _add_account_and_reset(account_id); } me->limit_store->remove_position(security, account_id, side, quantity); } -void Limiter::add(const api::Security &security, - const std::string &account_name, api::Side side, - Quantity quantity) { - const auto *acct_ptr = bts::admin::AdminServiceUtils::find_account( - me->limit_store->admin_data(), account_name); - if (acct_ptr == nullptr) +void Limiter::add(const api::Security& security, + const std::string& account_name, + api::Side side, + Quantity quantity){ + const auto* acct_ptr= + bts::admin::AdminServiceUtils::find_account(me->limit_store->admin_data(), + account_name); + if(acct_ptr==nullptr) LOG(OrderMan, Error, "Limiter::add can not find account:{}", - account_name); + account_name); else - add(security, AccountID(acct_ptr->id()), side, quantity); + add(security,AccountID(acct_ptr->id()),side,quantity); } -void Limiter::remove(const api::Security &security, - const std::string &account_name, api::Side side, - Quantity quantity) { - const auto *acct_ptr = bts::admin::AdminServiceUtils::find_account( - me->limit_store->admin_data(), account_name); - if (acct_ptr == nullptr) +void Limiter::remove(const api::Security& security, + const std::string& account_name, + api::Side side, + Quantity quantity){ + const auto* acct_ptr= + bts::admin::AdminServiceUtils::find_account(me->limit_store->admin_data(), + account_name); + if(acct_ptr==nullptr) LOG(OrderMan, Error, "Limiter::remove can not find account:{}", - account_name); + account_name); else - remove(security, AccountID(acct_ptr->id()), side, quantity); + remove(security,AccountID(acct_ptr->id()),side,quantity); } Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); return rv; } -Limiter::LimiterQueryResult -Limiter::can_send_new_order(AccountID account_id, api::Security const &security, - api::Side side, Quantity quantity) const { - LimiterQueryResult rv = me->limit_store->can_send_new_order( - account_id, security, side, quantity); - // rv.ok = true; +Limiter::LimiterQueryResult Limiter::can_send_new_order(AccountID account_id, + api::Security const & security, + api::Side side, + Quantity quantity) const { + LimiterQueryResult rv = me->limit_store->can_send_new_order(account_id, + security, + side, + quantity); + //rv.ok = true; return rv; } -Limiter::LimiterQueryResult -Limiter::can_update_order(AccountID account_id, api::Security const &security, - api::Side side, Quantity from, Quantity to) const { +Limiter::LimiterQueryResult Limiter::can_update_order(AccountID account_id, + api::Security const & security, + api::Side side, + Quantity from, + Quantity to) const { LimiterQueryResult rv; - if (from == to) - rv.ok = true; - else - rv = me->limit_store->can_update_order(account_id, security, side, from, - to); + if (from == to) + rv.ok = true ; + else + rv = me->limit_store->can_update_order(account_id, security, side, from, to); return rv; } -void Limiter::_add_account_and_reset(AccountID account_id) { - bts::api::admin::AdminData admin_data_catchup = - me->limit_store->admin_data(); - bts::api::admin::BTSAccount *new_account = - admin_data_catchup.mutable_accounts()->Add(); +void Limiter::_add_account_and_reset(AccountID account_id){ + bts::api::admin::AdminData admin_data_catchup = me->limit_store->admin_data(); + bts::api::admin::BTSAccount* new_account = admin_data_catchup.mutable_accounts()->Add(); new_account->set_id(account_id.value()); new_account->set_is_active(true); update(admin_data_catchup); } -void Limiter::_reset(const bts::api::admin::AdminData &admin_data) { - LimitStore *new_store = new LimitStore(admin_data, me->sec_map); +void Limiter::_reset (const bts::api::admin::AdminData& admin_data){ + LimitStore* new_store = new LimitStore(admin_data, me->sec_map); new_store->copy_positions_from(*me->limit_store); me->limit_store.reset(new_store); } -void Limiter::_add_security(const api::Security *sec) { - if (!_contains_security(sec)) { - me->sec_map.insert( - std::pair(sec->id(), sec)); +void Limiter::_add_security (const api::Security* sec){ + if (!_contains_security(sec)){ + me->sec_map.insert(std::pair(sec->id(), sec)); if (sec->has_spread()) - for (const auto &leg : sec->spread().legs()) + for(const auto& leg : sec->spread().legs()) _add_security(&leg.security()); } } -bool Limiter::_contains_security(const api::Security *security) { +bool Limiter::_contains_security (const api::Security* security){ return me->sec_map.find(security->id()) != me->sec_map.end(); } -LimitStore &Limiter::limit_store() { return *me->limit_store; } -} // namespace orderman -} // namespace bts +LimitStore& Limiter::limit_store(){ + return *me->limit_store; +} +}} diff --git a/src/lib/orderman/limiter/ProductLimitNode.cpp b/src/lib/orderman/limiter/ProductLimitNode.cpp index 5e78bed62..a6ee36784 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.cpp +++ b/src/lib/orderman/limiter/ProductLimitNode.cpp @@ -1,18 +1,21 @@ #include "ProductLimitNode.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ + +ProductLimitNode::ProductLimitNode(uint32_t account_id, + uint32_t, // parent_account_id, + const bts::api::admin::AccountProductPositionLimitUnit& limit, + bool enforce_net) + : + _account_id(account_id), + //_parent_account_id(parent_account_id), + _limit(limit), + _enforce_net(enforce_net), + _long_pos_limit (limit.long_position_limit()), + _short_pos_limit (limit.short_position_limit()), + _long_pos(0), + _short_pos(0) + {} +}} -ProductLimitNode::ProductLimitNode( - uint32_t account_id, - uint32_t, // parent_account_id, - const bts::api::admin::AccountProductPositionLimitUnit &limit, - bool enforce_net) - : _account_id(account_id), - //_parent_account_id(parent_account_id), - _limit(limit), _enforce_net(enforce_net), - _long_pos_limit(limit.long_position_limit()), - _short_pos_limit(limit.short_position_limit()), _long_pos(0), - _short_pos(0) {} -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/limiter/ProductLimitTree.cpp b/src/lib/orderman/limiter/ProductLimitTree.cpp index 1df2aa4ea..bab765af6 100644 --- a/src/lib/orderman/limiter/ProductLimitTree.cpp +++ b/src/lib/orderman/limiter/ProductLimitTree.cpp @@ -1,27 +1,23 @@ #include "ProductLimitTree.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ -ProductLimitTree::ProductLimitTree( - const api::Product &product, const bts::api::admin::AdminData &admin_data, - const bts::api::admin::AccountProductPositionLimitUnit &zero_limit) - : _product(product) { - for (const auto &account : admin_data.accounts()) { - bool enforce_net = true; // default is net - if (account.has_risk_limit_enforcement()) - enforce_net = - account.risk_limit_enforcement().product_limit_in_net_terms(); - const bts::api::admin::AccountProductPositionLimitUnit *limit = - bts::admin::AdminServiceUtils::find_account_product_position_limit( - account, _product); - _tree.emplace_back( - account.id(), - bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) - ? account.parent_account_id() - : 0, - limit != nullptr ? *limit : zero_limit, enforce_net); +ProductLimitTree::ProductLimitTree(const api::Product& product, + const bts::api::admin::AdminData& admin_data, + const bts::api::admin::AccountProductPositionLimitUnit& zero_limit) +: +_product (product) +{ + for(const auto& account : admin_data.accounts()){ + bool enforce_net=true; // default is net + if(account.has_risk_limit_enforcement()) + enforce_net=account.risk_limit_enforcement().product_limit_in_net_terms(); + const bts::api::admin::AccountProductPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_product_position_limit(account, _product); + _tree.emplace_back(account.id(), + bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, + limit != nullptr ? *limit : zero_limit, + enforce_net); } } -} // namespace orderman -} // namespace bts \ No newline at end of file +}} \ No newline at end of file diff --git a/src/lib/orderman/limiter/SecurityLimitNode.cpp b/src/lib/orderman/limiter/SecurityLimitNode.cpp index 9fbb209b0..bc7e12298 100644 --- a/src/lib/orderman/limiter/SecurityLimitNode.cpp +++ b/src/lib/orderman/limiter/SecurityLimitNode.cpp @@ -3,18 +3,22 @@ namespace bts { namespace orderman { -SecurityLimitNode::SecurityLimitNode( - uint32_t account_id, - uint32_t, // parent_account_id, - const bts::api::admin::AccountSecurityPositionLimitUnit &limit, - bool apply_sec_position_limits, ProductLimitNode &product_node, - uint32_t clip_size) - : _account_id(account_id), - //_parent_account_id(parent_account_id), - _limit(limit), _long_pos_limit(limit.long_position_limit()), - _short_pos_limit(-1 * limit.short_position_limit()), - _apply_sec_position_limits(apply_sec_position_limits), - _product_node(product_node), _clip_size(clip_size), _net_pos(0) {} +SecurityLimitNode::SecurityLimitNode(uint32_t account_id, + uint32_t, // parent_account_id, + const bts::api::admin::AccountSecurityPositionLimitUnit& limit, + bool apply_sec_position_limits, + ProductLimitNode& product_node, + uint32_t clip_size) + : + _account_id(account_id), + //_parent_account_id(parent_account_id), + _limit(limit), + _long_pos_limit (limit.long_position_limit()), + _short_pos_limit (-1 * limit.short_position_limit()), + _apply_sec_position_limits (apply_sec_position_limits), + _product_node(product_node), + _clip_size(clip_size), + _net_pos(0) +{} -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/limiter/SecurityLimitTree.cpp b/src/lib/orderman/limiter/SecurityLimitTree.cpp index a0a150961..68c4cbd9d 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.cpp +++ b/src/lib/orderman/limiter/SecurityLimitTree.cpp @@ -1,30 +1,20 @@ #include "lib/orderman/limiter/SecurityLimitTree.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ -SecurityLimitTree::SecurityLimitTree( - const api::Security &security, ProductLimitTree &product_tree, - const bts::api::admin::AdminData &admin_data, - const bts::api::admin::AccountSecurityPositionLimitUnit &zero_limit) { - for (const auto &account : admin_data.accounts()) { - ProductLimitNode *product_node_ptr = - product_tree.find_account(account.id()); +SecurityLimitTree::SecurityLimitTree(const api::Security& security, + ProductLimitTree& product_tree, + const bts::api::admin::AdminData& admin_data, + const bts::api::admin::AccountSecurityPositionLimitUnit& zero_limit) +{ + for(const auto& account : admin_data.accounts()){ + ProductLimitNode* product_node_ptr = product_tree.find_account(account.id()); bts_assert(product_node_ptr != nullptr); - const bts::api::admin::AccountSecurityPositionLimitUnit *limit = - bts::admin::AdminServiceUtils::find_account_security_position_limit( - account, security); - uint32_t clip_size = - bts::admin::AdminServiceUtils::find_account_security_clip_size( - account, security); - _tree.emplace_back( - account.id(), - bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) - ? account.parent_account_id() - : 0, - limit != nullptr ? *limit : zero_limit, limit != nullptr, - *product_node_ptr, clip_size); + const bts::api::admin::AccountSecurityPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_security_position_limit(account, security); + uint32_t clip_size = bts::admin::AdminServiceUtils::find_account_security_clip_size(account, security); + _tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, + limit != nullptr ? *limit : zero_limit, limit != nullptr, *product_node_ptr, clip_size); } } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/limiter/tests/limit_tests.cpp b/src/lib/orderman/limiter/tests/limit_tests.cpp index a6b89a7f2..394265d3f 100644 --- a/src/lib/orderman/limiter/tests/limit_tests.cpp +++ b/src/lib/orderman/limiter/tests/limit_tests.cpp @@ -1,71 +1,63 @@ #include "catch/catch.hpp" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/config/config.h" -#include "lib/domain_model/Security.h" +#include #include "lib/orderman/limiter/LimitStore.h" #include "lib/orderman/limiter/Limiter.h" +#include "lib/api/services/AdminService.server.pb.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/domain_model/Security.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/helper_macros.h" -#include +#include "lib/config/config.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ -void add_account_prod_pos_limit(bts::api::admin::AdminData &admin_data, - const std::string &account_name, +void add_account_prod_pos_limit(bts::api::admin::AdminData& admin_data, + const std::string& account_name, api::Venue prod_exchange, api::SecurityType prod_type, - const std::string &prod_symbol, + const std::string& prod_symbol, uint32_t long_pos_limit, - uint32_t short_pos_limit) { - auto account_ptr = - bts::admin::AdminServiceUtils::find_account(admin_data, account_name); - REQUIRE(account_ptr != nullptr); + uint32_t short_pos_limit){ + auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, account_name); + REQUIRE(account_ptr!=nullptr); bts::api::admin::ProductScope prod_scope; prod_scope.set_exchange(prod_exchange); prod_scope.set_security_type(prod_type); - prod_scope.set_security_symbol(prod_symbol); - auto new_prod_pos_limit_ptr = - account_ptr->mutable_product_position_limits()->Add(); + prod_scope.set_security_symbol(prod_symbol); + auto new_prod_pos_limit_ptr = account_ptr->mutable_product_position_limits()->Add(); new_prod_pos_limit_ptr->mutable_product()->CopyFrom(prod_scope); new_prod_pos_limit_ptr->set_long_position_limit(long_pos_limit); new_prod_pos_limit_ptr->set_short_position_limit(short_pos_limit); } -void add_account_security_pos_limit(bts::api::admin::AdminData &admin_data, - const std::string &account_name, +void add_account_security_pos_limit(bts::api::admin::AdminData& admin_data, + const std::string& account_name, api::Venue sec_exchange, api::SecurityType sec_type, - const std::string &sec_symbol, - uint32_t sec_id, // 0 for unset + const std::string& sec_symbol, + uint32_t sec_id, //0 for unset uint32_t long_pos_limit, - uint32_t short_pos_limit) { - auto account_ptr = - bts::admin::AdminServiceUtils::find_account(admin_data, account_name); - REQUIRE(account_ptr != nullptr); + uint32_t short_pos_limit){ + auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, account_name); + REQUIRE(account_ptr!=nullptr); bts::api::admin::SecurityScope sec_scope; sec_scope.set_exchange(sec_exchange); sec_scope.set_security_type(sec_type); sec_scope.set_security_symbol(sec_symbol); - if (sec_id != 0) + if(sec_id != 0) sec_scope.set_security_id(sec_id); - auto new_sec_pos_limit_ptr = - account_ptr->mutable_security_position_limits()->Add(); + auto new_sec_pos_limit_ptr = account_ptr->mutable_security_position_limits()->Add(); new_sec_pos_limit_ptr->mutable_security()->CopyFrom(sec_scope); new_sec_pos_limit_ptr->set_long_position_limit(long_pos_limit); new_sec_pos_limit_ptr->set_short_position_limit(short_pos_limit); } -void add_account_sec_pos_limit(bts::api::admin::BTSAccount &account, - api::Venue exchange, api::SecurityType sec_type, - const std::string &sec_symbol, uint32_t sec_id, - bool sec_id_set, uint32_t long_pos_limit, - uint32_t short_pos_limit) { +void add_account_sec_pos_limit(bts::api::admin::BTSAccount& account, + api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, + uint32_t long_pos_limit, uint32_t short_pos_limit){ bts::api::admin::SecurityScope scope; - scope.set_exchange(exchange); - scope.set_security_type(sec_type); - scope.set_security_symbol(sec_symbol); + scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); if (sec_id_set) scope.set_security_id(sec_id); auto new_limit = account.add_security_position_limits(); @@ -74,14 +66,11 @@ void add_account_sec_pos_limit(bts::api::admin::BTSAccount &account, new_limit->set_short_position_limit(short_pos_limit); } -void add_account_sec_clip_size(bts::api::admin::BTSAccount &account, - api::Venue exchange, api::SecurityType sec_type, - const std::string &sec_symbol, uint32_t sec_id, - bool sec_id_set, uint32_t clip_size) { +void add_account_sec_clip_size(bts::api::admin::BTSAccount& account, + api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, + uint32_t clip_size){ bts::api::admin::SecurityScope scope; - scope.set_exchange(exchange); - scope.set_security_type(sec_type); - scope.set_security_symbol(sec_symbol); + scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); if (sec_id_set) scope.set_security_id(sec_id); auto new_limit = account.mutable_security_clip_limits()->add_limit(); @@ -89,95 +78,69 @@ void add_account_sec_clip_size(bts::api::admin::BTSAccount &account, new_limit->set_clip_size(clip_size); } -void fill_future_security(api::Security &sec, uint32_t key, - const std::string &symbol, api::Venue exchange, - uint32_t expiration_year, uint32_t expiration_month, - uint32_t expiration_day, double tick_size) { - sec.set_id(key); - sec.set_symbol(symbol); - sec.set_exchange(exchange); +void fill_future_security (api::Security& sec, + uint32_t key, const std::string& symbol, api::Venue exchange, + uint32_t expiration_year, uint32_t expiration_month, uint32_t expiration_day, + double tick_size) +{ + sec.set_id (key); + sec.set_symbol (symbol); + sec.set_exchange (exchange); api::FutureContract fc; fc.set_expiration_year(expiration_year); fc.set_expiration_month(expiration_month); fc.set_expiration_day(expiration_day); - sec.mutable_future()->MergeFrom(fc); + sec.mutable_future()->MergeFrom (fc); api::ContractSpecification c_spec; - c_spec.set_low_tick(tick_size); - c_spec.set_high_tick(tick_size); - sec.mutable_contract_spec()->MergeFrom(c_spec); + c_spec.set_low_tick (tick_size); + c_spec.set_high_tick (tick_size); + sec.mutable_contract_spec()->MergeFrom (c_spec); } -void verify_security_limit_data(SecurityLimitNode const *acc_sec_state, - uint32_t expected_long_limit, - uint32_t expected_short_limit, - int expected_net_pos) { +void verify_security_limit_data(SecurityLimitNode const* acc_sec_state, + uint32_t expected_long_limit, uint32_t expected_short_limit, + int expected_net_pos){ REQUIRE(acc_sec_state != nullptr); - REQUIRE(acc_sec_state->test_only_func_limit().long_position_limit() == - expected_long_limit); - REQUIRE(acc_sec_state->test_only_func_limit().short_position_limit() == - expected_short_limit); + REQUIRE(acc_sec_state->test_only_func_limit().long_position_limit() == expected_long_limit); + REQUIRE(acc_sec_state->test_only_func_limit().short_position_limit() == expected_short_limit); REQUIRE(acc_sec_state->net_pos() == expected_net_pos); } -void verify_product_limit_data(ProductLimitNode const *acc_prod_state, - uint32_t expected_long_limit, - uint32_t expected_short_limit, - int expected_net_pos) { +void verify_product_limit_data(ProductLimitNode const* acc_prod_state, + uint32_t expected_long_limit, uint32_t expected_short_limit, + int expected_net_pos){ REQUIRE(acc_prod_state != nullptr); - REQUIRE(acc_prod_state->test_only_func_limit().long_position_limit() == - expected_long_limit); - REQUIRE(acc_prod_state->test_only_func_limit().short_position_limit() == - expected_short_limit); + REQUIRE(acc_prod_state->test_only_func_limit().long_position_limit() == expected_long_limit); + REQUIRE(acc_prod_state->test_only_func_limit().short_position_limit() == expected_short_limit); REQUIRE(acc_prod_state->net_pos() == expected_net_pos); } -// (bts::api::admin::BTSAccount& account, -// api::Venue exchange, api::SecurityType -// sec_type, const std::string& sec_symbol, -// uint32_t sec_id, bool sec_id_set, uint32_t -// long_pos_limit, uint32_t short_pos_limit){ -TEST_CASE("Limit Rule Res", "[limiter]") { +// (bts::api::admin::BTSAccount& account, +// api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, +// uint32_t long_pos_limit, uint32_t short_pos_limit){ + +TEST_CASE ("Limit Rule Res", "[limiter]"){ api::Security sec_1, sec_2, sec_3; - fill_future_security(sec_1, 1000, std::string("ES"), api::Venue::VENUE_GLBX, - 2020, 1, 1, 0.25); - fill_future_security(sec_2, 2000, std::string("SI"), api::Venue::VENUE_GLBX, - 2021, 1, 1, 0.05); - fill_future_security(sec_3, 3000, std::string("SI"), api::Venue::VENUE_GLBX, - 2022, 1, 1, 0.05); + fill_future_security(sec_1, 1000, std::string("ES"), api::Venue::VENUE_GLBX, 2020, 1, 1, 0.25); + fill_future_security(sec_2, 2000, std::string("SI"), api::Venue::VENUE_GLBX, 2021, 1, 1, 0.05); + fill_future_security(sec_3, 3000, std::string("SI"), api::Venue::VENUE_GLBX, 2022, 1, 1, 0.05); // add multiple rules and check sorting bts::api::admin::AdminData admin_data; bts::api::admin::AdminServiceCreateAccountResult result; - bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", - "desc", true, result); - auto account_ptr = - bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, - false, 10, 21); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, - true, 1000, 2001); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "ES", 0, - false, 100, 201); + bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", "desc", true, result); + auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, false, 10, 21); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, true, 1000, 2001); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 0, false, 100, 201); // add clip sizes - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "SI", 0, - false, 11); - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "ES", - sec_1.id(), true, 1001); - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "SI", - sec_2.id(), true, 101); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "SI", 0, false, 11); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", sec_1.id(), true, 1001); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "SI", sec_2.id(), true, 101); // validate pos limits went in - REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == - 10); - REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == - 1000); - REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == - 100); + REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == 10); + REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == 1000); + REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == 100); // validate clip sizes went in REQUIRE(account_ptr->security_clip_limits().limit(0).clip_size() == 11); REQUIRE(account_ptr->security_clip_limits().limit(1).clip_size() == 1001); @@ -185,36 +148,22 @@ TEST_CASE("Limit Rule Res", "[limiter]") { // sort order bts::admin::AdminServiceUtils::sort_limits(*account_ptr); // validate pos limits order - REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == - 1000); - REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == - 100); - REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == - 10); + REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == 1000); + REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == 100); + REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == 10); // validate clip sizes order REQUIRE(account_ptr->security_clip_limits().limit(2).clip_size() == 11); - // resolve pos - auto sec_1_limit = - bts::admin::AdminServiceUtils::find_account_security_position_limit( - *account_ptr, sec_1); + // resolve pos + auto sec_1_limit = bts::admin::AdminServiceUtils::find_account_security_position_limit (*account_ptr, sec_1); REQUIRE(sec_1_limit->long_position_limit() == 1000); - auto sec_2_limit = - bts::admin::AdminServiceUtils::find_account_security_position_limit( - *account_ptr, sec_2); + auto sec_2_limit = bts::admin::AdminServiceUtils::find_account_security_position_limit (*account_ptr, sec_2); REQUIRE(sec_2_limit->long_position_limit() == 10); // resolve clip sizes - auto sec_1_clip = - bts::admin::AdminServiceUtils::find_account_security_clip_size( - *account_ptr, sec_1); + auto sec_1_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_1); REQUIRE(sec_1_clip == 1001); - auto sec_2_clip = - bts::admin::AdminServiceUtils::find_account_security_clip_size( - *account_ptr, sec_2); + auto sec_2_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_2); REQUIRE(sec_2_clip == 101); - auto sec_3_clip = - bts::admin::AdminServiceUtils::find_account_security_clip_size( - *account_ptr, sec_3); + auto sec_3_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_3); REQUIRE(sec_3_clip == 11); } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp index a2fda91b4..082b8ddab 100644 --- a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp +++ b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp @@ -40,5 +40,6 @@ DynamicOrderRegistry::get_all_dynamic_order_types() const { return result; } + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index a5eb59f90..1207b7764 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -17,8 +17,8 @@ #include "lib/orderman/orders/book_algos/CoverOrder.h" #include "lib/orderman/orders/book_algos/JoinOrder.h" #include "lib/orderman/orders/book_algos/LeanOrder.h" -#include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/TickOrder.h" +#include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/TopOrder.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" @@ -153,7 +153,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, break; case CustomOrderDefinition::kOffset: order_ptr.reset(new orderman::OffsetOrder()); - break; + break; case CustomOrderDefinition::kDynamic: { order_ptr = me->dynamic_order_registry.build( def.custom_def().dynamic().dynamic_order_type()); diff --git a/src/lib/orderman/order_router/OrderRouter.cpp b/src/lib/orderman/order_router/OrderRouter.cpp index 24a710c5c..a174047d5 100644 --- a/src/lib/orderman/order_router/OrderRouter.cpp +++ b/src/lib/orderman/order_router/OrderRouter.cpp @@ -66,5 +66,5 @@ bool OrderRouter::is_valid_session(std::string const &session) const { } OrderRouter::~OrderRouter() {} -} // namespace orderman -} // namespace bts +} +} diff --git a/src/lib/orderman/orderman_utils/EventStream.h b/src/lib/orderman/orderman_utils/EventStream.h index 481c9791c..c4a191ab7 100644 --- a/src/lib/orderman/orderman_utils/EventStream.h +++ b/src/lib/orderman/orderman_utils/EventStream.h @@ -13,50 +13,27 @@ struct EventStream using CS = mercury::ContentSubscription; using SubID = typename CS::SubID; - EventStream () : cs (nullptr) {} - EventStream (CS&cs) : cs (&cs) {} - - void init(CS&csub) - { - bts_assert(!cs); - cs = ⫏ - } + EventStream (CS&cs) : cs (cs) {} template SubID sub(typename CS::Key k, CB&&cb) { - auto s = cs->sub(k,std::forward (cb)); + auto s = cs.sub(k,std::forward (cb)); active_subs.push_back(s); return s; } template SubID sub(CB&&cb) { - auto s = cs->sub(std::forward (cb)); + auto s = cs.sub(std::forward (cb)); active_subs.push_back(s); return s; } - EventStream& operator=(EventStream &&src) - { - cs = src.cs; - src.cs = nullptr; - active_subs = src.active_subs; - src.active_subs.clear(); - return *this; - } - - EventStream& operator=(EventStream const &src) - { - cs = src.cs; - active_subs = src.active_subs; - return *this; - } - void unsub(SubID sid) { auto it = std::find(active_subs.begin(), active_subs.end(),sid); if (it != active_subs.end()) { active_subs.erase(it); - cs->unsub(sid); + cs.unsub(sid); } } @@ -69,7 +46,7 @@ struct EventStream } private: - CS *cs; + CS &cs; boost::container::small_vector active_subs; }; diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index df6670c3f..3326b62e0 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -49,13 +49,13 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void DynamicOrder::on_activate(Price, Quantity, OrderServices &services, - trace::CorID const &) { + PerfTrace const &) { services.report_state(me->state); } -void DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {} -void DynamicOrder::on_crack(trace::CorID const &) {} -void DynamicOrder::on_cancel(trace::CorID const &) {} +void DynamicOrder::on_update(Price, Quantity, PerfTrace const &) {} +void DynamicOrder::on_crack(PerfTrace const &) {} +void DynamicOrder::on_cancel(PerfTrace const &) {} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib/orderman/orders/DynamicOrder.h index d346b6b5c..5318649bf 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib/orderman/orders/DynamicOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; private: struct PImpl; diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index df72b6911..f533f50f3 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -1,11 +1,11 @@ #include "IcebergOrder.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" #include "lib/logging/logging.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" +#include "lib/config/config.h" +#include "lib/config/protos/orderman_cfg.pb.h" #include @@ -104,7 +104,7 @@ void IcebergOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { + PerfTrace const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -114,10 +114,10 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, me->state.set_price(p.value()); me->state.set_quantity(q.value()); if (me->pause_between_orders) - services.subscribe_to_time( + services.time_change.sub( [this](auto const &time) { this->on_time(time); }); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); + services.child_updates.sub( + key(), [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); me->working_sub_status = WorkingSubStatus::WORKING; send_next_child_order(); @@ -145,7 +145,7 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { +void IcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -171,9 +171,9 @@ void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void IcebergOrder::on_crack(trace::CorID const &) {} +void IcebergOrder::on_crack(PerfTrace const &) {} -void IcebergOrder::on_cancel(trace::CorID const &) { +void IcebergOrder::on_cancel(PerfTrace const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value()); @@ -255,7 +255,7 @@ void IcebergOrder::send_next_child_order() { key().value(), me->child.order.key().value(), to_send, me->state.price(), me->state.filled_quantity(), me->state.quantity()); - me->child.order.activate(Price(me->state.price()), Quantity(to_send), trace::CorID()); + me->child.order.activate(Price(me->state.price()), Quantity(to_send)); } void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index c0b3f8ceb..a7442b923 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -20,10 +20,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 33b89aadd..8d8ab3757 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -30,7 +30,7 @@ struct NativeOrder::PImpl { PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7), have_exchange_order_id(false) {} + price_encoding_precision(7),have_exchange_order_id(false) {} OrderServices *services; SessionServices *session_services; @@ -42,7 +42,7 @@ struct NativeOrder::PImpl { OrderState state; int price_encoding_precision; bool have_exchange_order_id; - + jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; jetfix::FIXFragment::Bookmark update_quantity_bm; @@ -274,9 +274,14 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, - trace::CorID const &trace) { - services.log(trace,"on_activate_start",key().value()); + PerfTrace const &t) { + LOG(Latency,Info, "on_activate start {}", key().value()); + + auto trace = t; + trace.order_key = key().value(); + trace.order_update = utils::TimeStamp::now(); + tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, trace.md_sn, key().value()); bts_assert(!me->services); me->services = &services; @@ -353,11 +358,11 @@ void NativeOrder::on_activate(Price p, Quantity q, // if we are here we are good. // subscribe to usefull events - me->session_services->subscribe_to_exe_report( + me->session_services->exe_reports.sub( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( + me->session_services->cancel_rejects.sub( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->session_services->gateway_status.sub( [this](auto const &gw) { this->on_gateway_status(gw); }); // send out order @@ -384,13 +389,14 @@ void NativeOrder::on_activate(Price p, Quantity q, auto const &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite( me->create_transact_time_bm, &ts.value()[0], ts.value().size()); - services.log(trace,"send_fix_buffer",key().value()); + trace.send_fix_buffer = utils::TimeStamp::now(); me->session_services->queue_fix(jetfix::MessageTypes::NewOrderSingle, me->create_encoding, trace); me->session_services->governor().record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); - services.log(trace,"on_activate_done",key().value()); + LOG(Latency,Diag, "on_activate done fix {} t: {}us", key().value(), + (utils::TimeStamp::now() - trace.order_update).microseconds()); LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call @@ -401,11 +407,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( + me->session_services->exe_reports.sub( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( + me->session_services->cancel_rejects.sub( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->session_services->gateway_status.sub( [this](auto const &gw) { this->on_gateway_status(gw); }); if (!me->session_services->is_gateway_connected()) @@ -415,11 +421,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_DISCONNECTED: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( + me->session_services->exe_reports.sub( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( + me->session_services->cancel_rejects.sub( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->session_services->gateway_status.sub( [this](auto const &gw) { this->on_gateway_status(gw); }); if (me->session_services->is_gateway_connected()) @@ -429,11 +435,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_PENDING_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( + me->session_services->exe_reports.sub( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( + me->session_services->cancel_rejects.sub( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->session_services->gateway_status.sub( [this](auto const &gw) { this->on_gateway_status(gw); }); break; @@ -451,9 +457,12 @@ void NativeOrder::on_activate(Price p, Quantity q, report_state(); } -void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { - - me->services->log(trace,"order_update",key().value()); +void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { + auto trace = t; + trace.order_update = utils::TimeStamp::now(); + trace.order_key = key().value(); + tracepoint(bts_trace, trace_order, (char *)"on_update.begin", 0, trace.md_sn, + trace.order_key); switch (me->state.status()) { @@ -505,6 +514,9 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { break; } + tracepoint(bts_trace, trace_order, (char *)"on_update.after_limits", 0, + trace.md_sn, trace.order_key); + // all good auto &encoding = me->update_encoding; me->update_price_bm = encoding.overwrite( @@ -514,6 +526,9 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { me->update_quantity_bm = encoding.overwrite(me->update_quantity_bm, q.value(), quantity_sz()); + tracepoint(bts_trace, trace_order, (char *)"on_update.half_way", 0, + trace.md_sn, trace.order_key); + auto const &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size()); @@ -548,9 +563,9 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { report_state(); } -void NativeOrder::on_crack(trace::CorID const &) {} +void NativeOrder::on_crack(PerfTrace const &) {} -void NativeOrder::on_cancel(trace::CorID const &trace) { +void NativeOrder::on_cancel(PerfTrace const &trace) { switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -802,7 +817,7 @@ void NativeOrder::update_working_position() { key().value(), me->definition.security_key()); } -void NativeOrder::report_state(trace::CorID const &trace) { +void NativeOrder::report_state(PerfTrace const &trace) { update_working_position(); me->services->report_state(me->state, trace); } diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 88c040a58..d1b52279c 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -3,7 +3,7 @@ #include #include "lib/orderman/orders/Order.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { namespace orderman { @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &); private: @@ -36,7 +36,7 @@ private: void on_exe_report(const NewExecutionReportEvent &); void on_cancel_reject(const CancelRejectEvent&); void on_gateway_status(const GatewayStatusChangeEvent&); - void report_state(trace::CorID const&trace = trace::CorID()); + void report_state(PerfTrace const&trace = PerfTrace()); void init_fix(); void add_exchange_order_id_to_fix(); diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index a25ba3779..f1f58725d 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -1,25 +1,8 @@ #include "Order.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" namespace bts { namespace orderman { -Order::Order() -{ - _services = std::make_unique(*this); -} - -void Order::init_order_services(OrderServicesData &osd) -{ - _services->init(osd); -} - -void Order::init_order_services(OrderServicesData &osd,OrderServices &parent) -{ - _services->init(osd,parent); -} - Order::~Order() {} -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index eebcea1bf..ee56707d1 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -5,13 +5,11 @@ // fwd namespace bts { -namespace trace {struct CorID;} namespace securities { class ISecurityDB; } namespace orderman { class IOrderFactory; -class OrderServicesData; } namespace api { namespace orderman { @@ -31,7 +29,6 @@ class OrderServices; class Order { public: - Order(); virtual ~Order(); OrderKey key() const { return _key; } @@ -46,21 +43,17 @@ class Order { const PreActivationOrderServices &) = 0; // activation - cannot be slow - virtual void on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0; + virtual void on_activate(Price, Quantity, OrderServices &, PerfTrace const&) = 0; // order is running, maintenance - virtual void on_update(Price, Quantity, trace::CorID const&) = 0; - virtual void on_crack(trace::CorID const&) = 0; - virtual void on_cancel(trace::CorID const&) = 0; + virtual void on_update(Price, Quantity, PerfTrace const&) = 0; + virtual void on_crack(PerfTrace const&) = 0; + virtual void on_cancel(PerfTrace const&) = 0; private: OrderKey _key; OrderKey _parent_key; - std::unique_ptr _services; - void init_order_services(OrderServicesData &); - void init_order_services(OrderServicesData &,OrderServices &parent); friend class OrderFactory; - friend class OrderManager; }; } } diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index 8ad686489..542d86a06 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -1,6 +1,6 @@ #include "TimeBoxOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" +#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include namespace bts { @@ -38,7 +38,7 @@ void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def, me->start_time = timebox_def.start(); me->stop_time = timebox_def.stop(); me->child_state.set_status(ORDER_STATUS_INACTIVE); - + auto child_def = def; *child_def.mutable_custom_def() = timebox_def.child(); if (me->start_time.seconds() > utils::pb::pb_now().seconds() && @@ -84,21 +84,20 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } } -void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { +void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services,PerfTrace const&) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); - + switch (me->state.status()) { case ORDER_STATUS_INACTIVE: me->child = me->child_builder.build(); me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); - services.subscribe_to_time([this](auto) { this->on_time_change(); }); + services.child_updates.sub( + key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.time_change.sub([this](auto) { this->on_time_change(); }); transition(ORDER_STATUS_WORKING); break; @@ -114,7 +113,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, // state) case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); @@ -123,7 +122,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { +void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -141,7 +140,7 @@ void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { // we launched our child, everything is nominal me->state.set_price(p.value()); me->state.set_quantity(q.value()); - me->child.update(p, q); + me->child.update(p,q); break; case ORDER_STATUS_PENDING_WORKING: @@ -152,7 +151,7 @@ void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { // if the child was in any of these states we couldn't be // in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -183,9 +182,9 @@ void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void TimeBoxOrder::on_crack(trace::CorID const &) {} +void TimeBoxOrder::on_crack(PerfTrace const&) {} -void TimeBoxOrder::on_cancel(trace::CorID const &) { +void TimeBoxOrder::on_cancel(PerfTrace const&) { LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -211,7 +210,7 @@ void TimeBoxOrder::on_cancel(trace::CorID const &) { break; // child cannot be in any of these if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -264,7 +263,7 @@ void TimeBoxOrder::on_time_change() { case ORDER_STATUS_INACTIVE: { // we haven't yet launched the child, check the time and // launch it if appropriate - if (now >= me->start_time.seconds() && now < me->stop_time.seconds()) { + if ( now >= me->start_time.seconds() && now < me->stop_time.seconds()) { LOG(OrderMan, Info, "TimeBox order {} launching child {}", key().value(), me->child.key().value()); me->child.activate(Price(me->state.price()), @@ -286,12 +285,12 @@ void TimeBoxOrder::on_time_change() { report_state(); } break; - + case ORDER_STATUS_PENDING_WORKING: break; // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -319,33 +318,34 @@ void TimeBoxOrder::on_time_change() { } } -void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { +void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const&ev) +{ me->child_state = ev.rebuild_state(); switch (me->state.status()) { case ORDER_STATUS_WORKING: switch (ev.status) { - case ORDER_STATUS_WORKING: - case ORDER_STATUS_PENDING_WORKING: - // nothing to do but report new state - break; - case ORDER_STATUS_COMPLETED: - transition(ORDER_STATUS_COMPLETED); - break; + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + // nothing to do but report new state + break; + case ORDER_STATUS_COMPLETED: + transition(ORDER_STATUS_COMPLETED); + break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } break; @@ -368,11 +368,12 @@ void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { void TimeBoxOrder::report_state() { auto merged_state = me->state; - merged_state.set_filled_quantity(me->child_state.filled_quantity()); - merged_state.set_last_price(me->child_state.last_price()); - merged_state.set_avg_price(me->child_state.avg_price()); + merged_state.set_filled_quantity (me->child_state.filled_quantity()); + merged_state.set_last_price ( me->child_state.last_price()); + merged_state.set_avg_price ( me->child_state.avg_price()); me->services->report_state(merged_state); } -} // namespace orderman -} // namespace bts +} +} + diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index 9475a5a37..3a403ee38 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 5b8f2cc5f..f84235f59 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -1,16 +1,16 @@ #include "TriggerOrder.h" -#include "lib/domain_model/Security.h" #include "lib/logging/logging.h" +#include "lib/utils/PBUtils.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/domain_model/Security.h" #include "lib/os/os.h" -#include "lib/utils/PBUtils.h" #include #include -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ struct TriggerOrder::PImpl { OrderServices *services; @@ -42,491 +42,496 @@ struct TriggerOrder::PImpl { bool is_succ_inited; bts::TimeStamp child_order_time; PImpl() - : services(nullptr), order_def(), timeout_exit(false), - timeout_msecs(std::numeric_limits::max()), - price_cond_exit(false), state(), child_state(), child_order(), - order_placed(false), book(), cancel_mode(CancelMode::none), - market_observed_once(false), is_recovered(false), - is_succ_inited(false) {} + : + services(nullptr), + order_def(), + timeout_exit(false), + timeout_msecs(std::numeric_limits::max()), + price_cond_exit(false), + state(), + child_state(), + child_order(), + order_placed(false), + book(), + cancel_mode(CancelMode::none), + market_observed_once(false), + is_recovered(false), + is_succ_inited(false){ + } }; -TriggerOrder::TriggerOrder() : _state(State::START), me(new PImpl()) {} -TriggerOrder::~TriggerOrder() {} -const api::orderman::OrderDefinition &TriggerOrder::definition() const { +TriggerOrder::TriggerOrder() +: +_state(State::START), +me(new PImpl()){ +} +TriggerOrder::~TriggerOrder(){ +} +const api::orderman::OrderDefinition& TriggerOrder::definition() const{ return me->order_def; } -void TriggerOrder::on_init_new(const api::orderman::OrderDefinition &order_def, - const PreActivationOrderServices &pre_os) { - LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", key(), - _state); - switch (_state) { - case State::START: - me->is_succ_inited = _on_init_new(order_def, pre_os); - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: - std::ostringstream oss; - oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; +void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def, + const PreActivationOrderServices& pre_os){ + LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", + key(),_state); + switch (_state){ + case State::START: + me->is_succ_inited=_on_init_new(order_def,pre_os); + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: + std::ostringstream oss; + oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; } } -void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec, - const PreActivationOrderServices &pre_os) { - LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", key(), - _state); - switch (_state) { - case State::START: - me->is_succ_inited = _on_init_new(rec.def(), pre_os); - // get the state from what was recovered (we will only use - // it for reporting) - me->state = rec.state(); - // if it was not in a terminal state, we will call it cancelled - if (!SpreaderUtils::order_in_terminal_state(me->state.status())) - me->state.set_status( - api::orderman::OrderStatus::ORDER_STATUS_CANCELED); - me->is_recovered = true; - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: - std::ostringstream oss; - oss << "TriggerOrder::on_init_recovered key:" << key() - << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; +void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord& rec, + const PreActivationOrderServices& pre_os){ + LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", + key(),_state); + switch (_state){ + case State::START: + me->is_succ_inited=_on_init_new(rec.def(),pre_os); + // get the state from what was recovered (we will only use + // it for reporting) + me->state=rec.state(); + // if it was not in a terminal state, we will call it cancelled + if (!SpreaderUtils::order_in_terminal_state(me->state.status())) + me->state.set_status(api::orderman::OrderStatus::ORDER_STATUS_CANCELED); + me->is_recovered=true; + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: + std::ostringstream oss; + oss << "TriggerOrder::on_init_recovered key:" << key() << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; } } -void TriggerOrder::on_activate(Price price, Quantity qty, - OrderServices &services, trace::CorID const &) { - LOG(OrderMan, Info, - "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), - _state, price, qty); - switch (_state) { - case State::START: - me->services = &services; - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - if (me->is_recovered || !me->is_succ_inited) - _switch_state(State::END); - else { - me->order_builder.activate(services); - me->child_order = me->order_builder.build(); - services.subscribe_to_child_updates( - [this](const OrderStateUpdateEvent &os) { - this->_on_child_order_update(os); - }); - services.subscribe_to_book(SecurityKey(me->order_def.security_key()), - [this](const BookUpdateEvent &bk_event) { - this->_on_book_update(bk_event); - }); - services.subscribe_to_time( - [this](const bts::mercury::TimerEvent &te) { _on_time(te); }); - _switch_state(State::WAITING_FOR_TRIGGER); +void TriggerOrder::on_activate(Price price, + Quantity qty, + OrderServices& services, + PerfTrace const&){ + LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", + key(),_state, price, qty); + switch (_state){ + case State::START: + me->services=&services; + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + if(me->is_recovered || !me->is_succ_inited) + _switch_state(State::END); + else{ + me->order_builder.activate(services); + me->child_order=me->order_builder.build(); + services.child_updates.sub(key(), + [this](const OrderStateUpdateEvent& os) + { this->_on_child_order_update (os);}); + services.book_updates.sub(SecurityKey(me->order_def.security_key()), + [this](const BookUpdateEvent& bk_event) + { this->_on_book_update (bk_event);}); + services.time_change.sub([this](const bts::mercury::TimerEvent& te) + {_on_time(te);}); + _switch_state(State::WAITING_FOR_TRIGGER); + } + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END:{ + std::ostringstream oss; + oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; + bts_assert_msg(false,oss.str()); + break; } - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: { - std::ostringstream oss; - oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; - } } } // order price, qty change -void TriggerOrder::on_update(Price price, Quantity qty, trace::CorID const &) { - LOG(OrderMan, Info, - "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, - price, qty); - switch (_state) { - case State::START: - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - // cant report because does not have order_services yet - break; - case State::WAITING_FOR_TRIGGER: - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - _report_state(); - _analyze_trigger_and_shoot(); - break; - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - me->state.set_last_msg( - "Trigger order can not be modified after the trigger has been hit"); - _report_state(); - break; - case State::END: - break; - } -} -void TriggerOrder::on_crack(trace::CorID const &) { - // not supported -} -void TriggerOrder::on_cancel(trace::CorID const &) { - LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), - _state); - me->cancel_mode = CancelMode::external; - switch (_state) { - case State::START: - _switch_state(State::END); - break; - case State::WAITING_FOR_TRIGGER: - _switch_state(State::END); - break; - case State::WAITING_FOR_FIRST_ACK: - // we dont have a WAITING_FOR_ACK_CANCELLED - // (like the Quoter), so this message is - // rejected and reported - me->state.set_last_msg("Order is in flight"); - _report_state(); - break; - case State::STEADY: - _cancel_order(CancelMode::external); - break; - case State::END: - break; - } -} -void TriggerOrder::_on_book_update(const BookUpdateEvent &b_event) { - switch (_state) { - case State::START: - break; - case State::WAITING_FOR_TRIGGER: - if (b_event.key().value() == me->order_def.security_key()) { - me->book = b_event.book; - _observe_market_once(); - _analyze_trigger_and_shoot(); - } - break; - case State::WAITING_FOR_FIRST_ACK: - break; - case State::STEADY: - if (b_event.key().value() == me->order_def.security_key()) { - if (me->price_cond_exit) { - me->book = b_event.book; - _analyze_trigger_and_cancel(); - } - } - case State::END: - break; - } -} -void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent &o_ev) { - if (o_ev.key == me->child_order.key()) { - auto ev_state = o_ev.rebuild_state(); - me->child_state = ev_state; - switch (_state) { +void TriggerOrder::on_update(Price price, + Quantity qty, + PerfTrace const&){ + LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", + key(),_state, price, qty); + switch (_state){ case State::START: + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + // cant report because does not have order_services yet + break; case State::WAITING_FOR_TRIGGER: - bts_assert(false); + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + _report_state(); + _analyze_trigger_and_shoot(); break; case State::WAITING_FOR_FIRST_ACK: - if (SpreaderUtils::order_acknowledged(o_ev.status)) { - if (SpreaderUtils::order_in_terminal_state(o_ev.status)) - _switch_state(State::END); - else - _switch_state(State::STEADY); - } - break; - case State::STEADY: - if (SpreaderUtils::order_in_terminal_state(ev_state.status())) - _switch_state(State::END); + case State::STEADY: + me->state.set_last_msg("Trigger order can not be modified after the trigger has been hit"); + _report_state(); break; case State::END: break; + } +} +void TriggerOrder::on_crack(PerfTrace const&){ + // not supported +} +void TriggerOrder::on_cancel(PerfTrace const&){ + LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", + key(),_state); + me->cancel_mode=CancelMode::external; + switch (_state){ + case State::START: + _switch_state(State::END); + break; + case State::WAITING_FOR_TRIGGER: + _switch_state(State::END); + break; + case State::WAITING_FOR_FIRST_ACK: + // we dont have a WAITING_FOR_ACK_CANCELLED + // (like the Quoter), so this message is + // rejected and reported + me->state.set_last_msg("Order is in flight"); + _report_state(); + break; + case State::STEADY: + _cancel_order(CancelMode::external); + break; + case State::END: + break; + } +} +void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ + switch (_state){ + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + if(b_event.key().value()==me->order_def.security_key()){ + me->book=b_event.book; + _observe_market_once(); + _analyze_trigger_and_shoot(); + } + break; + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY: + if(b_event.key().value()==me->order_def.security_key()){ + if(me->price_cond_exit){ + me->book=b_event.book; + _analyze_trigger_and_cancel(); + } + } + case State::END: + break; + } +} +void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ + if(o_ev.key==me->child_order.key()){ + auto ev_state = o_ev.rebuild_state(); + me->child_state=ev_state; + switch (_state){ + case State::START: + case State::WAITING_FOR_TRIGGER: + bts_assert(false); + break; + case State::WAITING_FOR_FIRST_ACK: + if(SpreaderUtils::order_acknowledged(o_ev.status)){ + if(SpreaderUtils::order_in_terminal_state(o_ev.status)) + _switch_state(State::END); + else + _switch_state(State::STEADY); + } + break; + case State::STEADY: + if(SpreaderUtils::order_in_terminal_state(ev_state.status())) + _switch_state(State::END); + break; + case State::END: + break; } _report_state(); } } -void TriggerOrder::_on_time(const bts::mercury::TimerEvent &) { - switch (_state) { - case State::START: - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - break; - case State::STEADY: { - if (me->timeout_exit) - _analyze_trigger_and_cancel(); - break; - } - case State::END: - break; +void TriggerOrder::_on_time(const bts::mercury::TimerEvent&){ + switch (_state){ + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY:{ + if(me->timeout_exit) + _analyze_trigger_and_cancel(); + break; + } + case State::END: + break; } } -bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition &order_def, - const PreActivationOrderServices &pre_os) { - me->order_def = order_def; - if (!me->order_def.has_custom_def() || - !me->order_def.custom_def().has_trigger()) { - LOG(OrderMan, Error, - "TriggerOrder::_on_init_new key:{} state:{} " - "OrderDefinition does not have TriggerOrderDefinition", - key(), _state); +bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, + const PreActivationOrderServices& pre_os){ + me->order_def=order_def; + if (!me->order_def.has_custom_def() || !me->order_def.custom_def().has_trigger()){ + LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " + "OrderDefinition does not have TriggerOrderDefinition", + key(),_state); me->state.set_last_msg("Trigger Order not properly formed"); return false; } - if (pre_os.sec_db.resolve(SecurityKey(order_def.security_key())) == - nullptr) { - LOG(OrderMan, Error, - "TriggerOrder::_on_init_new key:{} state:{} " - "Could not resolve sec_key:{}", - key(), _state, order_def.security_key()); + if (pre_os.sec_db.resolve(SecurityKey(order_def.security_key()))==nullptr){ + LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " + "Could not resolve sec_key:{}", + key(),_state, order_def.security_key()); me->state.set_last_msg("Could not resolve Trigger Order security"); return false; - } - const auto &trigger_order_def = order_def.custom_def().trigger(); - if (pre_os.sec_db.resolve(SecurityKey( - trigger_order_def.trigger_action().security_id())) == nullptr) { - LOG(OrderMan, Error, - "TriggerOrder::_on_init_new key:{} state:{} " - "Could not resolve child key sec_key:{}", - key(), _state, trigger_order_def.trigger_action().security_id()); + } + const auto& trigger_order_def=order_def.custom_def().trigger(); + if(pre_os.sec_db.resolve(SecurityKey(trigger_order_def.trigger_action().security_id())) == nullptr){ + LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " + "Could not resolve child key sec_key:{}", + key(),_state, trigger_order_def.trigger_action().security_id()); me->state.set_last_msg("Could not resolve Trigger Order child security"); return false; } if (!trigger_order_def.trigger_action().has_payup() && - bts::os::is_nan(trigger_order_def.trigger_action().price())) { - LOG(OrderMan, Error, - "TriggerOrder::_on_init_new key:{} state:{} " - "illegal child order price", - key(), _state); + bts::os::is_nan(trigger_order_def.trigger_action().price())){ + LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " + "illegal child order price", + key(),_state); me->state.set_last_msg("Illegal Child Order price"); return false; } me->timeout_exit = trigger_order_def.has_exit_condition() && - trigger_order_def.exit_condition().timeout_enabled(); - me->timeout_msecs = - trigger_order_def.has_exit_condition() - ? 1000.0 * trigger_order_def.exit_condition().timeout_seconds() - : std::numeric_limits::max(); - me->price_cond_exit = - trigger_order_def.has_exit_condition() && - trigger_order_def.exit_condition().conditional_cancel(); + trigger_order_def.exit_condition().timeout_enabled(); + me->timeout_msecs = trigger_order_def.has_exit_condition() ? + 1000.0*trigger_order_def.exit_condition().timeout_seconds () : + std::numeric_limits::max(); + me->price_cond_exit = trigger_order_def.has_exit_condition() && + trigger_order_def.exit_condition().conditional_cancel(); api::orderman::OrderDefinition child_order_def = order_def; - child_order_def.set_security_key( - trigger_order_def.trigger_action().security_id()); + child_order_def.set_security_key(trigger_order_def.trigger_action().security_id()); child_order_def.mutable_custom_def()->CopyFrom(trigger_order_def.child()); - me->order_builder = OrderBuilder(key(), child_order_def, pre_os); - const auto *sec_ptr = - pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); - me->tick_size = std::min(sec_ptr->contract_spec().low_tick(), - sec_ptr->contract_spec().high_tick()); - LOG(OrderMan, Info, - "TriggerOrder::_on_init_new key:{} state:{} " - "trigger_price_type:{} child_order_price:{}", - key(), _state, trigger_order_def.trigger_condition().price_type(), - trigger_order_def.trigger_action().price()); + me->order_builder=OrderBuilder(key(),child_order_def,pre_os); + const auto* sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); + me->tick_size=std::min(sec_ptr->contract_spec().low_tick(), + sec_ptr->contract_spec().high_tick()); + LOG(OrderMan, Info, "TriggerOrder::_on_init_new key:{} state:{} " + "trigger_price_type:{} child_order_price:{}", + key(),_state, + trigger_order_def.trigger_condition().price_type(), + trigger_order_def.trigger_action().price()); return true; } -void TriggerOrder::_report_state() { - if (_activated()) { +void TriggerOrder::_report_state(){ + if(_activated()){ _compute_state(); me->services->report_state(me->state); } } -void TriggerOrder::_switch_state(State new_state) { - switch (new_state) { - case State::START: - break; - case State::WAITING_FOR_TRIGGER: - bts_assert(_state == State::START); - break; - case State::WAITING_FOR_FIRST_ACK: - bts_assert(_state == State::WAITING_FOR_TRIGGER); - break; - case State::STEADY: - bts_assert(_state == State::WAITING_FOR_FIRST_ACK); - break; - case State::END: - bts_assert(_state != State::END); - break; +void TriggerOrder::_switch_state(State new_state){ + switch(new_state){ + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + bts_assert(_state==State::START); + break; + case State::WAITING_FOR_FIRST_ACK: + bts_assert(_state==State::WAITING_FOR_TRIGGER); + break; + case State::STEADY: + bts_assert(_state==State::WAITING_FOR_FIRST_ACK); + break; + case State::END: + bts_assert(_state!=State::END); + break; } - LOG(OrderMan, Info, "TriggerOrder::_report_state key:{} {}->{}", key(), - _state, new_state); - _state = new_state; + LOG(OrderMan, Info, "TriggerOrder::_report_state key:{} {}->{}", + key(), + _state,new_state); + _state=new_state; _report_state(); } -void TriggerOrder::_analyze_trigger_and_shoot() { - if (me->market_observed_once) { - double trigger_price = _trigger_price(); - const md::PriceSize *obs_md = _observed_market(); - if (_trigger_met(obs_md, trigger_price, me->tick_size, - me->trigger_above_market)) { - me->child_order_time = bts::Timer::now(); - me->order_placed = true; - LOG(OrderMan, Info, - "TriggerOrder::_analyze_trigger_and_shoot" - "key:{} state:{} " - "trigger_above_md:{} trigger_price:{} md:{} " - "order_price:{} order_qty:{}", - key(), _state, me->trigger_above_market, trigger_price, - obs_md->price(), _child_order_price(), me->state.quantity()); +void TriggerOrder::_analyze_trigger_and_shoot(){ + if(me->market_observed_once){ + double trigger_price=_trigger_price(); + const md::PriceSize* obs_md=_observed_market(); + if (_trigger_met(obs_md,trigger_price, + me->tick_size,me->trigger_above_market)){ + me->child_order_time=bts::Timer::now(); + me->order_placed=true; + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_shoot" + "key:{} state:{} " + "trigger_above_md:{} trigger_price:{} md:{} " + "order_price:{} order_qty:{}", + key(),_state, + me->trigger_above_market,trigger_price, + obs_md->price(), + _child_order_price(), + me->state.quantity()); me->child_order.activate(Price(_child_order_price()), Quantity(me->state.quantity())); _switch_state(State::WAITING_FOR_FIRST_ACK); } } } -void TriggerOrder::_analyze_trigger_and_cancel() { - if (me->timeout_exit) { - int64_t time_diff = ms_diff(bts::Timer::now(), me->child_order_time); - if (time_diff > me->timeout_msecs) { - LOG(OrderMan, Info, - "TriggerOrder::_analyze_trigger_and_cancel " - "key:{} state:{} msecs:{} " - "time out, cancelling order", - key(), _state, time_diff); +void TriggerOrder::_analyze_trigger_and_cancel(){ + if(me->timeout_exit){ + int64_t time_diff = ms_diff (bts::Timer::now(), me->child_order_time); + if(time_diff > me->timeout_msecs){ + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel " + "key:{} state:{} msecs:{} " + "time out, cancelling order", + key(),_state, time_diff); _cancel_order(CancelMode::trigger); return; } } - if (me->price_cond_exit) { - double trigger_price = _trigger_price(); - const md::PriceSize *obs_md = _observed_market(); - if (!_trigger_met(obs_md, trigger_price, me->tick_size, - me->trigger_above_market)) { - LOG(OrderMan, Info, - "TriggerOrder::_analyze_trigger_and_cancel" - "key:{} state:{} " - "price condition untrue, cancelling order" - "trigger_above_md:{} trigger_price:{} md:{} ", - key(), _state, me->trigger_above_market, trigger_price, - obs_md->price()); + if(me->price_cond_exit){ + double trigger_price=_trigger_price(); + const md::PriceSize* obs_md=_observed_market(); + if (!_trigger_met(obs_md,trigger_price, + me->tick_size,me->trigger_above_market)){ + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel" + "key:{} state:{} " + "price condition untrue, cancelling order" + "trigger_above_md:{} trigger_price:{} md:{} ", + key(),_state, + me->trigger_above_market,trigger_price, + obs_md->price()); _cancel_order(CancelMode::trigger); - return; + return; } } } -api::orderman::OrderStatus TriggerOrder::_status() const { - switch (_state) { - // will only be called once the order - // has been activated - case State::START: - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - case State::END: - if (!me->is_succ_inited) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else { - if (me->order_placed) { - if (!SpreaderUtils::order_in_terminal_state( - me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - else { - if (SpreaderUtils::order_in_error_state( - me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else if (SpreaderUtils::order_in_completed_state( - me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - else if (SpreaderUtils::order_in_cancelled_state( - me->child_state.status())) { - switch (me->cancel_mode) { - case CancelMode::none: // this means an unscolicted child cxl - case CancelMode::external: - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - case CancelMode::trigger: +api::orderman::OrderStatus TriggerOrder::_status() const{ + switch(_state){ + // will only be called once the order + // has been activated + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + case State::END: + if(!me->is_succ_inited) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else{ + if(me->order_placed){ + if (!SpreaderUtils::order_in_terminal_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + else{ + if (SpreaderUtils::order_in_error_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else if (SpreaderUtils::order_in_completed_state(me->child_state.status())) return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + else if (SpreaderUtils::order_in_cancelled_state(me->child_state.status())){ + switch (me->cancel_mode){ + case CancelMode::none: //this means an unscolicted child cxl + case CancelMode::external: + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + case CancelMode::trigger: + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + } } } } - } else - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - } + else + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + } } bts_assert(false); return api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; } -void TriggerOrder::_compute_state() { - if (!me->is_recovered) { +void TriggerOrder::_compute_state(){ + if (!me->is_recovered){ me->state.set_status(_status()); me->state.set_filled_quantity(me->child_state.filled_quantity()); me->state.set_last_price(me->child_state.last_price()); me->state.set_avg_price(me->child_state.avg_price()); - if (_state == State::STEADY) + if(_state==State::STEADY) me->state.set_display_status(bts::api::orderman::OrderState::HIDDEN); else me->state.set_display_status(bts::api::orderman::OrderState::VISIBLE); + } } -void TriggerOrder::_observe_market_once() { - if (!me->market_observed_once) { - const md::PriceSize *obs_md = _observed_market(); - if (obs_md != nullptr && obs_md->size() > 0) { - me->market_observed_once = true; - me->trigger_above_market = _trigger_price() >= obs_md->price(); - LOG(OrderMan, Info, - "TriggerOrder::_observe_market_once " - "key:{} state:{} " - "md_p:{} md_q:{} trigger_above_md:{}", - key(), _state, obs_md->price(), obs_md->size(), - me->trigger_above_market); +void TriggerOrder::_observe_market_once(){ + if(!me->market_observed_once){ + const md::PriceSize* obs_md=_observed_market(); + if(obs_md != nullptr && obs_md->size()>0){ + me->market_observed_once=true; + me->trigger_above_market=_trigger_price()>=obs_md->price(); + LOG(OrderMan, Info, "TriggerOrder::_observe_market_once " + "key:{} state:{} " + "md_p:{} md_q:{} trigger_above_md:{}", + key(),_state, + obs_md->price(), obs_md->size(), + me->trigger_above_market); } } } -const md::PriceSize *TriggerOrder::_observed_market() const { - if (me->order_def.custom_def().trigger().trigger_condition().price_type() == - api::orderman::TriggerPriceType::BID) { - const auto &rv = me->book.bid()[0]; +const md::PriceSize* TriggerOrder::_observed_market() const{ + if(me->order_def.custom_def().trigger().trigger_condition().price_type()== + api::orderman::TriggerPriceType::BID){ + const auto& rv=me->book.bid()[0]; + return &rv; + } + else if (me->order_def.custom_def().trigger().trigger_condition().price_type()== + api::orderman::TriggerPriceType::ASK){ + const auto& rv=me->book.ask()[0]; return &rv; - } else if (me->order_def.custom_def() - .trigger() - .trigger_condition() - .price_type() == api::orderman::TriggerPriceType::ASK) { - const auto &rv = me->book.ask()[0]; - return &rv; - } else { + } + else{ bts_assert(false); return nullptr; } } -double TriggerOrder::_trigger_price() const { return me->state.price(); } -double TriggerOrder::_child_order_price() const { - const auto &trigger_action = - me->order_def.custom_def().trigger().trigger_action(); - double rv = bts::os::nan(); - if (trigger_action.has_payup()) { - double offset = trigger_action.payup().payup_ticks() * me->tick_size; - if (me->order_def.side() == api::Side::SIDE_BUY) - rv = _trigger_price() + offset; +double TriggerOrder::_trigger_price() const{ + return me->state.price(); +} +double TriggerOrder::_child_order_price() const{ + const auto& trigger_action= + me->order_def.custom_def().trigger().trigger_action(); + double rv=bts::os::nan(); + if(trigger_action.has_payup()){ + double offset=trigger_action.payup().payup_ticks()*me->tick_size; + if(me->order_def.side()==api::Side::SIDE_BUY) + rv=_trigger_price()+offset; else - rv = _trigger_price() - offset; - } else - rv = trigger_action.price(); - rv = bts::securities::raw_round_to_quote_price(rv, me->tick_size, - me->order_def.side()); + rv=_trigger_price()-offset; + } + else + rv=trigger_action.price(); + rv = bts::securities::raw_round_to_quote_price (rv, me->tick_size, + me->order_def.side()); return rv; } -void TriggerOrder::_cancel_order(CancelMode cancel_mode) { - me->cancel_mode = cancel_mode; +void TriggerOrder::_cancel_order(CancelMode cancel_mode){ + me->cancel_mode=cancel_mode; me->child_order.cancel(); LOG(OrderMan, Info, "TriggerOrder::_cancel_order key:{} state:{} mode:{}", - key(), _state, cancel_mode); + key(),_state,cancel_mode); _switch_state(State::END); } -bool TriggerOrder::_activated() const { return me->services != nullptr; } -bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size) { - return bts::securities::test_price_equality(p1, p2, tick_size) || p1 >= p2; +bool TriggerOrder::_activated() const{ + return me->services!=nullptr; } -bool TriggerOrder::_trigger_met(const md::PriceSize *obs_md, double trpr, - double tick_size, bool trigger_above_md) { +bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size){ + return bts::securities::test_price_equality(p1,p2,tick_size) || p1>=p2; +} +bool TriggerOrder::_trigger_met(const md::PriceSize* obs_md, + double trpr, + double tick_size, + bool trigger_above_md){ if (obs_md != nullptr) - return (trigger_above_md && - _gr_than_eq(obs_md->price(), trpr, tick_size)) || - (!trigger_above_md && - _gr_than_eq(trpr, obs_md->price(), tick_size)); + return (trigger_above_md && _gr_than_eq(obs_md->price(),trpr, tick_size)) || + (!trigger_above_md && _gr_than_eq(trpr,obs_md->price(),tick_size)); return false; } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index a62c82cba..f79013ef6 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -56,10 +56,10 @@ public: const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices&, - trace::CorID const&) override ; - void on_update(Price, Quantity, trace::CorID const&) override; - void on_crack(trace::CorID const&) override; - void on_cancel(trace::CorID const&) override; + PerfTrace const&) override ; + void on_update(Price, Quantity, PerfTrace const&) override; + void on_crack(PerfTrace const&) override; + void on_cancel(PerfTrace const&) override; private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 5298aa9d0..5e3ea18ae 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -1,7 +1,7 @@ #include "BookAlgo.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" #include "lib/utils/helper_macros.h" +#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include namespace bts { @@ -9,113 +9,148 @@ namespace orderman { using namespace api::orderman; -struct BookAlgo::PImpl { - PImpl() - : services(nullptr), fake_detached_child(false), supports_hedge(false), - has_activated_child(false) {} - - OrderServices *services; - +struct BookAlgo::PImpl +{ + PImpl() : services(nullptr), fake_detached_child(false), + supports_hedge(false), has_activated_child(false) + { + } + + OrderServices* services; + api::orderman::OrderDefinition def; api::orderman::OrderState state; - + OrderBuilder child_builder; - ChildOrder child; - api::orderman::OrderState child_state; + ChildOrder child; + api::orderman::OrderState child_state; bool fake_detached_child; - - bool supports_hedge; - OrderBuilder hedge_builder; + + bool supports_hedge; + OrderBuilder hedge_builder; std::vector hedges; - using HedgeStateMap = - boost::container::flat_map; + using HedgeStateMap = boost::container::flat_map; HedgeStateMap hedges_state; - + double tick_size; bool has_activated_child; }; -BookAlgo::BookAlgo() : me(new PImpl()) {} +BookAlgo::BookAlgo() : me(new PImpl()) +{ +} BookAlgo::~BookAlgo() {} -const api::orderman::OrderDefinition &BookAlgo::definition() const { + + +const api::orderman::OrderDefinition& BookAlgo::definition() const +{ return me->def; } -const api::orderman::OrderState &BookAlgo::this_state() const { +const api::orderman::OrderState& BookAlgo::this_state() const +{ return me->state; } - -void BookAlgo::set_price(double p) { me->state.set_price(p); } - -void BookAlgo::set_quantity(uint32_t s) { me->state.set_quantity(s); } - -const api::orderman::OrderState &BookAlgo::child_state() const { - return me->child_state; + +void BookAlgo::set_price(double p) +{ + me->state.set_price(p); +} + +void BookAlgo::set_quantity(uint32_t s) +{ + me->state.set_quantity(s); } -void BookAlgo::set_child_price(double p) { me->child_state.set_price(p); } +const api::orderman::OrderState& BookAlgo::child_state() const +{ + return me->child_state; +} + +void BookAlgo::set_child_price(double p) +{ + me->child_state.set_price(p); +} -void BookAlgo::set_child_quantity(uint32_t s) { +void BookAlgo::set_child_quantity(uint32_t s) +{ me->child_state.set_quantity(s); } -void BookAlgo::activate_child(Price p, Quantity q) { - // per Pedro, activating the child is not a synchronous calls, and he asserts - // that this is done only once - if (!me->has_activated_child) { +void BookAlgo::activate_child(Price p, Quantity q) +{ + //per Pedro, activating the child is not a synchronous calls, and he asserts that this is done only once + if(!me->has_activated_child) + { me->child.activate(p, q); me->has_activated_child = true; } -} +} + +void BookAlgo::update_child(Price p, Quantity q) +{ + me->child.update(p, q); +} -void BookAlgo::update_child(Price p, Quantity q) { me->child.update(p, q); } +void BookAlgo::cancel_child() +{ + me->child.cancel(); +} -void BookAlgo::cancel_child() { me->child.cancel(); } - -void BookAlgo::build_and_send_hedge(Price p, Quantity q) { - auto hedge = me->hedge_builder.build(); +void BookAlgo::build_and_send_hedge(Price p, Quantity q) +{ + auto hedge = me->hedge_builder.build(); me->hedges.push_back(std::move(hedge)); - me->hedges.back().activate(p, q); + me->hedges.back().activate(p, q); } -double BookAlgo::tick_size() const { return me->tick_size; } +double BookAlgo::tick_size() const +{ + return me->tick_size; +} -void BookAlgo::on_init_new(const api::orderman::OrderDefinition &def, - const PreActivationOrderServices &services) { +void BookAlgo::on_init_new(const api::orderman::OrderDefinition& def, + const PreActivationOrderServices &services) +{ me->services = nullptr; me->def = def; - - me->child_state.set_status(ORDER_STATUS_INACTIVE); + + me->child_state.set_status(ORDER_STATUS_INACTIVE); OrderDefinition child_def = def; setup_child(def, services, me->child_state, &child_def); me->child_builder = OrderBuilder(key(), child_def, services, 1); - - OrderDefinition hedge_def = def; + + OrderDefinition hedge_def = def; me->supports_hedge = setup_hedge(def, services, &hedge_def); - if (me->supports_hedge) - me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); - - const bts::api::Security *sec = - services.sec_db.resolve(SecurityKey(def.security_key())); - if (sec) { + if(me->supports_hedge) + me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); + + const bts::api::Security* sec = services.sec_db.resolve(SecurityKey(def.security_key())); + if(sec) + { me->tick_size = sec->contract_spec().low_tick(); transition(ORDER_STATUS_INACTIVE); - } else { + } + else + { auto msg = fmt::format("Unknown security: {}", def.security_key()); me->state.set_last_msg(msg); - transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); } } -void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, - const PreActivationOrderServices &) { +void BookAlgo::on_init_recovered(const api::orderman::OrderRecord& rec, + const PreActivationOrderServices &) +{ auto const &def = rec.def(); me->def = def; me->state = rec.state(); - switch (me->state.status()) { - case ORDER_STATUS_WORKING: { + switch (me->state.status()) + { + case ORDER_STATUS_WORKING: + { auto msg = "System restarted with active BookAlgo"; me->state.set_last_msg(msg); transition(ORDER_STATUS_ERROR, msg); @@ -139,24 +174,24 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, } } -void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { +void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services,PerfTrace const&) +{ bts_assert(!me->services); me->services = &services; - switch (this_state().status()) { + switch (this_state().status()) + { case ORDER_STATUS_INACTIVE: - me->child_builder.activate(services); - if (me->supports_hedge) + me->child_builder.activate(services); + if(me->supports_hedge) me->hedge_builder.activate(services); - + me->child = me->child_builder.build(); set_price(p.value()); set_quantity(q.value()); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); - services.subscribe_to_book( - SecurityKey(me->def.security_key()), - [this](auto const &b) { this->on_book_update(b); }); + services.child_updates.sub(key(), + [this](auto const &os) { this->on_child_order_update(os); }); + services.book_updates.sub(SecurityKey(me->def.security_key()), + [this](auto const &b) { this->on_book_update(b); }); transition(ORDER_STATUS_WORKING); break; @@ -172,7 +207,7 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, // state) case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); @@ -181,11 +216,14 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { +void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) +{ LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); - switch (this_state().status()) { + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { + switch (child_state().status()) + { case ORDER_STATUS_INACTIVE: set_price(p.value()); set_quantity(q.value()); @@ -193,8 +231,8 @@ void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { case ORDER_STATUS_WORKING: set_price(p.value()); set_quantity(q.value()); - if (!me->fake_detached_child) - me->child.update(p, q); + if(!me->fake_detached_child) + me->child.update(p,q); break; case ORDER_STATUS_PENDING_WORKING: // we launched our child but we are not yet able @@ -204,7 +242,7 @@ void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { // if the child was in any of these states we couldn't be // in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -235,22 +273,25 @@ void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void BookAlgo::on_crack(trace::CorID const &) {} +void BookAlgo::on_crack(PerfTrace const&) {} -void BookAlgo::on_cancel(trace::CorID const &) { +void BookAlgo::on_cancel(PerfTrace const&) +{ LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); - switch (this_state().status()) { + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { + switch (child_state().status()) + { case ORDER_STATUS_INACTIVE: transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_WORKING: - if (!me->fake_detached_child) + if(!me->fake_detached_child) me->child.cancel(); - for (auto &i : me->hedges) - i.crack(); + for(auto& i : me->hedges) + i.crack(); transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_PENDING_WORKING: @@ -259,7 +300,7 @@ void BookAlgo::on_cancel(trace::CorID const &) { break; // child cannot be in any of these if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -289,50 +330,53 @@ void BookAlgo::on_cancel(trace::CorID const &) { report_state(); } -void BookAlgo::transition(api::orderman::OrderStatus new_status, - std::string msg) { +void BookAlgo::transition(api::orderman::OrderStatus new_status, std::string msg) +{ auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); - LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", - key().value(), from, to, msg); + LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", key().value(), from, to, msg); me->state.set_status(new_status); } -void BookAlgo::on_child_order_update(const OrderStateUpdateEvent &ev) { - if (me->fake_detached_child) - return; - if (ev.key != me->child.key()) +void BookAlgo::on_child_order_update(const OrderStateUpdateEvent& ev) +{ + if(me->fake_detached_child) + return; + if(ev.key != me->child.key()) me->hedges_state[ev.key] = ev.rebuild_state(); - else { + else + { api::orderman::OrderState orig_state = child_state(); me->child_state = ev.rebuild_state(); - switch (this_state().status()) { + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (ev.status) { - case ORDER_STATUS_PENDING_WORKING: - break; - case ORDER_STATUS_WORKING: - if (me->supports_hedge) - send_hedge_if_new_fills(orig_state, ev); - break; - case ORDER_STATUS_COMPLETED: - transition(ORDER_STATUS_COMPLETED); - if (me->supports_hedge) - send_hedge_if_new_fills(orig_state, ev); - break; + switch (ev.status) + { + case ORDER_STATUS_PENDING_WORKING: + break; + case ORDER_STATUS_WORKING: + if(me->supports_hedge) + send_hedge_if_new_fills(orig_state, ev); + break; + case ORDER_STATUS_COMPLETED: + transition(ORDER_STATUS_COMPLETED); + if(me->supports_hedge) + send_hedge_if_new_fills(orig_state, ev); + break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } break; @@ -354,56 +398,52 @@ void BookAlgo::on_child_order_update(const OrderStateUpdateEvent &ev) { report_state(); } -void BookAlgo::report_state() { +void BookAlgo::report_state() +{ auto merged_state = me->state; merged_state.set_filled_quantity(child_state().filled_quantity()); merged_state.set_last_price(child_state().last_price()); merged_state.set_avg_price(child_state().avg_price()); - merged_state.set_display_status( - bts::api::orderman::OrderState_DisplayStatus:: - OrderState_DisplayStatus_HIDDEN); + merged_state.set_display_status(bts::api::orderman::OrderState_DisplayStatus::OrderState_DisplayStatus_HIDDEN); me->services->report_state(merged_state); } -void BookAlgo::payup(const md::PriceSize &opposite, - const bts::orderman::BookUpdateEvent &, - uint32_t cross_ticks) { +void BookAlgo::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) +{ double new_price = opposite.price() + me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::paydown(const md::PriceSize &opposite, - const bts::orderman::BookUpdateEvent &, - uint32_t cross_ticks) { +void BookAlgo::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) +{ double new_price = opposite.price() - me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) { +void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) +{ me->fake_detached_child = true; me->child.crack(); transition(status_after_detach); report_state(); } -void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent &) {} +void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent&) {} -bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition &, - const PreActivationOrderServices &, - api::orderman::OrderDefinition *) { - return false; +bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, api::orderman::OrderDefinition*) +{ + return false; } -void BookAlgo::send_hedge_if_new_fills( - const api::orderman::OrderState &orig_state, - const OrderStateUpdateEvent &new_state) { - UNUSED(orig_state); - UNUSED(new_state); - // uint32_t qty = new_state.state.filled_quantity() - - // orig_state.filled_quantity(); UNUSED(qty); +void BookAlgo::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) +{ + UNUSED(orig_state);UNUSED(new_state); + // uint32_t qty = new_state.state.filled_quantity() - orig_state.filled_quantity(); + // UNUSED(qty); +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 689bb1da0..7c01878a0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; protected: virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, diff --git a/src/lib/orderman/orders/book_algos/CoverOrder.cpp b/src/lib/orderman/orders/book_algos/CoverOrder.cpp index 2805859e4..de1f773be 100644 --- a/src/lib/orderman/orders/book_algos/CoverOrder.cpp +++ b/src/lib/orderman/orders/book_algos/CoverOrder.cpp @@ -10,87 +10,94 @@ namespace orderman { using namespace api::orderman; -struct CoverOrder::PImpl { +struct CoverOrder::PImpl +{ PImpl() {} - - int hedge_ticks; - OrderDefinition hedge_def; + + int hedge_ticks; + OrderDefinition hedge_def; }; + CoverOrder::CoverOrder() : me(new PImpl()) {} CoverOrder::~CoverOrder() {} -void CoverOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void CoverOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_cover(); - auto const &cover_def = this_def.custom_def().cover(); + auto const &cover_def = this_def.custom_def().cover(); *out_child->mutable_custom_def() = cover_def.child(); - - me->hedge_ticks = cover_def.hedge_ticks(); + + me->hedge_ticks = cover_def.hedge_ticks(); } -bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderDefinition *out_hedge) { +bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_hedge) +{ auto const &cover_def = this_def.custom_def().cover(); - if (cover_def.has_hedge()) { - *out_hedge->mutable_custom_def() = cover_def.hedge(); - if (definition().side() == api::SIDE_BUY) + if(cover_def.has_hedge()) + { + *out_hedge->mutable_custom_def() = cover_def.hedge(); + if(definition().side() == api::SIDE_BUY) out_hedge->set_side(api::SIDE_SELL); else out_hedge->set_side(api::SIDE_BUY); return true; - } else + } + else return false; } -void CoverOrder::send_hedge_if_new_fills( - const api::orderman::OrderState &orig_state, - const OrderStateUpdateEvent &new_state) { +void CoverOrder::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) +{ uint32_t qty = new_state.filled_quantity - orig_state.filled_quantity(); - if (qty > 0) { + if(qty > 0) + { double prx = new_state.last_price; - if (definition().side() == - api::SIDE_BUY) // if this is a buy, I'm going to sell my hedge, nticks - // higher than the fill price + if(definition().side() == api::SIDE_BUY) //if this is a buy, I'm going to sell my hedge, nticks higher than the fill price prx = prx + tick_size() * me->hedge_ticks; else prx = prx - tick_size() * me->hedge_ticks; - + build_and_send_hedge(Price(prx), Quantity(qty)); } } -void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent &) { - switch (this_state().status()) { +void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent& ) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } break; - case ORDER_STATUS_WORKING: { - } break; - - case ORDER_STATUS_PENDING_WORKING: + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); + case ORDER_STATUS_WORKING: + { + } break; - } + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -106,8 +113,9 @@ void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent &) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/JoinOrder.cpp b/src/lib/orderman/orders/book_algos/JoinOrder.cpp index 1bf352523..46db1509c 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder.cpp +++ b/src/lib/orderman/orders/book_algos/JoinOrder.cpp @@ -10,90 +10,101 @@ namespace orderman { using namespace api::orderman; -struct JoinOrder::PImpl { +struct JoinOrder::PImpl +{ PImpl() {} - - spark::QuantityMeasure join_threshold; - - md::PriceSize opposite_at_inception; + + spark::QuantityMeasure join_threshold; + + md::PriceSize opposite_at_inception; bool did_join; }; + JoinOrder::JoinOrder() : me(new PImpl()) {} JoinOrder::~JoinOrder() {} -void JoinOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void JoinOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_join(); - auto const &join_def = this_def.custom_def().join(); + auto const &join_def = this_def.custom_def().join(); *out_child->mutable_custom_def() = join_def.child(); - + me->join_threshold = join_def.join_threshold(); me->did_join = false; } -void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { +void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) { - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } else { - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + if(definition().side() == api::SIDE_BUY) + { + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + else + { + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + report_state(); } - report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->join_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; - if (me->opposite_at_inception.price() > same.price()) { + break; + case ORDER_STATUS_WORKING: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->join_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + if(me->opposite_at_inception.price() > same.price()) + {} + //we join exactly once, but we can't detach because we have to hang around and look for hedges + else if(!me->did_join && same.size() >= thresh.value()) + { + me->did_join = true; + update_child(Price(same.price()), Quantity(this_state().quantity())); + report_state(); + } } - // we join exactly once, but we can't detach because we have to hang - // around and look for hedges - else if (!me->did_join && same.size() >= thresh.value()) { - me->did_join = true; - update_child(Price(same.price()), - Quantity(this_state().quantity())); - report_state(); - } - } else { - const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; - if (me->opposite_at_inception.price() < same.price()) { - } else if (!me->did_join && same.size() >= thresh.value()) { - me->did_join = true; - update_child(Price(same.price()), - Quantity(this_state().quantity())); - report_state(); + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + if(me->opposite_at_inception.price() < same.price()) + {} + else if(!me->did_join && same.size() >= thresh.value()) + { + me->did_join = true; + update_child(Price(same.price()), Quantity(this_state().quantity())); + report_state(); + } } + } + break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } - } break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } break; case ORDER_STATUS_COMPLETED: @@ -109,8 +120,9 @@ void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.cpp b/src/lib/orderman/orders/book_algos/LeanOrder.cpp index f538a8b2e..8d1213311 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder.cpp +++ b/src/lib/orderman/orders/book_algos/LeanOrder.cpp @@ -10,171 +10,185 @@ namespace orderman { using namespace api::orderman; -struct LeanOrder::PImpl { - PImpl() - : cross_threshold(), max_chase_ticks(0), - trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), - opposite_at_inception(), num_chases(0) {} - - spark::QuantityMeasure cross_threshold; - uint32_t max_chase_ticks; +struct LeanOrder::PImpl +{ + PImpl() : cross_threshold(), max_chase_ticks(0), trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), opposite_at_inception(), num_chases(0) + {} + + spark::QuantityMeasure cross_threshold; + uint32_t max_chase_ticks; LeanOrderDefinition_OnToward trade_toward_behavior; - - md::PriceSize opposite_at_inception; + + md::PriceSize opposite_at_inception; uint32_t num_chases; }; + LeanOrder::LeanOrder() : me(new PImpl()) {} LeanOrder::~LeanOrder() {} -void LeanOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void LeanOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_lean(); - auto const &lean_def = this_def.custom_def().lean(); + auto const &lean_def = this_def.custom_def().lean(); *out_child->mutable_custom_def() = lean_def.child(); - + me->cross_threshold = lean_def.cross_threshold(); - me->max_chase_ticks = lean_def.max_chase_ticks(); - me->trade_toward_behavior = lean_def.trade_toward_behavior(); + me->max_chase_ticks = lean_def.max_chase_ticks(); + me->trade_toward_behavior = lean_def.trade_toward_behavior(); } -void LeanOrder::payup(const md::PriceSize &, - const bts::orderman::BookUpdateEvent &book, - uint32_t cross_ticks /*= 0*/) { - double new_price = - me->opposite_at_inception.price() + tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if (new_price <= limit) +void LeanOrder::payup(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) +{ + double new_price = me->opposite_at_inception.price() + tick_size() * cross_ticks; + double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; + if(new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else { - update_child(Price(limit), Quantity(this_state().quantity())); + else + { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); return; - } - - const bts::orderman::BookSide &sellbook = - book.book.side(api::Side::SIDE_SELL); - for (const auto &i : sellbook) { + } + + const bts::orderman::BookSide& sellbook = book.book.side(api::Side::SIDE_SELL); + for(const auto& i : sellbook) + { me->opposite_at_inception = i; - if (me->opposite_at_inception.price() > new_price) + if(me->opposite_at_inception.price() > new_price) break; - } - if (me->opposite_at_inception.price() <= new_price) - detach(); - me->num_chases += cross_ticks + 1; - if (me->num_chases >= me->max_chase_ticks) - detach(); + } + if(me->opposite_at_inception.price() <= new_price) + detach(); + me->num_chases += cross_ticks+1; + if(me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::paydown(const md::PriceSize &, - const bts::orderman::BookUpdateEvent &book, - uint32_t cross_ticks /*= 0*/) { - double new_price = - me->opposite_at_inception.price() - tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if (new_price >= limit) +void LeanOrder::paydown(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) +{ + double new_price = me->opposite_at_inception.price() - tick_size() * cross_ticks; + double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; + if(new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else { - update_child(Price(limit), Quantity(this_state().quantity())); + else + { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); return; - } - - const bts::orderman::BookSide &buybook = book.book.side(api::Side::SIDE_BUY); - for (const auto &i : buybook) { + } + + const bts::orderman::BookSide& buybook = book.book.side(api::Side::SIDE_BUY); + for(const auto& i : buybook) + { me->opposite_at_inception = i; - if (me->opposite_at_inception.price() < new_price) + if(me->opposite_at_inception.price() < new_price) break; - } - if (me->opposite_at_inception.price() >= new_price) - detach(); - me->num_chases += cross_ticks + 1; - if (me->num_chases >= me->max_chase_ticks) - detach(); + } + if(me->opposite_at_inception.price() >= new_price) + detach(); + me->num_chases += cross_ticks+1; + if(me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::choose_trade_toward_behavior(const md::PriceSize &opposite) { - switch (me->trade_toward_behavior) { - case LeanOrderDefinition_OnToward_CANCEL: { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } break; - case LeanOrderDefinition_OnToward_DETACH: { - detach(); - } break; - case LeanOrderDefinition_OnToward_REPRICE: { - me->opposite_at_inception = opposite; - } break; - case LeanOrderDefinition_OnToward_NO_CHANGE: - default: - break; - } -} - -void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { - case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - else - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); +void LeanOrder::choose_trade_toward_behavior(const md::PriceSize& opposite) +{ + switch (me->trade_toward_behavior) + { + case LeanOrderDefinition_OnToward_CANCEL: + { + cancel_child(); + transition(ORDER_STATUS_CANCELED); report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->cross_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if (opposite.price() < me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if (opposite.price() > me->opposite_at_inception.price()) - payup(opposite, book); // you missed, payup/join - else { - if (opposite.size() <= thresh.value()) - payup(opposite, book); - } - } else { - const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if (opposite.price() > me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if (opposite.price() < me->opposite_at_inception.price()) - paydown(opposite, book); - else { - if (opposite.size() <= thresh.value()) - paydown(opposite, book); - } - } - } break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; } break; + case LeanOrderDefinition_OnToward_DETACH: + { + detach(); + } + break; + case LeanOrderDefinition_OnToward_REPRICE: + { + me->opposite_at_inception = opposite; + } + break; + case LeanOrderDefinition_OnToward_NO_CHANGE: + default: + break; + } +} + +void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { + case ORDER_STATUS_WORKING: + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + if(definition().side() == api::SIDE_BUY) + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + else + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } + break; + case ORDER_STATUS_WORKING: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->cross_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; + if(opposite.price() < me->opposite_at_inception.price()) + choose_trade_toward_behavior(opposite); + else if(opposite.price() > me->opposite_at_inception.price()) + payup(opposite, book); //you missed, payup/join + else + { + if(opposite.size() <= thresh.value()) + payup(opposite, book); + } + } + else + { + const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; + if(opposite.price() > me->opposite_at_inception.price()) + choose_trade_toward_behavior(opposite); + else if(opposite.price() < me->opposite_at_inception.price()) + paydown(opposite, book); + else + { + if(opposite.size() <= thresh.value()) + paydown(opposite, book); + } + } + } + break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + break; case ORDER_STATUS_COMPLETED: case ORDER_STATUS_CANCELED: @@ -189,8 +203,9 @@ void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp index 973d1c0ce..fad23cc55 100644 --- a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp +++ b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp @@ -10,65 +10,75 @@ namespace orderman { using namespace api::orderman; -struct OffsetOrder::PImpl { +struct OffsetOrder::PImpl +{ PImpl() {} - - uint32_t tick_offset_on_deploy; + + uint32_t tick_offset_on_deploy; }; + OffsetOrder::OffsetOrder() : me(new PImpl()) {} OffsetOrder::~OffsetOrder() {} -void OffsetOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void OffsetOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_tick(); - auto const &offset_def = this_def.custom_def().offset(); + auto const &offset_def = this_def.custom_def().offset(); *out_child->mutable_custom_def() = offset_def.child(); - - me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); + + me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); } -void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { + +void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) { - const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; - double price = - same.price() - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } else { - const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; - double price = - same.price() + tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + double price = same.price() - tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + double price = same.price() + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + report_state(); } - report_state(); - } break; - case ORDER_STATUS_WORKING: { - detach(); - } break; - - case ORDER_STATUS_PENDING_WORKING: break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); + case ORDER_STATUS_WORKING: + { + detach(); + } break; - } + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -84,8 +94,9 @@ void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/TickOrder.cpp b/src/lib/orderman/orders/book_algos/TickOrder.cpp index d05404458..105d74084 100644 --- a/src/lib/orderman/orders/book_algos/TickOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TickOrder.cpp @@ -10,146 +10,165 @@ namespace orderman { using namespace api::orderman; -struct TickOrder::PImpl { +struct TickOrder::PImpl +{ PImpl() {} - - uint32_t tick_offset_on_deploy; - spark::QuantityMeasure cross_threshold; - uint32_t cross_ticks; - uint32_t max_chase_ticks; + + uint32_t tick_offset_on_deploy; + spark::QuantityMeasure cross_threshold; + uint32_t cross_ticks; + uint32_t max_chase_ticks; bool detach_on_toward; - - md::PriceSize opposite_at_inception; + + md::PriceSize opposite_at_inception; }; + TickOrder::TickOrder() : me(new PImpl()) {} TickOrder::~TickOrder() {} -void TickOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void TickOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_tick(); - auto const &tick_def = this_def.custom_def().tick(); + auto const &tick_def = this_def.custom_def().tick(); *out_child->mutable_custom_def() = tick_def.child(); - - me->tick_offset_on_deploy = tick_def.tick_offset_on_deploy(); + + me->tick_offset_on_deploy = tick_def.tick_offset_on_deploy(); me->cross_threshold = tick_def.cross_threshold(); me->cross_ticks = tick_def.cross_ticks(); - me->max_chase_ticks = tick_def.max_chase_ticks(); + me->max_chase_ticks = tick_def.max_chase_ticks(); me->cross_threshold = tick_def.cross_threshold(); - me->detach_on_toward = tick_def.detach_on_toward(); + me->detach_on_toward = tick_def.detach_on_toward(); } -void TickOrder::payup(const md::PriceSize &opposite, - const bts::orderman::BookUpdateEvent &, - uint32_t cross_ticks) { +void TickOrder::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) +{ double new_price = opposite.price() + tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if (new_price <= limit) + double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; + if(new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else { + else + { update_child(Price(limit), Quantity(this_state().quantity())); detach(); } report_state(); } -void TickOrder::paydown(const md::PriceSize &opposite, - const bts::orderman::BookUpdateEvent &, - uint32_t cross_ticks) { +void TickOrder::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) +{ double new_price = opposite.price() - tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if (new_price >= limit) + double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; + if(new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else { - update_child(Price(limit), Quantity(this_state().quantity())); + else + { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); } report_state(); } -void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { +void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) { - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - if (me->tick_offset_on_deploy > 0) { - double price = me->opposite_at_inception.price() - - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } else { - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - } else { - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - if (me->tick_offset_on_deploy > 0) { - double price = me->opposite_at_inception.price() + - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } else { - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - } - report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->cross_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if (opposite.price() < me->opposite_at_inception.price()) { - if (me->detach_on_toward) - detach(); + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + if(definition().side() == api::SIDE_BUY) + { + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + if(me->tick_offset_on_deploy > 0) + { + double price = me->opposite_at_inception.price() - tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else - me->opposite_at_inception = opposite; - } else if (opposite.price() > me->opposite_at_inception.price()) - payup(opposite, book, me->cross_ticks); - else { - if (opposite.size() <= thresh.value()) + { + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + } + else + { + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + if(me->tick_offset_on_deploy > 0) + { + double price = me->opposite_at_inception.price() + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + else + { + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + } + report_state(); + } + break; + case ORDER_STATUS_WORKING: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->cross_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; + if(opposite.price() < me->opposite_at_inception.price()) + { + if(me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } + else if(opposite.price() > me->opposite_at_inception.price()) payup(opposite, book, me->cross_ticks); - } - } else { - const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if (opposite.price() > me->opposite_at_inception.price()) { - if (me->detach_on_toward) - detach(); else - me->opposite_at_inception = opposite; - } else if (opposite.price() < me->opposite_at_inception.price()) - paydown(opposite, book, me->cross_ticks); - else { - if (opposite.size() <= thresh.value()) - paydown(opposite, book, me->cross_ticks); + { + if(opposite.size() <= thresh.value()) + payup(opposite, book, me->cross_ticks); + } } + else + { + const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; + if(opposite.price() > me->opposite_at_inception.price()) + { + if(me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } + else if(opposite.price() < me->opposite_at_inception.price()) + paydown(opposite, book, me->cross_ticks); + else + { + if(opposite.size() <= thresh.value()) + paydown(opposite, book, me->cross_ticks); + } + } + } + break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } - } break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } break; case ORDER_STATUS_COMPLETED: @@ -165,8 +184,9 @@ void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/TopOrder.cpp b/src/lib/orderman/orders/book_algos/TopOrder.cpp index 8fded05b5..1feb1e6cf 100644 --- a/src/lib/orderman/orders/book_algos/TopOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TopOrder.cpp @@ -1,8 +1,8 @@ #include "TopOrder.h" -#include "lib/domain_model/Security.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/domain_model/Security.h" #include "lib/utils/PBUtils.h" #include @@ -11,102 +11,118 @@ namespace orderman { using namespace api::orderman; -struct TopOrder::PImpl { +struct TopOrder::PImpl +{ PImpl() {} - + uint32_t watch_level_tick_offset; - spark::QuantityMeasure top_threshold; + spark::QuantityMeasure top_threshold; }; + TopOrder::TopOrder() : me(new PImpl()) {} TopOrder::~TopOrder() {} -void TopOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void TopOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_top(); auto const &top_def = this_def.custom_def().top(); *out_child->mutable_custom_def() = top_def.child(); - + me->watch_level_tick_offset = top_def.watch_level_tick_offset(); me->top_threshold = top_def.top_threshold(); } -void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { + +void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->top_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; - if (securities::test_price_equality(this_state().price(), - same.price(), tick_size())) { - if (same.size() <= thresh.value()) { - transition(ORDER_STATUS_CANCELED); - report_state(); - return; + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; + } } } - } else { - const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; - if (securities::test_price_equality(this_state().price(), - same.price(), tick_size())) { - if (same.size() <= thresh.value()) { - transition(ORDER_STATUS_CANCELED); - report_state(); - return; + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; + } } - } - } - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->top_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; - if (securities::test_price_equality(this_state().price(), - same.price(), tick_size())) { - if (same.size() <= thresh.value()) { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } - } - } else { - const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; - if (securities::test_price_equality(this_state().price(), - same.price(), tick_size())) { - if (same.size() <= thresh.value()) { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } - } - } - } break; - - case ORDER_STATUS_PENDING_WORKING: + } + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); + case ORDER_STATUS_WORKING: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + } + } + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + } + } + } break; - } + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -122,8 +138,9 @@ void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index 07cefede3..c5519bddb 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -34,7 +34,7 @@ public: // 5. called when the user cancels an order virtual void on_cancel() = 0; // 6. on market data update (support late joiners) - virtual void on_book(const Book&,trace::CorID ) = 0; + virtual void on_book(const Book&,PerfTrace &) = 0; // 15. settlement price update virtual void on_settlement_price(const SettlementUpdateEvent&) = 0; // 7. time event called by the infrastructure @@ -43,7 +43,7 @@ public: virtual void on_quoter_order_error(SpreaderLegData& leg_data) = 0; // 9. on a quoter order fill virtual void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) = 0; + PerfTrace &) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 0737f204f..cccba1190 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -54,26 +54,26 @@ void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& ord _report_state(); } void SpreaderOrder::on_activate(Price price, Quantity quantity, - OrderServices& services, const trace::CorID&){ + OrderServices& services, const PerfTrace&){ if (!_active) return; SpreaderOrderServices spreader_order_services (&services); _on_activate(price, quantity, spreader_order_services); _report_state(); } -void SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){ +void SpreaderOrder::on_update(Price price, Quantity quantity,PerfTrace const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); _state_worker->on_update(price, quantity); _report_state(); } -void SpreaderOrder::on_cancel(trace::CorID const&){ +void SpreaderOrder::on_cancel(PerfTrace const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_cancel key:{}", key().value()); _state_worker->on_cancel(); _report_state(); } -void SpreaderOrder::on_crack(trace::CorID const&){ +void SpreaderOrder::on_crack(PerfTrace const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_crack key: {}", key().value()); _state_worker->on_crack(); @@ -100,9 +100,10 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; - - _order_services->order_services().log(book_event.trace,"spreader_on_book", key().value()); - _state_worker->on_book (book_event.book,book_event.trace); + tracepoint (bts_trace,trace_order,(char*) "_on_book_update", key().value(),book_event.trace.md_sn,0); + auto trace = book_event.trace; + trace.spreader_on_book = utils::TimeStamp::now(); + _state_worker->on_book (book_event.book,trace); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event){ @@ -115,8 +116,9 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& _state_worker->on_settlement_price(settlement_event); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ + auto trace = ord_ev.trace; + trace.spreader_on_child_order_update = utils::TimeStamp::now(); if (!_active) return; - _order_services->order_services().log(ord_ev.trace,"begin_on_child_order_update", key().value()); SecurityKey sec_key = SecurityKey(ord_ev.definition->security_key()); OrderKey order_key = ord_ev.key; bts::api::orderman::OrderStatus status = ord_ev.status; @@ -148,7 +150,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ leg_data.order_update_message().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0) - _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); + _state_worker->on_quoter_order_fill (leg_data,trace); else _state_worker->on_quoter_order_status_update (leg_data); } @@ -184,7 +186,8 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ } _send_check_termination(true); _report_state(); - _order_services->order_services().log(ord_ev.trace,"end_on_child_order_update", key().value()); + LOG(Latency,Diag, "_on_child_order_update k:{} t:{}us", key().value(), + (utils::TimeStamp::now() - trace.spreader_on_child_order_update).microseconds()); } // State Transformations //////////////////// ///////////////////////////////////////////// @@ -312,8 +315,10 @@ bool SpreaderOrder::_quoters_can_accept_modification (){ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - const trace::CorID trace){ - + const PerfTrace &trace){ + LOG(OrderMan, Info, "SpreaderOrder::_send_hedge key:{} hedge_leg_index:{} " + "hedge_price:{} hedge_qty:{} cid:{}", + key(), hedge_leg_index, hedge_price, hedge_qty, trace.md_sn); SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, hedge_leg_index, hedge_price, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 3835e922b..9b377d948 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -99,15 +99,15 @@ public: const PreActivationOrderServices&) override; // this is in the critical path, orders can be submitted now // (this is only called once and after the on_init_new) - void on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override; + void on_activate(Price, Quantity, OrderServices&,PerfTrace const&) override; // called when the user (or a higher level order) // updates the order's price or quantity - void on_update(Price, Quantity,trace::CorID const&) override; + void on_update(Price, Quantity,PerfTrace const&) override; // called when the user (or higher level order) cancels an order - void on_cancel(trace::CorID const&) override; + void on_cancel(PerfTrace const&) override; // crack means to let the lower level orders lose from the higher // level order and cancel the higher level order - void on_crack(trace::CorID const&) override; + void on_crack(PerfTrace const&) override; // ISpreaderManager //////////////////// //////////////////////////////////////// public: @@ -178,7 +178,7 @@ private: void _send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - trace::CorID const); + PerfTrace const&); void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, @@ -251,7 +251,7 @@ public: SpreaderBookkeepingData& test_only_func_spreader_full_data () {return _bookkeeping_data();} int64_t test_cancel_timeout () {return _cancel_timeout;} void test_only_on_book_update(const bts::orderman::BookUpdateEvent& b) {_on_book_update(b);} - void test_only_on_book_update(const bts::orderman::Book& b, trace::CorID const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} + void test_only_on_book_update(const bts::orderman::Book& b, PerfTrace const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} void test_only_on_child_order_update (bts::orderman::OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, Price avg_price) { bts::api::orderman::OrderDefinition order_def; @@ -260,7 +260,7 @@ public: order_state.set_status(status); order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); - OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,trace::CorID()); + OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,PerfTrace()); _on_child_order_update (ord_ev); } void test_only_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& pao_services) {_on_init_new(order_def, pao_services);} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 2060e02fd..5025a4c2d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -14,7 +14,7 @@ SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - trace::CorID const &fill_trace, + PerfTrace const &fill_trace, bool is_live) : _spreader(spreader_manager), @@ -94,7 +94,7 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ u.last_update_filled_quantity()); _worker->on_order_update (u); } -void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &trace){ +void SingleFillHedger::on_book(const bts::orderman::Book& book,PerfTrace &trace){ _worker->on_book (book,trace); } void SingleFillHedger::cancel_hedge(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 1e3bf495c..9b9fa926c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -30,7 +30,7 @@ private: const LegPropertyData& _leg_property_data; SpreaderChildOrderState _child_order_state; HedgePriceQuantityState _price_quantity_state; - trace::CorID _fill_trace; + PerfTrace _fill_trace; IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker; @@ -71,7 +71,7 @@ public: ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - trace::CorID const &trace, + PerfTrace const &trace, bool is_live); SingleFillHedger() = delete; SingleFillHedger (const SingleFillHedger&) = delete; @@ -88,7 +88,7 @@ public: void on_order_update(const SpreaderChildOrderState& order_update_message); //c. called when the market data associated // with this security is changed - void on_book(const bts::orderman::Book& book,trace::CorID &); + void on_book(const bts::orderman::Book& book,PerfTrace &); //d. called when the hedge order is cancelled, either // manually or automatically void cancel_hedge(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 23860e5dd..573b1dbf8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -101,7 +101,7 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ } } void SingleLegQuoter::on_book(size_t leg_index, - const bts::orderman::Book& book,trace::CorID trace){ + const bts::orderman::Book& book,PerfTrace &trace){ if (_active_quoting) _worker->on_book (leg_index, book,trace); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 0a35fb934..c55968042 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -101,7 +101,7 @@ public: //c. called when the market data associated // with this security is changed void on_book(size_t leg_index, - const bts::orderman::Book&,trace::CorID ); + const bts::orderman::Book&,PerfTrace &); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); @@ -171,13 +171,13 @@ private: } void _place_order (Price price, Quantity quantity, - const trace::CorID &trace) { + const PerfTrace &trace) { _child_order_state.place_order(price, quantity, _spreader.current_time(), trace); } - void _modify_order (Price price, Quantity quantity, trace::CorID &trace) { + void _modify_order (Price price, Quantity quantity, PerfTrace &trace) { _child_order_state.modify_order(price, quantity, trace); } void _cancel_order () {_child_order_state.cancel_order();} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 7a3c8d5b5..2e8064684 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -84,10 +84,10 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - const trace::CorID &trace){ + const PerfTrace &trace){ LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " "leg_index:{} price:{} quantity:{} cid:{}", - leg_index, hedge_price, hedge_quantity,trace.sn); + leg_index, hedge_price, hedge_quantity,trace.md_sn); bts_assert(leg_index < _n_legs); SpreaderLegData& leg_data = _leg_data[leg_index]; std::vector& leg_hedgers = _hedgers[leg_index]; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 0d1b4832f..77998a4f1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -108,7 +108,7 @@ public: size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - trace::CorID const &); + PerfTrace const &); // finds the spreader fill, price (ie averages it out, using // the size and price ratio, across all legs) void total_fills (Quantity& out_quantity, Price& out_price) const; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 1f8f9c875..aa42e7b85 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -130,7 +130,7 @@ public: void place_order(Price price, Quantity quantity, bts::TimeStamp curr_time, - const trace::CorID& trace){ + const PerfTrace& trace){ _out_price = price; _out_quantity = quantity; _order_place_time=curr_time; @@ -140,15 +140,15 @@ public: "key:{} is_quoting:{} sec_key:{} live:{} " "price:{} qty:{} cid:{}", order_key(), _is_quoting, _sec_key, - _is_live, price, quantity, trace.sn); + _is_live, price, quantity, trace.md_sn); if (_is_live) _child_order.activate(price, quantity, trace); } void modify_order(Price price, Quantity quantity){ - trace::CorID dont_care; + PerfTrace dont_care; modify_order(price,quantity,dont_care); } - void modify_order(Price price, Quantity quantity, trace::CorID &trace){ + void modify_order(Price price, Quantity quantity, PerfTrace &trace){ _out_price = price; _out_quantity = quantity; _n_modify_orders++; @@ -158,6 +158,7 @@ public: order_key(), _is_quoting, _sec_key, _is_live, price, quantity, _n_modify_orders); if (_is_live) { + trace.spreader_modify_order = utils::TimeStamp::now(); _child_order.update(price, quantity, trace); } } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index ff966a518..186c8d074 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -5,7 +5,6 @@ #include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" namespace bts { -namespace trace {struct CorID;} namespace orderman {class Book;} namespace orderman { class SpreaderChildOrderState; @@ -25,7 +24,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on // has a market data update - virtual void on_book (const bts::orderman::Book& book,trace::CorID &) = 0; + virtual void on_book (const bts::orderman::Book& book,PerfTrace &) = 0; // when the spreader wants the hedger to cancel its order virtual void cancel() = 0; // on terminate, the hedger should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index 61ce32ef4..ac6a92a71 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -9,7 +9,7 @@ void HedgerEndStateWorker::init(){ } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } -void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerEndStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerEndStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h index 549d67306..1ab5917b5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -17,7 +17,7 @@ public: const std::string state_text () const override {return "END";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index 1ed919153..b23d78c92 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerStartStateWorker::init(){ void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ bts_assert_msg (false, "HedgerStartStateWorker::on_order_update illegal operation"); } -void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ // market data will not be sent until out of start. bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 12757001b..37c9c79ef 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "START";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index c31a3a112..92bc38267 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -17,7 +17,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr _hedger->transform_to_END (); } } -void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index d2be51786..6a7800ec5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp index 084b8c3de..e8b5bf049 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp @@ -23,7 +23,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade _hedger->transform_to_WAITING_FOR_CANCEL_ACK (); } } -void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h index 97383f885..21f542f5b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp index cb99478c4..8e5a7e396 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrd // this means the first ack _hedger->transform_to_WORKING (); } -void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForFirstAckStateWorker::cancel(){ _hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h index b1ca9c5f0..900e6b4ed 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index aebb18a6a..019b87e21 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -20,7 +20,7 @@ void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& or _hedger->transform_to_END (); } } -void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ double new_price; if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.out_quantity().value(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index 1e23979ff..be0201d94 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -24,7 +24,7 @@ public: const std::string state_text () const override {return "WORKING";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h index a83697af0..909239e1b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h @@ -26,7 +26,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called when any of the legs in the spread has a book update //virtual void on_book (TickToTradeCorID corid, size_t leg_id, const Book& book) = 0; - virtual void on_book (size_t, const bts::orderman::Book&,trace::CorID &) = 0; + virtual void on_book (size_t, const bts::orderman::Book&,PerfTrace &) = 0; // when the spreader wants the quoter to cancel its order virtual void cancel() = 0; // on terminate, the quoter should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index 24c417c8f..d73bfc9b4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -29,7 +29,7 @@ void QuoterEndStateWorker::one_time_activate (Price, Quantity){ void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&) {} void QuoterEndStateWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &) + const bts::orderman::Book&,PerfTrace &) {} void QuoterEndStateWorker::cancel() {} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h index 2a52ee1a6..c8342757a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -25,7 +25,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 38d3b9dea..754a3aa47 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -24,7 +24,7 @@ void QuoterStartStateWorker::on_order_update (const SpreaderChildOrderState&){ bts_assert_msg (false, "QuoterStartStateWorker::on_order_update is an illegal operation, nothing can happen before one_time_activate"); } void QuoterStartStateWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&,PerfTrace &){ } void QuoterStartStateWorker::cancel(){ // since no order has been sent for this leg, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h index dae5ada02..05e9f74d2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index bf493f55f..bbef8d47c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -21,7 +21,7 @@ void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderChildO } void QuoterWaitingForCancelAckStateWorker::on_book (size_t, const bts::orderman::Book&, - trace::CorID &){ + PerfTrace &){ } void QuoterWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index 9ef9d2409..bd8a4be24 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -24,7 +24,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index b674b1d3b..dac791970 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -25,7 +25,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderChi _quoter->_transform_to_WAITING_FOR_CANCEL_ACK (); } } -void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,trace::CorID &) { +void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,PerfTrace &) { } void QuoterWaitingForFirstAckCancelledWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index 085e9b919..60db96ace 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index cd5e845b2..c68d7db84 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -22,7 +22,7 @@ void QuoterWaitingForFirstAckWorker::on_order_update (const SpreaderChildOrderSt _quoter->_transform_to_WORKING (); } void QuoterWaitingForFirstAckWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&,PerfTrace &){ _analyze_and_act(); } void QuoterWaitingForFirstAckWorker::cancel(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index d4c8d0ed0..ded3b991b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -28,7 +28,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID & ) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace & ) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index 588761444..a4a17678f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -24,7 +24,7 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& } } void QuoterWaitingForIOCWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&,PerfTrace &){ } void QuoterWaitingForIOCWorker::cancel(){ _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h index 69ba40109..48bf749eb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -31,7 +31,7 @@ public: void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (size_t leg_id, - const bts::orderman::Book& book,trace::CorID &) override; + const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index 6cefbfcf3..d5e90f133 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -20,7 +20,7 @@ void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderS "is an illegal operation"); } void QuoterWaitingForSizeStateWorker::on_book (size_t, - const Book&,trace::CorID &trace){ + const Book&,PerfTrace &trace){ _longpath_analyze_and_act (trace); } void QuoterWaitingForSizeStateWorker::cancel(){ @@ -45,10 +45,10 @@ void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, _longpath_analyze_and_act (); } void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(){ - trace::CorID trace; + PerfTrace trace; _longpath_analyze_and_act(trace); } -void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &trace){ +void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(PerfTrace &trace){ if (_quoter->_price_quantity_state.target_reached()){ LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} " "target reached, transforming to end", diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index 5cbad6abf..830e61557 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -41,6 +41,6 @@ private: // if it has. otherwise computes the price, qty and if // its valid, places an order goes to waiting_for_first_ack void _longpath_analyze_and_act (); - void _longpath_analyze_and_act (trace::CorID &); + void _longpath_analyze_and_act (PerfTrace &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 0c505d9b6..8fcf93397 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -31,7 +31,7 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderChildOrderState& u } void QuoterWorkingStateWorker::on_book (size_t, const bts::orderman::Book&, - trace::CorID &trace){ + PerfTrace &trace){ _longpath_analyze_and_act (trace); } void QuoterWorkingStateWorker::cancel(){ @@ -55,10 +55,10 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price, } void QuoterWorkingStateWorker::_longpath_analyze_and_act () { - trace::CorID trace; + PerfTrace trace; _longpath_analyze_and_act(trace); } -void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) +void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) { if (_quoter->_price_quantity_state.target_reached()){ // this could happen if @@ -94,7 +94,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) } } } -void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,trace::CorID &trace ){ +void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,PerfTrace &trace ){ bool same_price_qty = _quoter->_price_quantity_state.out_quantity() == quantity && bts::securities::test_price_equality(_quoter->_price_quantity_state.out_price().value(), price.value(), _quoter->_this_leg_data.tick_size()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h index e7f5ee612..a0568256f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -34,8 +34,8 @@ private: // i. if target reached => cxl order and go to waiting_for_cancel_ack_final // ii. if computed_qty = 0 => cxl order and go to waiting_for_cancel_ack_continue // iii. if reprice (ie qty changed or price changed beyond the threshold) => requote - void _longpath_analyze_and_act (trace::CorID &); + void _longpath_analyze_and_act (PerfTrace &); void _longpath_analyze_and_act (); - void _modify_order (Price price, Quantity quantity,trace::CorID &); + void _modify_order (Price price, Quantity quantity,PerfTrace &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index b0bc2c9dc..2dcd517cb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -34,7 +34,7 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(const Book&,trace::CorID){ +void SpreaderEndStateWorker::on_book(const Book&,PerfTrace&){ } void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -43,7 +43,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){ void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ + PerfTrace&){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index cdf791845..2c19c9bcd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,12 +20,12 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID) override; + void on_book(const Book&,PerfTrace&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID) override; + PerfTrace&) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index adc4108e2..2d7169017 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -89,21 +89,21 @@ void SpreaderStartStateWorker::on_activate(Price price, { // 4. sub to child orders order // (could have hidden that inside SpreaderOrderServices by exposing events) - order_services.order_services().subscribe_to_child_updates([this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); + order_services.order_services().child_updates.sub(_spreader->key(), [this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); // 5. sub to market data for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++) { const LegPropertyData& leg_prop = _spreader->_bookkeeping_data().get_leg_data(l_idx).leg_property_data(); LOG(OrderMan, Info, "SpreaderStartStateWorker::on_activate subbing to book sec_key: {}", leg_prop.security_key()); - order_services.order_services().subscribe_to_book(leg_prop.leg_security_key(), - [this](const BookUpdateEvent& bk_event) - {_spreader->_on_book_update (bk_event);}); - order_services.order_services().subscribe_to_settlements(leg_prop.leg_security_key(), - [this](const SettlementUpdateEvent& s_event) - {_spreader->_on_settlement_update (s_event);}); + order_services.order_services().book_updates.sub(leg_prop.leg_security_key(), + [this](const BookUpdateEvent& bk_event) + {_spreader->_on_book_update (bk_event);}); + order_services.order_services().settlement_updates.sub(leg_prop.leg_security_key(), + [this](const SettlementUpdateEvent& s_event) + {_spreader->_on_settlement_update (s_event);}); } // 6. sub to time - order_services.order_services().subscribe_to_time([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); + order_services.order_services().time_change.sub([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); } // quoters are init'ed in the next state _spreader->_transform_to_WAITING_FOR_INITIAL_DATA(); @@ -117,7 +117,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID ){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){ @@ -131,7 +131,7 @@ void SpreaderStartStateWorker::on_quoter_order_error(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_error is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ + PerfTrace&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index 78e92a3cd..fe2f863ac 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&,PerfTrace &) override; void on_time(const TimeStamp&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index d58ea59d5..dbc6b2955 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -33,7 +33,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_update(Price, } void SpreaderWaitingForCancelAllStateWorker::on_cancel(){ } -void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID ){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,PerfTrace &){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -48,7 +48,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegDa leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ){ + PerfTrace &){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index cf6f7ca0b..0ff8771a7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,12 +23,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&,PerfTrace &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index e69c0e62a..2cc07d80c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -46,7 +46,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_cancel(){ _spreader->_transform_to_END(); } void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book, - trace::CorID){ + PerfTrace&){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); md_leg.update_book(book); @@ -71,7 +71,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg "on_quoter_order_error is an illegal operation"); } void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ + PerfTrace&){ bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_fill is an illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index c344a8542..b9bd5c2f9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID) override; + void on_book(const Book&,PerfTrace &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; @@ -40,4 +40,4 @@ private: void _init_quoters(); void _go_to_working(); }; -}} +}} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 59fc70fbb..4a32b5451 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -42,7 +42,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){ +void SpreaderWorkingStateWorker::on_book(const Book& book,PerfTrace &trace){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -78,7 +78,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID trace){ + PerfTrace &trace){ // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) // 2. launch a new hedger diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index 214e2eba1..e832eef41 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -22,12 +22,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&,PerfTrace &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 4baf91726..b3bd2bbef 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -47,7 +47,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (0.0)); REQUIRE (s.out_quantity() == Quantity (0)); // set out price and quantity - trace::CorID dont_care; + PerfTrace dont_care; bts::TimeStamp ts; order.place_order(Price (-0.35), Quantity (123),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -102,7 +102,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") s.add_hedged_reduction (Quantity(5)); s.add_hedged_reduction (Quantity(15)); // set out values - trace::CorID dont_care; + PerfTrace dont_care; bts::TimeStamp ts; order_2.place_order (Price(1), Quantity (50),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -1250,7 +1250,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SECTION("0. transition_to_start") @@ -1300,7 +1300,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1359,7 +1359,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1420,7 +1420,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1492,7 +1492,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1549,7 +1549,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SpreaderChildOrderState& u = hedger.order_state(); @@ -1651,7 +1651,7 @@ TEST_CASE ("spreader_START", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(PerfTrace()); REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); LOG(OrderMan, Diag, "spreader_START.on_cancel"); } @@ -1763,7 +1763,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // be as is spreader_price = Price (0); spreader_quantity = Quantity (200); - spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); + spreader.on_update (spreader_price, spreader_quantity,PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); @@ -1773,7 +1773,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); @@ -1794,7 +1794,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2005, 2006, 2007, 2008, 2009}, new uint16_t[5] {0, 0, 0, 0, 0}, true); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + spreader.test_only_on_book_update (modified_book, PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WORKING, false); generic_validate_hedgers (HedgerState::WORKING); @@ -1808,8 +1808,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book,trace::CorID()); + //spreader.on_book (bts::orderman::PerfTrace(), modified_book); + spreader.test_only_on_book_update (modified_book,PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1824,8 +1824,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book,trace::CorID()); + //spreader.on_book (bts::orderman::PerfTrace(), modified_book); + spreader.test_only_on_book_update (modified_book,PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1838,8 +1838,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + //spreader.on_book (bts::orderman::PerfTrace(), modified_book); + spreader.test_only_on_book_update (modified_book, PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1853,8 +1853,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + //spreader.on_book (bts::orderman::PerfTrace(), modified_book); + spreader.test_only_on_book_update (modified_book, PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -2068,7 +2068,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // now cancel the spreader bts::TimeStamp cancel_timestamp = std::chrono::system_clock::now(); spreader.test_only_on_time (cancel_timestamp); - spreader.on_cancel (trace::CorID()); + spreader.on_cancel (PerfTrace()); auto validate_state = [&]() -> void { verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); @@ -2091,7 +2091,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("4. on_update") { - spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); + spreader.on_update (Price(-0.05), Quantity(200),PerfTrace()); validate_state(); // order changes dont go through validate_state(); @@ -2099,7 +2099,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(PerfTrace()); // already in cancel state, no change validate_state(); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); @@ -2668,10 +2668,10 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; @@ -2804,11 +2804,11 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") new uint16_t[5] {100,150,250,25,125}, true); spreader.test_only_on_book_update (BookUpdateEvent(book_1, - trace::CorID())); + PerfTrace())); spreader.test_only_on_book_update (BookUpdateEvent(book_2, - trace::CorID())); + PerfTrace())); spreader.test_only_on_book_update (BookUpdateEvent(book_3, - trace::CorID())); + PerfTrace())); verify_complete_quoter_state (qleg_data_4.quoter(), QuoterState::WAITING_FOR_FIRST_ACK, false, @@ -2843,10 +2843,10 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index 0f570d31e..7792d29c3 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -390,7 +390,7 @@ void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t l bts::orderman::Book book; fill_book (book, prices, sizes, side); sm.set_book (book, leg_index); - trace::CorID trace; + PerfTrace trace; quoter.on_book (leg_index, book,trace); } void verify_leg_data (SpreaderLegData& l, bts::orderman::OrderKey, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) @@ -441,7 +441,7 @@ void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, S { bts::orderman::Book book; fill_book (book, prices, sizes, side); - trace::CorID trace; + PerfTrace trace; hedger.on_book (book,trace); } void verify_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity, @@ -525,11 +525,11 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin bts::orderman::Book book_leg_1 = get_book (SecurityKey (leg_1_id), 5, leg_1_bid_prices, leg_1_bid_sizes, leg_1_ask_prices, leg_1_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, trace::CorID())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, PerfTrace())); bts::orderman::Book book_leg_2 = get_book (SecurityKey (leg_2_id), 5, leg_2_bid_prices, leg_2_bid_sizes, leg_2_ask_prices, leg_2_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,trace::CorID())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,PerfTrace())); spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price)); spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price)); } diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 9259a2a7c..9eb1abb06 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -9,6 +9,7 @@ #include "lib/mercury/executor/Executor.h" #include "lib/metrics/metrics.h" #include "lib/orderman/actors/AsyncFactory.h" +#include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/actors/FillStore.h" #include "lib/orderman/actors/MDSource.h" #include "lib/orderman/actors/MDSupplementarySource.h" @@ -17,12 +18,12 @@ #include "lib/orderman/actors/ServiceBridge.h" #include "lib/orderman/actors/order_manager/OrderManager.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" #include "lib/utils/bts_chrono.h" +#include "lib/plugin/plugin.h" +#include "lib/plugin/SparkServices.h" #include "lib/utils/thread_manager.h" #include "lib/utils/type_name.h" - + #include namespace bts { @@ -89,11 +90,12 @@ ActorThread *find_thread_for_actor( struct OrderServiceServer::PImpl { PImpl(bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, trace::PerfLog &log) + DynamicOrderRegistry const &d, + metrics::MetricsContainer &stats) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), md_consumer(ss), - stats(stats), dyn_order_registry(d),log(log) {} + stats(stats), dyn_order_registry(d) {} ServiceBridge *service_bridge; @@ -109,16 +111,15 @@ struct OrderServiceServer::PImpl { bts::md::MDConsumer md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; - trace::PerfLog &log; }; OrderServiceServer::OrderServiceServer( bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, - trace::PerfLog &log) - : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats,log)) { - + DynamicOrderRegistry const&d, + metrics::MetricsContainer &stats, PerfTraceLog &log) + : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d,stats)) { + me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); @@ -137,14 +138,23 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for MDSource. See the " "OrdermanCfg key"); - thread->executor.spawn(me->md_consumer, me->stats,log); + thread->executor.spawn(me->md_consumer, me->stats); // OrderManager thread = find_thread_for_actor("OrderManager", me->actor_threads); bts_assert_msg(thread, "Could not find a configured thread for OrderManager. See " "the OrdermanCfg key"); - thread->executor.spawn(d,me->log); + thread->executor.spawn(d); + + // ExecutionGateway's + thread = find_thread_for_actor("ExecutionGateway", me->actor_threads); + bts_assert_msg(thread, + "Could not find a configured thread for ExecutionGateway " + "instances. See the OrdermanCfg key"); + auto &all_connections = config::get().connection(); + for (auto const &c : all_connections) + thread->executor.spawn(c, log); // Timer thread = find_thread_for_actor("Timer", me->actor_threads); @@ -204,7 +214,9 @@ OrderServiceServer::OrderServiceServer( [this, &ctx](auto const &fill) { ctx.post([this, fill] { this->on_fills(fill); }); }, - me->dyn_order_registry, thread->executor.make_proxy()); + me->dyn_order_registry, + thread->executor.make_proxy()); + thread->executor.activate(me->service_bridge); diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index 4c23c13f9..526a63b2a 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -6,7 +6,7 @@ #include namespace bts { -namespace trace {class PerfLog;} +class PerfTraceLog; namespace api { class ISyntheticSecurityService; } @@ -22,7 +22,7 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { std::shared_ptr &, DynamicOrderRegistry const&, metrics::MetricsContainer &, - trace::PerfLog &); + PerfTraceLog &); ~OrderServiceServer(); void create_order(const api::orderman::Create &, diff --git a/src/lib/orderman/tests/fat_wrapper_tests.cpp b/src/lib/orderman/tests/fat_wrapper_tests.cpp index b3a45dc12..0472ca363 100644 --- a/src/lib/orderman/tests/fat_wrapper_tests.cpp +++ b/src/lib/orderman/tests/fat_wrapper_tests.cpp @@ -6,14 +6,16 @@ namespace mercury { struct A { std::string s; - bool operator==(const A &src) const { return src.s == s; } + bool operator==(const A&src) const {return src.s == s;} }; -TEST_CASE("FatWrapperTests", "[mercury]") { +TEST_CASE ("FatWrapperTests" , "[mercury]") +{ - SECTION("fat_wrapper_works_small") { - mercury::FatWrapper<128> fw; - A a{"hello"}; + SECTION("fat_wrapper_works_small") + { + mercury::FatWrapper <128> fw; + A a {"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); @@ -21,13 +23,14 @@ TEST_CASE("FatWrapperTests", "[mercury]") { fw2 = fw; REQUIRE(a == fw2.unwrap()); - auto fw3(fw); + auto fw3 (fw); REQUIRE(a == fw3.unwrap()); } - SECTION("fat_wrapper_works_big") { - mercury::FatWrapper<32> fw; - A a{"hello"}; + SECTION("fat_wrapper_works_big") + { + mercury::FatWrapper <32> fw; + A a {"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); @@ -35,16 +38,16 @@ TEST_CASE("FatWrapperTests", "[mercury]") { fw2 = fw; REQUIRE(a == fw2.unwrap()); - auto fw3(fw); + auto fw3 (fw); REQUIRE(a == fw3.unwrap()); } - SECTION("empty_can_be_copied") { - mercury::FatWrapper<64> fw; - mercury::FatWrapper<64> fw2; - fw2 = fw; + SECTION("empty_can_be_copied") + { + mercury::FatWrapper <64> fw; + mercury::FatWrapper <64> fw2; + fw2=fw; } } -} // namespace mercury -} // namespace bts +}} diff --git a/src/lib/orderman2/IOrderManagerObserver.h b/src/lib/orderman2/IOrderManagerObserver.h new file mode 100644 index 000000000..f5596b663 --- /dev/null +++ b/src/lib/orderman2/IOrderManagerObserver.h @@ -0,0 +1,28 @@ +#pragma once + +#include "lib/config/protos/jetfix.pb.h" +#include "lib/domain_model/SecurityKey.h" +#include "orderman_utils/orderman_utils.h" + +namespace bts { +namespace api { +namespace orderman { +class OrderDefinition; +} +} // namespace api +namespace orderman2 { + +class OrderState; + +class IOrderManagerObserver { + public: + void subscribe_book(SecurityKey, void *sub); + void request_new_fill_buffers(config::JetFIX::Connection const &, + size_t n_buffers, void *sub); + void request_new_orders(api::orderman::OrderDefinition const &, + OrderKey parent_key, size_t n_orders, void *sub); + void send_fix(size_t gw_idx, jetfix::OutFIXPtr const &); +}; + +} // namespace orderman2 +} // namespace bts diff --git a/src/lib/orderman2/OrderManager2.cpp b/src/lib/orderman2/OrderManager2.cpp new file mode 100644 index 000000000..44949ac83 --- /dev/null +++ b/src/lib/orderman2/OrderManager2.cpp @@ -0,0 +1,7 @@ +#include "OrderManager2.h" +#include "IOrderManagerObserver.h" + +namespace bts { +namespace orderman2 { + +}} diff --git a/src/lib/orderman2/OrderManager2.h b/src/lib/orderman2/OrderManager2.h new file mode 100644 index 000000000..1f761b75b --- /dev/null +++ b/src/lib/orderman2/OrderManager2.h @@ -0,0 +1,37 @@ +#pragma once + +#include "orderman_utils/orderman_utils.h" +#include "orderman_utils/Book.h" +#include "lib/jetfix/common/OutFIXPtr.h" + +#include + +namespace bts { +namespace api { class Security;} +namespace orderman2 { + +class Order; +class IOrderManagerObserver; +class ExecutionReport; + +class OrderManager { + OrderManager(); + + void init(IOrderManagerObserver &observer); + + void on_activate(Order &, Price , Quantity); + void on_update(Order&, Price , Quantity); + void on_cancel(Order&); + void on_book_update(Book const&b,void*sub); + void on_execution_report(ExecutionReport &); + + void on_securities(std::vector const&); + void on_new_fill_buffers(std::vector const&,void*sub); + void on_new_orders(std::vector const&,void*sub); + +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/lib/orderman2/orders/NativeOrder.cpp b/src/lib/orderman2/orders/NativeOrder.cpp deleted file mode 100644 index 96e505504..000000000 --- a/src/lib/orderman2/orders/NativeOrder.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "NativeOrder.h" - diff --git a/src/lib/orderman2/orders/NativeOrder.h b/src/lib/orderman2/orders/NativeOrder.h deleted file mode 100644 index 3e03df4de..000000000 --- a/src/lib/orderman2/orders/NativeOrder.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once -#include "Order.h" - - -namespace bts { -namespace orderman { - - -struct PermissionQueryResult { - bool can_send; - std::string error_msg; -}; - -struct RouteQueryResult { - bool has_route; - std::string error_msg; - api::orderman::RoutingRecord routing_record; -}; - -class NativeOrder2 : public Order2 { -public: - virtual void on_execution_report(std::string const &, OrderKey, - ExecutionReport const &){}; - virtual void on_cancel_reject(std::string const &, OrderKey, - std::string const & /*msg*/){}; - virtual void on_gateway_status(std::string const &, bool /*is_connected*/){}; - - void subscribe_execution_report(std::string const &gw, OrderKey k); - void unsubscribe_execution_report(std::string const &gw, OrderKey k); - void subscribe_cancel_reject(std::string const &gw, OrderKey k); - void unsubscribe_cancel_reject(std::string const &gw, OrderKey k); - void subscribe_gateway_status(std::string const &); - void unsubscribe_gateway_status(std::string const &); - - RouteQueryResult get_route(AccountID, UserID, api::Security const &); - PermissionRec - get_permission_record(api::orderman::RoutingRecord const &routing, AccountID, - UserID, api::Security const &, api::Side); - - PermissionQueryResult can_send_new_order(PermissionRec const &, Quantity, - Price); - - PermissionQueryResult can_update_order(PermissionRec const &, Quantity from, - Quantity to, Price p); - - bool is_route_connected(api::orderman::RoutingRecord const &); - void send_fix(api::orderman::RoutingRecord const &rr, - jetfix::MessageTypes mt, jetfix::FIXFragment const &f); - - TimeStamp time() const; - mercury::TimeStampStr time_str() const; - private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/lib/orderman2/orders/Order.cpp b/src/lib/orderman2/orders/Order.cpp deleted file mode 100644 index a14ec8bed..000000000 --- a/src/lib/orderman2/orders/Order.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "Order.h" - diff --git a/src/lib/orderman2/orders/Order.h b/src/lib/orderman2/orders/Order.h deleted file mode 100644 index 24c10b533..000000000 --- a/src/lib/orderman2/orders/Order.h +++ /dev/null @@ -1,70 +0,0 @@ -#pragma once - -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" - -#include - -namespace bts { -namespace api { -namespace orderman { -class OrderDefinition; -class OrderRecord; -} // namespace orderman -} // namespace api -} // namespace bts - -namespace bts { -namespace orderman { - -struct ChildOrderDescriptor {}; -struct ChildOrder {}; - -class PermissionRec {}; - -class Order2 { - public: - virtual ~Order2(); - - virtual void on_init_new(api::orderman::OrderDefinition const &) = 0; - virtual void on_init_recovered(api::orderman::OrderRecord const &) = 0; - - virtual void on_activate(Price, Quantity) = 0; - virtual void on_update(Price, Quantity) = 0; - virtual void on_cancel() = 0; - virtual void on_child_order_update(OrderKey, api::orderman::OrderState const &){}; - virtual void on_book(SecurityKey, Book const &) {} - virtual void on_settlement(SecurityKey, Book const &) {} - virtual void on_time(TimeStamp const &) {} - - void subscribe_child_updates(OrderKey child); - void unsubscribe_child_updates(OrderKey child); - void subscribe_book(SecurityKey); - void unsubscribe_book(SecurityKey); - void subscribe_settlement(SecurityKey); - void unsubscribe_settlement(SecurityKey); - void subscribe_time(); - void unsubscribe_time(); - - api::Security const *resolve_security(SecurityKey const &k) const; - void report_state(const api::orderman::OrderState &state); - - ChildOrderDescriptor const & - make_child_order_descriptor(api::orderman::OrderDefinition const &, - size_t hint = 1); - ChildOrder make_child_order(ChildOrderDescriptor const &desc); - void send_child(ChildOrder ch, Price, Quantity); - void update_child(ChildOrder ch, Price, Quantity); - void cancel_child(ChildOrder ch); - - private: - struct PImpl; - std::unique_ptr me; -}; -} // namespace orderman -} // namespace bts diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 3202d102a..8949c21f9 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -24,10 +24,10 @@ class DynamicIcebergOrder : public DynamicOrder { void on_init_recovered(OrderRecord const &, const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices &, - trace::CorID const&) override; - void on_update(Price, Quantity, trace::CorID const&) override; - void on_crack(trace::CorID const &) override; - void on_cancel(trace::CorID const &) override; + PerfTrace const &) override; + void on_update(Price, Quantity, PerfTrace const &) override; + void on_crack(PerfTrace const &) override; + void on_cancel(PerfTrace const &) override; private: void report_state(); @@ -127,7 +127,7 @@ void DynamicIcebergOrder::on_init_recovered( void DynamicIcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { + PerfTrace const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -136,8 +136,8 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_INACTIVE: me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); + services.child_updates.sub( + key(), [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); send_next_child_order(); break; @@ -164,7 +164,7 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, report_state(); } -void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { +void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -191,9 +191,9 @@ void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void DynamicIcebergOrder::on_crack(trace::CorID const &) {} +void DynamicIcebergOrder::on_crack(PerfTrace const &) {} -void DynamicIcebergOrder::on_cancel(trace::CorID const &) { +void DynamicIcebergOrder::on_cancel(PerfTrace const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); diff --git a/src/sdk/sdk_shell.sh b/src/sdk/sdk_shell.sh index 70da324f4..d6c65969e 100644 --- a/src/sdk/sdk_shell.sh +++ b/src/sdk/sdk_shell.sh @@ -12,6 +12,7 @@ docker run \ -w $PWD \ -u root \ -v /home:/home \ + -e DISPLAY=$DISPLAY \ --name bts_sdk \ -d \ -t bluetradingsystems/linux_docker \ diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index eb35d3ce8..e25268b4c 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -32,7 +32,6 @@ #include #include #include -#include "lib/tracing/PerfLog.h" #include @@ -271,6 +270,18 @@ static void init_with_clean_os(benchmark::State &state) { } BENCHMARK(init_with_clean_os); +static void init_with_old_order_update(benchmark::State &state) { + api::orderman::OrderDefinition def; + auto order_state = + utils::pb::from_string(order_state_str); + PerfTrace trace; + OrderKey k(1); + for (auto _ : state) + benchmark::DoNotOptimize( + orderman::OrderStateUpdateEvent(k, k, def, order_state, trace)); +} +BENCHMARK(init_with_old_order_update); + static void serialize_update(benchmark::State &state) { api::orderman::Update update; update.set_order_key(1); @@ -824,13 +835,6 @@ static void fix_time_stamp(benchmark::State &state) { } BENCHMARK(fix_time_stamp); -static void perf_log(benchmark::State &state) { - trace::PerfLog l; - for (auto _ : state) - l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); -} -BENCHMARK(perf_log); - std::string Benchmark::help() { return "Run micro-benchmarks. Use --benchmark_filter=regex to run only " "specific benchmarks."; diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index 0489920c7..84d9931e1 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -1,16 +1,30 @@ #include "QuickTest.h" #include "ICmd.h" -#include "lib/tracing/PerfLog.h" + +#include "lib/api/services/OrderService.server.pb.h" +#include "lib/mercury/actors/PingPong.h" +#include "lib/mercury/broker/BrokerProxy.h" +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/executor/Executor.h" +#include "lib/utils/PBUtils.h" +#include "lib/utils/thread_manager.h" +#include "lib/orderman/events/OrderStateUpdateEvent.h" #include namespace bts { namespace cmd { +using namespace bts::mercury; +using namespace bts::orderman; + int QuickTest::execute(std::vector const &) { - trace::PerfLog l; - l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); - l.store_log_entries(); + sleep_for(10s); + for (int i = 0; i < 100; i++) { + auto t = utils::TimeStamp::now(); + LOG(OrderMan,Info,"Now: {}", (utils::TimeStamp::now() - t).nanoseconds()); + } + sleep_for(10s); return 0; } diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 701148644..516980043 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -10,27 +10,26 @@ #include "lib/quickbus/quickbus.h" #include "lib/utils/Dispatcher.h" -#include "lib/config/protos/toggles.pb.h" #include "lib/md/SyntheticSecurityService.h" #include "lib/md/relay/QueryServer.h" #include "lib/metrics/metrics.h" #include "lib/metrics/system_metrics.h" -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" +#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include "lib/orderman/server/OrderServiceServer.h" #include "lib/persistence/PersistenceServiceServer.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" -#include "lib/tracing/PerfLog.h" #include "lib/utils/thread_manager.h" #include "server/sparkd/http/WebServer.h" -#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/run_md.h" #include "server/sparkd/position/PositionServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" +#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" - +#include "lib/orderman/order_factory/DynamicOrderRegistry.h" +#include "lib/plugin/SparkServices.h" +#include "lib/plugin/plugin.h" +#include "lib/config/protos/toggles.pb.h" #include namespace bts { @@ -42,16 +41,17 @@ int Run::execute(std::vector const &) { "------------------------------------ Sparkd launched " "--------------------------------"); + config::QuickbusNodeCfg qb_cfg; auto &ports = config::get(); qb_cfg.set_my_port(ports.qbus_port()); qbus::Quickbus quickbus(qb_cfg); api::ServiceContext sc(&quickbus); - trace::PerfLog perf_log; + PerfTraceLog perf_log; metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); + http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); user::UserServiceServer login_server(sc); @@ -67,10 +67,10 @@ int Run::execute(std::vector const &) { plugin::init_plugins(plugin_services); // finished initializing order plugins - orderman::OrderServiceServer order_service_server( - sc, synthetic_service, dyn_order_registry, stats, perf_log); + orderman::OrderServiceServer order_service_server(sc, synthetic_service,dyn_order_registry, + stats, perf_log); support::ErrorReportServer error_report_service(sc); - admin::AdminServiceServer admin_service(sc); + admin::AdminServiceServer admin_service(sc); md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); position::PositionServiceServer position_service(sc); metrics::ShellLatencyServer shell_latency_service( @@ -79,11 +79,12 @@ int Run::execute(std::vector const &) { auto bg_health = std::make_shared("spark_background_thread"); utils::DispatcherTimer timer(utils::Dispatcher::background(), 5000, - [=]() { bg_health->increment(); }); + [=]() {bg_health->increment(); }); timer.start(); + utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, - [&]() { perf_log.store_log_entries(); }); + [&]() {perf_log.persist_traces();}); timer2.start(); stats.publish(bg_health); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 9ba90c72b..09bda5c6e 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -14,7 +14,7 @@ #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" #include "server/sparkd/md/run_md.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include #include @@ -31,7 +31,7 @@ int Web::execute(const std::vector& args) { metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - trace::PerfLog perf_log; + PerfTraceLog perf_log; http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); user::UserServiceServer login_server(sc); diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index bcd6ddae2..e72ffcebe 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -6,7 +6,7 @@ #include "lib/logging/logging.h" #include "lib/os/os.h" #include "lib/utils/TimeStamp.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include #include @@ -54,9 +54,9 @@ namespace http { const api::ServiceContext& _ctx; metrics::MetricsContainer& _metrics; std::shared_ptr> _mtimer; - trace::PerfLog &_perf_log; + PerfTraceLog &_trace_log; - ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : + ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), _session(), @@ -67,7 +67,7 @@ namespace http { _metrics(metrics), _mtimer(std::make_shared>("spark_metrics_query_duration_ms", std::array({ 0.5, 1.0, 5.0, 10.0 }))), - _perf_log(l) + _trace_log(l) { _www = os::sparkdata_path("www"); _conf = os::sparkdata_path("conf"); @@ -165,10 +165,10 @@ namespace http { _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); } - void return_perf_trace_data(connection_ptr& con,size_t ) { + void return_perf_trace_data(connection_ptr& con,size_t max_rows) { utils::TimeStamp start = utils::TimeStamp::now(); std::stringstream ss; - //_perf_log.print_latest_traces(ss,max_rows); + _trace_log.print_latest_traces(ss,max_rows); con->set_body(ss.str()); con->set_status(websocketpp::http::status_code::ok); _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); @@ -359,7 +359,7 @@ namespace http { -SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : +SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : _me(std::make_shared(ctx, metrics, l,port)) { } diff --git a/src/server/sparkd/http/WebServer.h b/src/server/sparkd/http/WebServer.h index b9bb981df..2414a4f8b 100644 --- a/src/server/sparkd/http/WebServer.h +++ b/src/server/sparkd/http/WebServer.h @@ -4,7 +4,7 @@ #include namespace bts { -namespace trace {class PerfLog;} +class PerfTraceLog; namespace http { struct ServerState; @@ -12,7 +12,7 @@ namespace http { class SparkWebServer { std::shared_ptr _me; public: - SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &,int port); + SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &,int port); }; }}