From 43e82fb8c43adfddb0682f7a9a6ca42f38a896c6 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 13 Dec 2018 22:04:56 -0500 Subject: [PATCH 001/103] Added HedgerManager that keeps track of activ hedgers --- .../spreader/SingleFillHedger.cpp | 33 ++++++++++++++++ .../spreader/SingleFillHedger.h | 12 ++++++ .../spreader/SpreaderChildOrderState.cpp | 11 ++++++ .../spreader/SpreaderChildOrderState.h | 6 +++ .../spreader/SpreaderHedgerData.h | 39 ------------------- .../spreader/hedger/HedgePriceQuantityState.h | 11 ++++-- .../spreader/hedger/HedgerManager.cpp | 37 ++++++++++++++++++ .../spreader/hedger/HedgerManager.h | 27 +++++++++++++ .../spreader/hedger/IHedgerStateWorker.h | 5 +++ .../hedger_states/HedgerEndStateWorker.cpp | 5 +++ .../hedger_states/HedgerEndStateWorker.h | 1 + .../hedger_states/HedgerStartStateWorker.cpp | 10 +++++ .../hedger_states/HedgerStartStateWorker.h | 1 + .../HedgerWaitingForCancelAckStateWorker.cpp | 5 +++ .../HedgerWaitingForCancelAckStateWorker.h | 1 + ...WaitingForFirstAckCancelledStateWorker.cpp | 6 +++ ...erWaitingForFirstAckCancelledStateWorker.h | 1 + .../HedgerWaitingForFirstAckStateWorker.cpp | 5 +++ .../HedgerWaitingForFirstAckStateWorker.h | 1 + .../HedgerWorkingStateWorker.cpp | 5 +++ .../hedger_states/HedgerWorkingStateWorker.h | 4 +- 21 files changed, 183 insertions(+), 43 deletions(-) delete mode 100644 src/lib/orderman/orders/spreader_orders/spreader/SpreaderHedgerData.h create mode 100644 src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp create mode 100644 src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 2060e02fd..7f9b84f4c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -9,6 +9,34 @@ namespace bts { namespace orderman { + +SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, + const LegPropertyData& leg_property_data, + trace::CorID const &fill_trace, + bool is_live) +: +_spreader(spreader_manager), +_leg_property_data (leg_property_data), +_child_order_state (leg_property_data.leg_security_key(), + is_live, + false), +_price_quantity_state(Price(0), + Quantity(0), + leg_property_data.trading_side()), +_fill_trace(fill_trace), +_worker (nullptr), +_start_state_worker (this), +_waiting_for_first_ack_state_worker (this), +_waiting_for_first_ack_cancelled_state_worker (this), +_working_state_worker (this), +_waiting_for_cancel_ack_state_worker (this), +_end_state_worker (this){ + LOG(OrderMan, Info, "SingleFillHedger cons, " + "key:{} sec:{}", + _key(), leg_property_data.security_key()); + transform_to_START (); +} + SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, ChildOrder& child_order, @@ -85,6 +113,11 @@ void SingleFillHedger::init(){ LOG(OrderMan, Diag, "SingleFillHedger::init key: {}", _key().value()); _worker->init(); } +void SingleFillHedger::init (Price, + Quantity, + ChildOrder&){ + +} void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ //bts_assert (u.order_key() == _order.order_key()); LOG(OrderMan, Info, "SingleFillHedger::update_order_status " diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 1e3bf495c..eed494c5d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -66,6 +66,10 @@ private: bts::orderman::OrderKey _key() {return _child_order_state.order_key();} TimeStamp _current_time () const {return _spreader.current_time();} public: + SingleFillHedger(ISpreaderManager& spreader_manager, + const LegPropertyData& leg_property_data, + trace::CorID const &trace, + bool is_live); SingleFillHedger(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, ChildOrder& child_order, @@ -83,6 +87,8 @@ public: // side effect actions //a. leave the start state and submit the order void init(); + //a. leave the start state and submit the order + void init (Price price, Quantity quantity, ChildOrder& child_order); //b. called by the spreader when there is an order update // reported by the exchange void on_order_update(const SpreaderChildOrderState& order_update_message); @@ -104,6 +110,12 @@ public: bool expecting_cancel_update() const { return _worker->state() == HedgerState::WAITING_FOR_CANCEL_ACK; } + HedgerState state() const{ + return _worker->state(); + } + bool is_free() const{ + return state()==HedgerState::START; + } public: HedgerState test_only_func_hedger_state() const { return _worker->state (); } const HedgePriceQuantityState& test_only_func_price_quantity_state () const { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp index 59462a872..267290f7b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp @@ -3,6 +3,7 @@ namespace bts{ namespace orderman{ + SpreaderChildOrderState::SpreaderChildOrderState (SpreaderChildOrderState&& src) : _is_live(src._is_live), @@ -25,6 +26,16 @@ _out_price(src._out_price), _out_quantity(src._out_quantity), _order_place_time(src._order_place_time) { } +SpreaderChildOrderState::SpreaderChildOrderState(SecurityKey sec_key, + bool is_live, + bool is_quoting) +: +_is_live (is_live), +_sec_key (sec_key), +_is_quoting (is_quoting), +_test_only_order_key((uint32_t)bts::Timer::now().time_since_epoch().count()){ + _init_base_values(); +} SpreaderChildOrderState::SpreaderChildOrderState (bts::orderman::ChildOrder& child_order, SecurityKey sec_key, bool is_live, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 1f8f9c875..695e149c7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -39,6 +39,9 @@ public: /////////////////////////////////// SpreaderChildOrderState() = delete; SpreaderChildOrderState(const SpreaderChildOrderState&) = delete; + SpreaderChildOrderState(SecurityKey sec_key, + bool is_live, + bool is_quoting); SpreaderChildOrderState(bts::orderman::ChildOrder& child_order, SecurityKey sec_key, bool is_live, @@ -48,6 +51,9 @@ public: SpreaderChildOrderState& operator=(SpreaderChildOrderState&&) = delete; // const accessors //////////////////// /////////////////////////////////////// + bool is_active() const{ + return _child_order.is_active(); + } bts::orderman::OrderKey order_key() const { return _is_live ? _child_order.key() : _test_only_order_key; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderHedgerData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderHedgerData.h deleted file mode 100644 index e3b101a51..000000000 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderHedgerData.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once -#include "SingleFillHedger.h" -#include "SpreaderChildOrderState.h" - -namespace bts{ -namespace orderman{ - -// Pairs up the hedger with its order; this is stored -// in a vector, inside of SpreaderLegData -class SpreaderHedgerData -{ -public: - SpreaderChildOrderState _child_order_state; - SingleFillHedger _hedger; -public: - SpreaderHedgerData () = delete; - SpreaderHedgerData (const SpreaderHedgerData&) = delete; - SpreaderHedgerData (SpreaderHedgerData&& src) - : - _child_order_state(std::move(src._child_order_state)), - _hedger(src._hedger, _child_order_state) - {} - - SpreaderHedgerData& operator=(const SpreaderHedgerData&) = delete; - SpreaderHedgerData& operator=(SpreaderHedgerData&&) = delete; - SpreaderHedgerData (ISpreaderManager& spreader_manager, - const LegPropertyData& leg_property_data, - bts::orderman::ChildOrder& child_order, - bool is_live, - bts::Price hedge_price, - bts::Quantity hedge_quantity) - : _child_order_state (child_order, leg_property_data, is_live, false), - _hedger (spreader_manager, leg_property_data, _child_order_state, hedge_price, hedge_quantity) - { - } - SingleFillHedger& hedger () {return _hedger;} - SpreaderChildOrderState& order_update_message() {return _child_order_state;} -}; -}} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h index 4f47e05b2..7c68144d6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h @@ -10,8 +10,8 @@ class HedgePriceQuantityState private: // these const's are the price, qty and // side of the hedger order - const Price _target_price; - const Quantity _target_quantity; + Price _target_price; + Quantity _target_quantity; const api::Side _side; // filled part of the order, updated as fills come in Quantity _aggregated_filled_quantity; @@ -28,7 +28,12 @@ public: _out_price (0), _out_quantity (0) { - } + } + void update_target (Price price, + Quantity quantity){ + _target_price=price; + _target_quantity=quantity; + } Price target_price() const { return _target_price; } Quantity target_quantity() const { return _target_quantity; } api::Side side() const { return _side; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp new file mode 100644 index 000000000..2e1b3c52d --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -0,0 +1,37 @@ +#include "HedgerManager.h" + +namespace bts{ +namespace orderman{ + +HedgerManager::HedgerManager(ISpreaderManager& spreader_manager, + const LegPropertyData& leg_property_data, + const trace::CorID& trace, + bool is_live) +: +_spreader_manager(spreader_manager), +_leg_property_data(leg_property_data), +_trace(trace), +_is_live(is_live) +{ + for(size_t i=0; i<2; i++) + _hedgers.emplace_back(spreader_manager, + leg_property_data, + trace, + is_live); +} + +SingleFillHedger& HedgerManager::get_hedger(Price, + Quantity, + ChildOrder&){ + for (auto& h : _hedgers) + if(h.is_free()) + return h; + // LOG warning + _hedgers.emplace_back(_spreader_manager, + _leg_property_data, + _trace, + _is_live); + return _hedgers.back(); +} + +}} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h new file mode 100644 index 000000000..d90f1948b --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -0,0 +1,27 @@ +#pragma once + +#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" + +namespace bts{ +namespace orderman{ + +class HedgerManager{ +private: + ISpreaderManager& _spreader_manager; + const LegPropertyData& _leg_property_data; + const trace::CorID& _trace; + bool _is_live; + std::vector _hedgers; +public: + HedgerManager(ISpreaderManager& spreader_manager, + const LegPropertyData& leg_property_data, + const trace::CorID& trace, + bool is_live); + // gets the free hedger, if its not + // creates one (which is slow) + SingleFillHedger& get_hedger(Price, + Quantity, + ChildOrder&); +}; + +}} \ No newline at end of file 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..d7df687af 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -3,6 +3,7 @@ #include "lib/utils/bts_chrono.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" +#include "lib/orderman/actors/order_manager/ChildOrder.h" namespace bts { namespace trace {struct CorID;} @@ -21,6 +22,10 @@ public: virtual const std::string state_text () const = 0; // called once and only once, before any other calls. virtual void init () = 0; + // called once and only once, before any other calls. + virtual void init (Price price, + Quantity quantity, + ChildOrder& child_order) = 0; // called only when this hedger's order is updated virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on 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..1a5e22d30 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 @@ -7,6 +7,11 @@ namespace orderman{ void HedgerEndStateWorker::init(){ bts_assert_msg (false, "HedgerEndStateWorker::init illegal operation"); } +void HedgerEndStateWorker::init (Price, + Quantity, + ChildOrder&){ + bts_assert_msg (false, "HedgerEndStateWorker::init illegal operation"); +} void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ 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..1f00ef5ad 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 @@ -16,6 +16,7 @@ public: HedgerState state () const override {return HedgerState::END;} const std::string state_text () const override {return "END";} void init () override; + void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() 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..310cf2aa9 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 @@ -15,6 +15,16 @@ void HedgerStartStateWorker::init(){ _hedger->_price_quantity_state.out_quantity()); _hedger->transform_to_WAITING_FOR_FIRST_ACK (); } +void HedgerStartStateWorker::init (Price price, + Quantity quantity, + ChildOrder& child_order){ + _hedger->_price_quantity_state.update_target(price,quantity); + _hedger->_price_quantity_state.update_out_price_quantity (price,quantity); + _hedger->_child_order_state.re_init(child_order); + _hedger->_place_order (_hedger->_price_quantity_state.out_price(), + _hedger->_price_quantity_state.out_quantity()); + _hedger->transform_to_WAITING_FOR_FIRST_ACK (); +} void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ bts_assert_msg (false, "HedgerStartStateWorker::on_order_update 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..9a3413092 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 @@ -20,6 +20,7 @@ public: HedgerState state () const override {return HedgerState::START;} const std::string state_text () const override {return "START";} void init () override; + void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() 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..a1c04f9d2 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 @@ -8,6 +8,11 @@ namespace orderman{ void HedgerWaitingForCancelAckStateWorker::init(){ bts_assert_msg (false, "HedgerWaitingForCancelAckStateWorker::init illegal operation"); } +void HedgerWaitingForCancelAckStateWorker::init (Price, + Quantity, + ChildOrder&){ + bts_assert_msg (false, "HedgerWaitingForCancelAckStateWorker::init illegal operation"); +} void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); 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..3024b1b58 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 @@ -20,6 +20,7 @@ public: HedgerState state () const override {return HedgerState::WAITING_FOR_CANCEL_ACK;} const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} void init () override; + void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() 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..1a58517bd 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 @@ -9,6 +9,12 @@ namespace orderman{ void HedgerWaitingForFirstAckCancelledStateWorker::init(){ bts_assert_msg (false, "HedgerWaitingForFirstAckCancelledStateWorker::init illegal operation"); } +void HedgerWaitingForFirstAckCancelledStateWorker::init( + Price, + Quantity, + ChildOrder&){ + bts_assert_msg (false, "HedgerWaitingForFirstAckCancelledStateWorker::init illegal operation"); +} void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); 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..65982f773 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 @@ -20,6 +20,7 @@ public: HedgerState state () const override {return HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED;} const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} void init () override; + void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() 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..ec853a164 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 @@ -7,6 +7,11 @@ namespace orderman{ void HedgerWaitingForFirstAckStateWorker::init(){ bts_assert_msg (false, "HedgerWaitingForFirstAckStateWorker::init illegal operation"); } +void HedgerWaitingForFirstAckStateWorker::init (Price, + Quantity, + ChildOrder&){ + bts_assert_msg (false, "HedgerWaitingForFirstAckStateWorker::init illegal operation"); +} void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); 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..48617ddbb 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 @@ -20,6 +20,7 @@ public: HedgerState state () const override {return HedgerState::WAITING_FOR_FIRST_ACK;} const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} void init () override; + void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() 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..36bd4a358 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 @@ -12,6 +12,11 @@ void HedgerWorkingStateWorker::on_transition(){ void HedgerWorkingStateWorker::init(){ bts_assert_msg (false, "HedgerWorkingStateWorker::init illegal operation"); } +void HedgerWorkingStateWorker::init(Price, + Quantity, + ChildOrder&){ + bts_assert_msg (false, "HedgerWorkingStateWorker::init illegal operation"); +} void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); 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..18be224c6 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 @@ -14,7 +14,8 @@ public: HedgerWorkingStateWorker (SingleFillHedger* hedger) : _hedger(hedger) {} - HedgerWorkingStateWorker (SingleFillHedger* hedger, const HedgerWorkingStateWorker& other) + HedgerWorkingStateWorker (SingleFillHedger* hedger, + const HedgerWorkingStateWorker& other) : HedgerWorkingStateWorker (hedger) { _order_touch_time = other._order_touch_time; @@ -23,6 +24,7 @@ public: HedgerState state () const override {return HedgerState::WORKING;} const std::string state_text () const override {return "WORKING";} void init () override; + void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; From 8894aea1adccca17428f9e22d7a5391c31c1e74e Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 14 Dec 2018 13:42:05 -0500 Subject: [PATCH 002/103] removed the hedge vector from SpreaderBookkeepingData --- .../orders/spreader_orders/SpreaderOrder.cpp | 10 +-- .../spreader/SingleFillHedger.cpp | 14 ++-- .../spreader/SpreaderBookkeepingData.cpp | 70 +++++++++++-------- .../spreader/SpreaderBookkeepingData.h | 4 +- .../spreader/hedger/HedgerManager.cpp | 10 +-- .../spreader/hedger/HedgerManager.h | 10 +-- .../hedger_states/HedgerStartStateWorker.cpp | 2 +- 7 files changed, 63 insertions(+), 57 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index d94f8d0eb..2d11aec10 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -336,16 +336,16 @@ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, const trace::CorID trace){ - auto scoped_log = - _order_services->order_services().log_scope(trace,"SpreaderOrder::_send_hedge"); - SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, + // auto scoped_log = + // _order_services->order_services().log_scope(trace,"SpreaderOrder::_send_hedge"); + /*SingleFillHedger& hedger = */_bookkeeping_data().add_new_hedger (*this, hedge_leg_index, hedge_price, hedge_qty, &_order_services->order_services(), trace); - _order_services->order_services().log(trace,"SpreaderOrder::_send_hedge:2"); - hedger.init (); + //_order_services->order_services().log(trace,"SpreaderOrder::_send_hedge:2"); + //hedger.init (); } void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, Price fill_price, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 7f9b84f4c..e29cd9697 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -31,9 +31,9 @@ _waiting_for_first_ack_cancelled_state_worker (this), _working_state_worker (this), _waiting_for_cancel_ack_state_worker (this), _end_state_worker (this){ - LOG(OrderMan, Info, "SingleFillHedger cons, " - "key:{} sec:{}", - _key(), leg_property_data.security_key()); + // LOG(OrderMan, Info, "SingleFillHedger cons, " + // "key:{} sec:{}", + // _key(), leg_property_data.security_key()); transform_to_START (); } @@ -113,10 +113,10 @@ void SingleFillHedger::init(){ LOG(OrderMan, Diag, "SingleFillHedger::init key: {}", _key().value()); _worker->init(); } -void SingleFillHedger::init (Price, - Quantity, - ChildOrder&){ - +void SingleFillHedger::init (Price price, + Quantity quantity, + ChildOrder& child_order){ + _worker->init(price, quantity, child_order); } void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ //bts_assert (u.order_key() == _order.order_key()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 276fee5ec..d43d511f4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -21,10 +21,11 @@ _reported_state(){ _quoter_order_builders.reserve(_n_legs); _hedger_order_builders.reserve(_n_legs); _quoter_child_order_states.reserve(_n_legs); - _quoters.reserve (_n_legs); - _hedgers.reserve (_n_legs); + _quoters.reserve(_n_legs); + //_hedgers.reserve(_n_legs); + _h_managers.reserve(_n_legs); _unhedged_deltas.reserve(_n_legs); - _leg_data.reserve (_n_legs); + _leg_data.reserve(_n_legs); for (const auto& lpd_iter : legs){ _leg_prop_data.push_back(lpd_iter); const LegPropertyData& leg_property_data = _leg_prop_data.back(); @@ -34,13 +35,14 @@ _reported_state(){ ChildOrder empty_order; _quoter_child_order_states.emplace_back (empty_order,leg_property_data.leg_security_key(),_is_live,true); _quoters.emplace_back(spreader_manager, leg_property_data, _n_legs, _quoter_child_order_states.back()); - _hedgers.emplace_back (); + //_hedgers.emplace_back (); + _h_managers.emplace_back(spreader_manager,leg_property_data,_is_live), _unhedged_deltas.emplace_back(); _leg_data.emplace_back(leg_property_data, _quoters.back(), _quoter_order_builders.back(), _hedger_order_builders.back(), - _hedgers.back (), + _h_managers.back().hedgers(), _quoter_child_order_states.back(), _books.back(), _unhedged_deltas.back()); @@ -80,35 +82,41 @@ void SpreaderBookkeepingData::total_fills (Quantity& out_quantity, out_quantity = Quantity(fills); out_price = Price(avg_price); } -SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spreader_manager, +SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager&, size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - OrderServices *serv, - const trace::CorID &trace){ - if (serv) - serv->log(trace, "SpreaderBookkeepingData::add_new_hedger"); + OrderServices*, + const trace::CorID&){ + HedgerManager& l_hm = _h_managers[leg_index]; + SpreaderLegData& leg_data = _leg_data[leg_index]; + ChildOrder hedge_order = leg_data.hedger_order_builder().build(); + SingleFillHedger& rv = l_hm.get_hedger(); + rv.init (hedge_price,hedge_quantity,hedge_order); + return rv; + // if (serv) + // serv->log(trace, "SpreaderBookkeepingData::add_new_hedger"); - LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " - "leg_index:{} price:{} quantity:{} cid:{}", - leg_index, hedge_price, hedge_quantity,trace.sn); - bts_assert(leg_index < _n_legs); - SpreaderLegData& leg_data = _leg_data[leg_index]; - std::vector& leg_hedgers = _hedgers[leg_index]; - if (serv) - serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:1"); - bts::orderman::ChildOrder hedge_order = leg_data.hedger_order_builder().build(); - if (serv) - serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:2"); - leg_hedgers.emplace_back (spreader_manager, - leg_data.leg_property_data(), - hedge_order, - hedge_price, - hedge_quantity, - trace, - _is_live); - if (serv) - serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:3"); - return leg_hedgers.back(); + // LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " + // "leg_index:{} price:{} quantity:{} cid:{}", + // leg_index, hedge_price, hedge_quantity,trace.sn); + // bts_assert(leg_index < _n_legs); + // SpreaderLegData& leg_data = _leg_data[leg_index]; + // std::vector& leg_hedgers = _hedgers[leg_index]; + // if (serv) + // serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:1"); + // bts::orderman::ChildOrder hedge_order = leg_data.hedger_order_builder().build(); + // if (serv) + // serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:2"); + // leg_hedgers.emplace_back (spreader_manager, + // leg_data.leg_property_data(), + // hedge_order, + // hedge_price, + // hedge_quantity, + // trace, + // _is_live); + // if (serv) + // serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:3"); + // return leg_hedgers.back(); } }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 5ee70be5c..ec6b138df 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -9,6 +9,7 @@ #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h" +#include "lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h" namespace bts{ namespace orderman { @@ -32,7 +33,8 @@ private: std::vector _hedger_order_builders; std::vector _quoter_child_order_states; std::vector _quoters; - std::vector> _hedgers; + //std::vector> _hedgers; + std::vector _h_managers; std::vector _unhedged_deltas; std::vector _leg_data; boost::container::flat_map _sec_key_to_index; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp index 2e1b3c52d..0910e6506 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -5,24 +5,20 @@ namespace orderman{ HedgerManager::HedgerManager(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, - const trace::CorID& trace, bool is_live) : _spreader_manager(spreader_manager), _leg_property_data(leg_property_data), -_trace(trace), _is_live(is_live) { - for(size_t i=0; i<2; i++) + for(size_t i=0; i<20; i++) _hedgers.emplace_back(spreader_manager, leg_property_data, - trace, + _trace, is_live); } -SingleFillHedger& HedgerManager::get_hedger(Price, - Quantity, - ChildOrder&){ +SingleFillHedger& HedgerManager::get_hedger(){ for (auto& h : _hedgers) if(h.is_free()) return h; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index d90f1948b..c62000b1b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -9,19 +9,19 @@ class HedgerManager{ private: ISpreaderManager& _spreader_manager; const LegPropertyData& _leg_property_data; - const trace::CorID& _trace; + const trace::CorID _trace; bool _is_live; std::vector _hedgers; public: HedgerManager(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, - const trace::CorID& trace, bool is_live); // gets the free hedger, if its not // creates one (which is slow) - SingleFillHedger& get_hedger(Price, - Quantity, - ChildOrder&); + SingleFillHedger& get_hedger(); + std::vector& hedgers(){ + return _hedgers; + } }; }} \ No newline at end of file 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 310cf2aa9..0d313a44b 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 @@ -30,7 +30,7 @@ void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ } void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ // market data will not be sent until out of start. - bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); + //bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); } void HedgerStartStateWorker::cancel(){ _hedger->transform_to_END (); From 175204efdf43943d337d92aed4c61a1de82a53cf Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 14 Dec 2018 17:50:44 -0500 Subject: [PATCH 003/103] removed the init call from Hedger --- .../orders/spreader_orders/SpreaderOrder.cpp | 2 +- .../spreader/SingleFillHedger.cpp | 9 +++--- .../spreader/SingleFillHedger.h | 10 +++---- .../spreader/SpreaderBookkeepingData.cpp | 30 ++----------------- .../spreader/SpreaderBookkeepingData.h | 1 - .../spreader/hedger/IHedgerStateWorker.h | 2 -- .../hedger_states/HedgerEndStateWorker.cpp | 3 -- .../hedger_states/HedgerEndStateWorker.h | 1 - .../hedger_states/HedgerStartStateWorker.cpp | 9 ------ .../hedger_states/HedgerStartStateWorker.h | 1 - .../HedgerWaitingForCancelAckStateWorker.cpp | 6 ++-- .../HedgerWaitingForCancelAckStateWorker.h | 1 - ...WaitingForFirstAckCancelledStateWorker.cpp | 6 ++-- ...erWaitingForFirstAckCancelledStateWorker.h | 1 - .../HedgerWaitingForFirstAckStateWorker.cpp | 6 ++-- .../HedgerWaitingForFirstAckStateWorker.h | 1 - .../HedgerWorkingStateWorker.cpp | 3 -- .../hedger_states/HedgerWorkingStateWorker.h | 1 - .../spreader_orders/tests/spreader_tests.cpp | 8 +---- 19 files changed, 20 insertions(+), 81 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 2d11aec10..905eb0f11 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -293,7 +293,7 @@ bool SpreaderOrder::_all_hedger_orders_in_terminal_state(){ SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(q_idx); for (size_t h_idx = 0; h_idx < leg_data.n_hedgers(); h_idx++){ SingleFillHedger& hedger = leg_data.get_hedger(h_idx); - if (!hedger.is_terminal_state()) + if (hedger.is_active_order()) return false; } } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index e29cd9697..2de8c8050 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -109,10 +109,6 @@ _end_state_worker (this, other._end_state_worker){ /********************************************************************/ /****************************External Calls**************************/ /********************************************************************/ -void SingleFillHedger::init(){ - LOG(OrderMan, Diag, "SingleFillHedger::init key: {}", _key().value()); - _worker->init(); -} void SingleFillHedger::init (Price price, Quantity quantity, ChildOrder& child_order){ @@ -143,6 +139,11 @@ void SingleFillHedger::terminate (){ void SingleFillHedger::on_time (const bts::TimeStamp& ts){ _worker->on_time (ts); } +bool SingleFillHedger::is_active_order () const { + bool no_active_order = _worker->state() == HedgerState::START || + _worker->state() == HedgerState::END; + return !no_active_order; +} bool SingleFillHedger::is_terminal_state () const { return _worker->state() == HedgerState::END; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index eed494c5d..9d9abe5c7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -83,10 +83,6 @@ public: SingleFillHedger (SingleFillHedger&&); SingleFillHedger& operator=(const SingleFillHedger&) = delete; SingleFillHedger& operator=(SingleFillHedger&&) = delete; - // the a-f actions are associated with the state machine - // side effect actions - //a. leave the start state and submit the order - void init(); //a. leave the start state and submit the order void init (Price price, Quantity quantity, ChildOrder& child_order); //b. called by the spreader when there is an order update @@ -103,7 +99,11 @@ public: void terminate (); //f. on the engine infrastructure time void on_time(const bts::TimeStamp&); - // returns true if the quoter is in the final state, from which + // true if the hedger has an active working order. the order can + // be in an unknown state, but as long as an order has been sent + // and it has not reached a terminal state, its considered "active" + bool is_active_order() const; + // returns true if the hedger is in the final state, from which // it will never come back bool is_terminal_state () const; // true if the hedger can accept a price change diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index d43d511f4..2907ba125 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -22,7 +22,6 @@ _reported_state(){ _hedger_order_builders.reserve(_n_legs); _quoter_child_order_states.reserve(_n_legs); _quoters.reserve(_n_legs); - //_hedgers.reserve(_n_legs); _h_managers.reserve(_n_legs); _unhedged_deltas.reserve(_n_legs); _leg_data.reserve(_n_legs); @@ -35,7 +34,6 @@ _reported_state(){ ChildOrder empty_order; _quoter_child_order_states.emplace_back (empty_order,leg_property_data.leg_security_key(),_is_live,true); _quoters.emplace_back(spreader_manager, leg_property_data, _n_legs, _quoter_child_order_states.back()); - //_hedgers.emplace_back (); _h_managers.emplace_back(spreader_manager,leg_property_data,_is_live), _unhedged_deltas.emplace_back(); _leg_data.emplace_back(leg_property_data, @@ -93,30 +91,6 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager&, ChildOrder hedge_order = leg_data.hedger_order_builder().build(); SingleFillHedger& rv = l_hm.get_hedger(); rv.init (hedge_price,hedge_quantity,hedge_order); - return rv; - // if (serv) - // serv->log(trace, "SpreaderBookkeepingData::add_new_hedger"); - - // LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " - // "leg_index:{} price:{} quantity:{} cid:{}", - // leg_index, hedge_price, hedge_quantity,trace.sn); - // bts_assert(leg_index < _n_legs); - // SpreaderLegData& leg_data = _leg_data[leg_index]; - // std::vector& leg_hedgers = _hedgers[leg_index]; - // if (serv) - // serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:1"); - // bts::orderman::ChildOrder hedge_order = leg_data.hedger_order_builder().build(); - // if (serv) - // serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:2"); - // leg_hedgers.emplace_back (spreader_manager, - // leg_data.leg_property_data(), - // hedge_order, - // hedge_price, - // hedge_quantity, - // trace, - // _is_live); - // if (serv) - // serv->log(trace, "SpreaderBookkeepingData::add_new_hedger:3"); - // return leg_hedgers.back(); + return rv; } -}} +}} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index ec6b138df..fb66c98ee 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -33,7 +33,6 @@ private: std::vector _hedger_order_builders; std::vector _quoter_child_order_states; std::vector _quoters; - //std::vector> _hedgers; std::vector _h_managers; std::vector _unhedged_deltas; std::vector _leg_data; 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 d7df687af..c39a84c59 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -21,8 +21,6 @@ public: // string representation of the state virtual const std::string state_text () const = 0; // called once and only once, before any other calls. - virtual void init () = 0; - // called once and only once, before any other calls. virtual void init (Price price, Quantity quantity, ChildOrder& child_order) = 0; 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 1a5e22d30..ab4c53062 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 @@ -4,9 +4,6 @@ namespace bts{ namespace orderman{ -void HedgerEndStateWorker::init(){ - bts_assert_msg (false, "HedgerEndStateWorker::init illegal operation"); -} void HedgerEndStateWorker::init (Price, Quantity, ChildOrder&){ 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 1f00ef5ad..32fb0a888 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 @@ -15,7 +15,6 @@ public: void on_transition () override {} HedgerState state () const override {return HedgerState::END;} const std::string state_text () const override {return "END";} - void init () override; void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) 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 0d313a44b..5430df181 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 @@ -6,15 +6,6 @@ namespace bts{ namespace orderman{ -void HedgerStartStateWorker::init(){ - LOG(OrderMan, Diag, "HedgerStartStateWorker::init order_key: {}, placing order price: {} quantity: {}", - _hedger->_key().value(), _hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.target_quantity().value()); - // this is the only place from where the hedger sends the order - _hedger->_price_quantity_state.update_out_price_quantity (_hedger->_price_quantity_state.target_price(), _hedger->_price_quantity_state.target_quantity()); - _hedger->_place_order (_hedger->_price_quantity_state.out_price(), - _hedger->_price_quantity_state.out_quantity()); - _hedger->transform_to_WAITING_FOR_FIRST_ACK (); -} void HedgerStartStateWorker::init (Price price, Quantity quantity, ChildOrder& child_order){ 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 9a3413092..cd58ffdb2 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 @@ -19,7 +19,6 @@ public: void on_transition () override {} HedgerState state () const override {return HedgerState::START;} const std::string state_text () const override {return "START";} - void init () override; void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) 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 a1c04f9d2..18f16afd0 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 @@ -5,13 +5,11 @@ namespace bts{ namespace orderman{ -void HedgerWaitingForCancelAckStateWorker::init(){ - bts_assert_msg (false, "HedgerWaitingForCancelAckStateWorker::init illegal operation"); -} void HedgerWaitingForCancelAckStateWorker::init (Price, Quantity, ChildOrder&){ - bts_assert_msg (false, "HedgerWaitingForCancelAckStateWorker::init illegal operation"); + bts_assert_msg (false, "HedgerWaitingForCancelAckStateWorker::init " + "illegal operation"); } void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); 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 3024b1b58..8e7dc9b01 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 @@ -19,7 +19,6 @@ public: void on_transition () override {} HedgerState state () const override {return HedgerState::WAITING_FOR_CANCEL_ACK;} const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} - void init () override; void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) 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 1a58517bd..68d8f0fc7 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 @@ -6,14 +6,12 @@ namespace bts{ namespace orderman{ -void HedgerWaitingForFirstAckCancelledStateWorker::init(){ - bts_assert_msg (false, "HedgerWaitingForFirstAckCancelledStateWorker::init illegal operation"); -} void HedgerWaitingForFirstAckCancelledStateWorker::init( Price, Quantity, ChildOrder&){ - bts_assert_msg (false, "HedgerWaitingForFirstAckCancelledStateWorker::init illegal operation"); + bts_assert_msg (false, "HedgerWaitingForFirstAckCancelledStateWorker::init " + "illegal operation"); } void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); 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 65982f773..6b4c5a18a 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 @@ -19,7 +19,6 @@ public: void on_transition () override {} HedgerState state () const override {return HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED;} const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} - void init () override; void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) 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 ec853a164..a074fa523 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 @@ -4,13 +4,11 @@ namespace bts{ namespace orderman{ -void HedgerWaitingForFirstAckStateWorker::init(){ - bts_assert_msg (false, "HedgerWaitingForFirstAckStateWorker::init illegal operation"); -} void HedgerWaitingForFirstAckStateWorker::init (Price, Quantity, ChildOrder&){ - bts_assert_msg (false, "HedgerWaitingForFirstAckStateWorker::init illegal operation"); + bts_assert_msg (false, "HedgerWaitingForFirstAckStateWorker::init " + "illegal operation"); } void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); 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 48617ddbb..3ee2e24a6 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 @@ -19,7 +19,6 @@ public: void on_transition () override {} HedgerState state () const override {return HedgerState::WAITING_FOR_FIRST_ACK;} const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} - void init () override; void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) 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 36bd4a358..1c22e439a 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 @@ -9,9 +9,6 @@ namespace orderman{ void HedgerWorkingStateWorker::on_transition(){ _order_touch_time = _hedger->_current_time(); } -void HedgerWorkingStateWorker::init(){ - bts_assert_msg (false, "HedgerWorkingStateWorker::init illegal operation"); -} void HedgerWorkingStateWorker::init(Price, Quantity, ChildOrder&){ 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 18be224c6..e5b119602 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 @@ -23,7 +23,6 @@ public: void on_transition () override; HedgerState state () const override {return HedgerState::WORKING;} const std::string state_text () const override {return "WORKING";} - void init () override; void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) 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 553641440..b57675a86 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1260,8 +1260,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") LOG(OrderMan, Diag, "hedger_START_state.transition_to_start"); } SECTION("1. init") - { - hedger.init (); + { verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); LOG(OrderMan, Diag, "hedger_START_state.init"); } @@ -1305,7 +1304,6 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - hedger.init (); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); SECTION("1. init") { @@ -1365,7 +1363,6 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - hedger.init (); hedger.cancel_hedge(); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); @@ -1427,7 +1424,6 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - hedger.init (); hedger.cancel_hedge(); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); @@ -1500,7 +1496,6 @@ TEST_CASE ("hedger_END_state", "[spreader]") trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - hedger.init (); SpreaderChildOrderState& u1 = hedger.order_state(); on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); hedger.on_order_update (u1); @@ -1559,7 +1554,6 @@ TEST_CASE ("hedger_WORKING", "[spreader]") verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SpreaderChildOrderState& u = hedger.order_state(); - hedger.init (); on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); hedger.on_order_update (u); verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); From 2be4eb1c5cde4ea3cefee5949936e77b5b9a6892 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 16 Dec 2018 22:15:39 -0500 Subject: [PATCH 004/103] adding is_permenantly_cancelled to hedger --- .../spreader/SingleFillHedger.cpp | 48 +++++-------------- .../spreader/SingleFillHedger.h | 20 ++++---- .../spreader/hedger/HedgePriceQuantityState.h | 7 +++ .../spreader/hedger/HedgerManager.cpp | 5 +- .../hedger_states/HedgerEndStateWorker.cpp | 8 ++++ .../hedger_states/HedgerEndStateWorker.h | 14 ++++-- .../hedger_states/HedgerStartStateWorker.h | 3 +- .../HedgerWaitingForCancelAckStateWorker.h | 12 +++-- ...erWaitingForFirstAckCancelledStateWorker.h | 12 +++-- .../HedgerWaitingForFirstAckStateWorker.h | 12 +++-- 10 files changed, 80 insertions(+), 61 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 2de8c8050..799b8105f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -23,37 +23,7 @@ _child_order_state (leg_property_data.leg_security_key(), _price_quantity_state(Price(0), Quantity(0), leg_property_data.trading_side()), -_fill_trace(fill_trace), -_worker (nullptr), -_start_state_worker (this), -_waiting_for_first_ack_state_worker (this), -_waiting_for_first_ack_cancelled_state_worker (this), -_working_state_worker (this), -_waiting_for_cancel_ack_state_worker (this), -_end_state_worker (this){ - // LOG(OrderMan, Info, "SingleFillHedger cons, " - // "key:{} sec:{}", - // _key(), leg_property_data.security_key()); - transform_to_START (); -} - -SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, - const LegPropertyData& leg_property_data, - ChildOrder& child_order, - bts::Price hedge_price, - bts::Quantity hedge_quantity, - trace::CorID const &fill_trace, - bool is_live) -: -_spreader(spreader_manager), -_leg_property_data (leg_property_data), -_child_order_state (child_order, - leg_property_data.leg_security_key(), - is_live, - false), -_price_quantity_state(hedge_price, - hedge_quantity, - leg_property_data.trading_side()), +_is_permenantly_cancelled(false), _fill_trace(fill_trace), _worker (nullptr), _start_state_worker (this), @@ -63,17 +33,19 @@ _working_state_worker (this), _waiting_for_cancel_ack_state_worker (this), _end_state_worker (this){ LOG(OrderMan, Info, "SingleFillHedger cons, " - "key:{} sec:{} price:{} quantity:{}", - _key(), leg_property_data.security_key(), - hedge_price, hedge_quantity); + "key:{} sec:{}", + _spreader.spreader_order_key(), + leg_property_data.security_key()); transform_to_START (); } + SingleFillHedger::SingleFillHedger (SingleFillHedger&& other) : _spreader (other._spreader), _leg_property_data (other._leg_property_data), _child_order_state (std::move(other._child_order_state)), _price_quantity_state (other._price_quantity_state), +_is_permenantly_cancelled(other._is_permenantly_cancelled), _fill_trace(other._fill_trace), _worker(nullptr), _start_state_worker (this, other._start_state_worker), @@ -129,11 +101,13 @@ void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &tra void SingleFillHedger::cancel_hedge(){ LOG(OrderMan, Info, "SingleFillHedger::cancel_order key:{} state:{}", _key(), _worker->state_text()); + _is_permenantly_cancelled=true; _worker->cancel (); } void SingleFillHedger::terminate (){ LOG(OrderMan, Info, "SingleFillHedger::terminate key:{} state:{}", _key(), _worker->state_text()); + _is_permenantly_cancelled=true; _worker->terminate(); } void SingleFillHedger::on_time (const bts::TimeStamp& ts){ @@ -151,7 +125,8 @@ bool SingleFillHedger::is_terminal_state () const { /*************************State Transformations**********************/ /********************************************************************/ void SingleFillHedger::transform_to_START(){ - bts_assert (_worker == nullptr); + bts_assert (_worker == nullptr || + _worker->state() == HedgerState::END); _switch_state (&_start_state_worker); } void SingleFillHedger::transform_to_WAITING_FOR_FIRST_ACK(){ @@ -176,8 +151,7 @@ void SingleFillHedger::transform_to_END() { _switch_state (&_end_state_worker); } void SingleFillHedger::_switch_state (IHedgerStateWorker* new_state){ - LOG(OrderMan, Diag, "SingleFillHedger::_switch_state key:{}, {} -> {} ", - _key(), + LOG(OrderMan, Info, "SingleFillHedger::_switch_state {} -> {} ", (_worker == nullptr ? "NULL" : _worker->state_text()), new_state->state_text()); _worker = new_state; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 9d9abe5c7..b7ba86c3c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -30,7 +30,8 @@ private: const LegPropertyData& _leg_property_data; SpreaderChildOrderState _child_order_state; HedgePriceQuantityState _price_quantity_state; - trace::CorID _fill_trace; + bool _is_permenantly_cancelled; + trace::CorID _fill_trace; IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker; @@ -39,6 +40,10 @@ private: HedgerWaitingForCancelAckStateWorker _waiting_for_cancel_ack_state_worker; HedgerEndStateWorker _end_state_worker; private: + void _re_init(){ + _child_order_state.re_init(); + _price_quantity_state.re_init(); + } // state handling void transform_to_START(); void transform_to_WAITING_FOR_FIRST_ACK(); @@ -63,20 +68,17 @@ private: void _cancel_order () { _child_order_state.cancel_order(); } - bts::orderman::OrderKey _key() {return _child_order_state.order_key();} + bts::orderman::OrderKey _key() { + // TODO clean up + return _child_order_state.is_active() ? + _child_order_state.order_key() : OrderKey(0); + } TimeStamp _current_time () const {return _spreader.current_time();} public: SingleFillHedger(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, trace::CorID const &trace, bool is_live); - SingleFillHedger(ISpreaderManager& spreader_manager, - const LegPropertyData& leg_property_data, - ChildOrder& child_order, - bts::Price hedge_price, - bts::Quantity hedge_quantity, - trace::CorID const &trace, - bool is_live); SingleFillHedger() = delete; SingleFillHedger (const SingleFillHedger&) = delete; // this is needed because hedgers reside in a vector diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h index 7c68144d6..07e6bffbe 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h @@ -29,6 +29,13 @@ public: _out_quantity (0) { } + void re_init(){ + _target_price = Price(0); + _target_quantity = Quantity(0); + _aggregated_filled_quantity = Quantity(0); + _out_price = Price(0); + _out_quantity = Quantity(0); + } void update_target (Price price, Quantity quantity){ _target_price=price; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp index 0910e6506..3f2a4e0aa 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -11,7 +11,7 @@ _spreader_manager(spreader_manager), _leg_property_data(leg_property_data), _is_live(is_live) { - for(size_t i=0; i<20; i++) + for(size_t i=0; i<4; i++) _hedgers.emplace_back(spreader_manager, leg_property_data, _trace, @@ -22,7 +22,8 @@ SingleFillHedger& HedgerManager::get_hedger(){ for (auto& h : _hedgers) if(h.is_free()) return h; - // LOG warning + LOG(OrderMan, Error, "HedgerManager::get_hedger allocating new hedger {} ", + _hedgers.size()); _hedgers.emplace_back(_spreader_manager, _leg_property_data, _trace, 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 ab4c53062..4d1582c32 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 @@ -1,9 +1,17 @@ #include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" namespace bts{ namespace orderman{ +void HedgerEndStateWorker::on_transition (){ + if(!_hedger->_is_permenantly_cancelled){ + _hedger->_re_init(); + _hedger->transform_to_START(); + } +} + void HedgerEndStateWorker::init (Price, Quantity, ChildOrder&){ 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 32fb0a888..609c62d64 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 @@ -9,10 +9,18 @@ class SingleFillHedger; // in the former we know that the order has reached its terminal state class HedgerEndStateWorker : public IHedgerStateWorker { +private: + SingleFillHedger* const _hedger; public: - HedgerEndStateWorker (SingleFillHedger*){} - HedgerEndStateWorker (SingleFillHedger*, const HedgerEndStateWorker&){} - void on_transition () override {} + HedgerEndStateWorker (SingleFillHedger* hedger) + : + _hedger(hedger) + {} + HedgerEndStateWorker (SingleFillHedger* hedger, + const HedgerEndStateWorker&) + : HedgerEndStateWorker (hedger){ + } + void on_transition () override; HedgerState state () const override {return HedgerState::END;} const std::string state_text () const override {return "END";} void init (Price price,Quantity quantity,ChildOrder& child_order) override; 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 cd58ffdb2..233f8915c 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 @@ -13,7 +13,8 @@ public: HedgerStartStateWorker (SingleFillHedger* hedger) : _hedger(hedger) {} - HedgerStartStateWorker (SingleFillHedger* hedger, const HedgerStartStateWorker&) + HedgerStartStateWorker (SingleFillHedger* hedger, + const HedgerStartStateWorker&) : HedgerStartStateWorker (hedger) {} void on_transition () override {} 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 8e7dc9b01..34d1ad0f6 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 @@ -13,12 +13,18 @@ public: HedgerWaitingForCancelAckStateWorker (SingleFillHedger* hedger) : _hedger(hedger) {} - HedgerWaitingForCancelAckStateWorker (SingleFillHedger* hedger, const HedgerWaitingForCancelAckStateWorker&) + HedgerWaitingForCancelAckStateWorker ( + SingleFillHedger* hedger, + const HedgerWaitingForCancelAckStateWorker&) : HedgerWaitingForCancelAckStateWorker (hedger) {} void on_transition () override {} - HedgerState state () const override {return HedgerState::WAITING_FOR_CANCEL_ACK;} - const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} + HedgerState state () const override { + return HedgerState::WAITING_FOR_CANCEL_ACK; + } + const std::string state_text () const override { + return "WAITING_FOR_CANCEL_ACK"; + } void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; 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 6b4c5a18a..ffb5156d5 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 @@ -13,12 +13,18 @@ public: HedgerWaitingForFirstAckCancelledStateWorker (SingleFillHedger* hedger) : _hedger(hedger) {} - HedgerWaitingForFirstAckCancelledStateWorker (SingleFillHedger* hedger, const HedgerWaitingForFirstAckCancelledStateWorker&) + HedgerWaitingForFirstAckCancelledStateWorker ( + SingleFillHedger* hedger, + const HedgerWaitingForFirstAckCancelledStateWorker&) : HedgerWaitingForFirstAckCancelledStateWorker (hedger) {} void on_transition () override {} - HedgerState state () const override {return HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED;} - const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} + HedgerState state () const override { + return HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED; + } + const std::string state_text () const override { + return "WAITING_FOR_FIRST_ACK_CANCELLED"; + } void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; 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 3ee2e24a6..84d1f1556 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 @@ -13,12 +13,18 @@ public: HedgerWaitingForFirstAckStateWorker (SingleFillHedger* hedger) : _hedger(hedger) {} - HedgerWaitingForFirstAckStateWorker (SingleFillHedger* hedger, const HedgerWaitingForFirstAckStateWorker&) + HedgerWaitingForFirstAckStateWorker ( + SingleFillHedger* hedger, + const HedgerWaitingForFirstAckStateWorker&) : HedgerWaitingForFirstAckStateWorker (hedger) {} void on_transition () override {} - HedgerState state () const override {return HedgerState::WAITING_FOR_FIRST_ACK;} - const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} + HedgerState state () const override { + return HedgerState::WAITING_FOR_FIRST_ACK; + } + const std::string state_text () const override { + return "WAITING_FOR_FIRST_ACK"; + } void init (Price price,Quantity quantity,ChildOrder& child_order) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; From dffb9c5320dfb545bbf812097ca09dbc81bbf5c1 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 17 Dec 2018 11:34:48 -0500 Subject: [PATCH 005/103] guard around SpreaderChildOrder::order_key() to deal with in active state --- .../spreader/SpreaderBookkeepingData.cpp | 1 + .../spreader/SpreaderChildOrderState.h | 18 ++++++++++++--- .../spreader/SpreaderLegData.cpp | 5 ++++- .../spreader/SpreaderLegData.h | 5 ++++- .../spreader/hedger/HedgerManager.h | 22 +++++++++++++++++++ 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 2907ba125..0ab694189 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -41,6 +41,7 @@ _reported_state(){ _quoter_order_builders.back(), _hedger_order_builders.back(), _h_managers.back().hedgers(), + _h_managers.back(), _quoter_child_order_states.back(), _books.back(), _unhedged_deltas.back()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 695e149c7..212bf3f5b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -55,7 +55,17 @@ public: return _child_order.is_active(); } bts::orderman::OrderKey order_key() const { - return _is_live ? _child_order.key() : _test_only_order_key; + if (_is_live){ + if(is_active()) + return _child_order.key(); + else{ + LOG(OrderMan, Error, "OrderKey::order_key() is an illegal " + "when inactive"); + return OrderKey(0); + } + } + else + return _test_only_order_key; } api::orderman::OrderStatus status () const { return _status; @@ -121,7 +131,8 @@ public: bts_assert(!_is_live || e.key == order_key()); bts_assert(e.filled_quantity >= _filled_quantity.value()); _status = e.status; - _last_filled_quantity = Quantity(e.filled_quantity - _filled_quantity.value()); + _last_filled_quantity = Quantity(e.filled_quantity + - _filled_quantity.value()); _last_filled_price = Price(e.last_price); _last_reported_order_price=Price(e.price); SpreaderUtils::compute_average_price(_filled_price, @@ -169,7 +180,8 @@ public: } void cancel_order(){ bts_assert(_n_cancel_orders == 0); - LOG(OrderMan, Info, "SpreaderChildOrderState::cancel_order order_key: {} is_quoting: {} sec_key: {} live: {} ", + LOG(OrderMan, Info, "SpreaderChildOrderState::cancel_order order_key: {} " + "is_quoting: {} sec_key: {} live: {} ", order_key().value(), _is_quoting, _sec_key, _is_live); _n_cancel_orders++; if (_is_live) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp index ceb595573..6cab43811 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp @@ -8,6 +8,7 @@ SpreaderLegData::SpreaderLegData (const LegPropertyData& leg_property_data, SpreaderOrderBuilder& quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, std::vector& hedger_data_vector, + HedgerManager& hedger_manager, SpreaderChildOrderState& quoter_child_order_state, Book& book, UnhedgedDelta& unhedged_delta) @@ -17,7 +18,8 @@ _quoter(quoter), _quoter_order_builder (quoter_order_builder), _hedger_order_builder (hedger_order_builder), _quoter_child_order_state (quoter_child_order_state), -_hedger_data_vector (hedger_data_vector), +_hedger_data_vector (hedger_data_vector), +_hedger_manager(hedger_manager), _book(book), _unhedged_delta(unhedged_delta), _settlement_price(md::INT_NAN) @@ -31,6 +33,7 @@ _quoter_order_builder(other._quoter_order_builder), _hedger_order_builder(other._hedger_order_builder), _quoter_child_order_state (other._quoter_child_order_state), _hedger_data_vector (other._hedger_data_vector), +_hedger_manager(other._hedger_manager), _book(other._book), _unhedged_delta(other._unhedged_delta){ bts_assert (false); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 89c3393c1..ee7d6392d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -2,6 +2,7 @@ #include "LegPropertyData.h" #include "SingleLegQuoter.h" #include "SingleFillHedger.h" +#include "lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h" #include "SpreaderChildOrderState.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" @@ -29,7 +30,8 @@ private: SpreaderOrderBuilder& _quoter_order_builder; SpreaderOrderBuilder& _hedger_order_builder; SpreaderChildOrderState& _quoter_child_order_state; - std::vector& _hedger_data_vector; + std::vector& _hedger_data_vector; + HedgerManager& _hedger_manager; Book& _book; UnhedgedDelta& _unhedged_delta; md::IntPrice _settlement_price; @@ -39,6 +41,7 @@ public: SpreaderOrderBuilder& quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, std::vector& hedger_data_vector, + HedgerManager& hedger_manager, SpreaderChildOrderState& quoter_child_order_state, Book& book, UnhedgedDelta& unhedged_delta); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index c62000b1b..6e7ad57cb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -21,6 +21,28 @@ public: SingleFillHedger& get_hedger(); std::vector& hedgers(){ return _hedgers; + } + SingleFillHedger* find_hedger_from_orderkey(OrderKey order_key){ + for (SingleFillHedger& hedger : _hedgers) + if (hedger.order_state().order_key() == order_key) + return &hedger; + return nullptr; + } + void update_book (const Book& book, trace::CorID& cid){ + for (SingleFillHedger& hedger : _hedgers) + hedger.on_book(book, cid); + } + void udpate_time(const bts::TimeStamp& ts){ + for (SingleFillHedger& hedger : _hedgers) + hedger.on_time(ts); + } + void cancel_hedges(){ + for (SingleFillHedger& hedger : _hedgers) + hedger.cancel_hedge(); + } + void terminate_hedges(){ + for (SingleFillHedger& hedger : _hedgers) + hedger.terminate(); } }; From fb14a9c3af2058e617ba8fc4fa3afe4e1d14db70 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 17 Dec 2018 16:17:08 -0500 Subject: [PATCH 006/103] restoring tests --- .../spreader/SpreaderLegData.h | 3 + .../spreader/hedger/HedgerManager.h | 7 + .../spreader_orders/tests/spreader_tests.cpp | 964 +++++++++--------- 3 files changed, 493 insertions(+), 481 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index ee7d6392d..8cbe0ac38 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -72,6 +72,9 @@ public: UnhedgedDelta& unhedged_delta() {return _unhedged_delta;} // returns the number of active hedgers size_t n_hedgers() const { return _hedger_data_vector.size(); } + size_t n_active_hedgers() const { + return _hedger_manager.n_active_hedgers(); + } // returns the hedger at a given index SingleFillHedger& get_hedger(size_t index) { bts_assert(index<_hedger_data_vector.size()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index 6e7ad57cb..cf0c5ae84 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -44,6 +44,13 @@ public: for (SingleFillHedger& hedger : _hedgers) hedger.terminate(); } + size_t n_active_hedgers() { + size_t rv=0; + for (SingleFillHedger& hedger : _hedgers) + if(hedger.is_active_order()) + rv++; + return rv; + } }; }} \ No newline at end of file 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 3cac22b29..966fc4ea5 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1759,334 +1759,336 @@ TEST_CASE ("spreader_START", "[spreader]") LOG(OrderMan, Diag, "spreader_START.on_cancel"); } } -// TEST_CASE ("spreader_WORKING", "[spreader]") -// { -// bts::orderman::OrderKey order_key(0); -// Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); -// ContractLeg leg_1, leg_2; -// fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); -// fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); -// std::vector contract_legs; -// contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); -// Security synthetic_security; -// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); -// // execution params/order def -// LegSpreaderParams lsp_1, lsp_2, lsp_3; -// fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); -// std::vector spreader_params; -// spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); -// bts::api::orderman::OrderDefinition order_def; -// fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); -// // putting it together in SpreaderBookkeepingData -// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); -// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); -// std::vector leg_props; -// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); -// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); -// SpreaderOrder spreader; -// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); -// // on_init_new and activate -// spreader.test_only_on_init_new (order_def, pao_services); -// SpreaderOrderServices order_services (nullptr); -// spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); -// SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); +TEST_CASE ("spreader_WORKING", "[spreader]") +{ + bts::orderman::OrderKey order_key(0); + Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); + ContractLeg leg_1, leg_2; + fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); + fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); + std::vector contract_legs; + contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); + Security synthetic_security; + fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); + // execution params/order def + LegSpreaderParams lsp_1, lsp_2, lsp_3; + fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); + std::vector spreader_params; + spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); + bts::api::orderman::OrderDefinition order_def; + fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); + // putting it together in SpreaderBookkeepingData + SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); + SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); + std::vector leg_props; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + SpreaderOrder spreader; + REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); + // on_init_new and activate + spreader.test_only_on_init_new (order_def, pao_services); + SpreaderOrderServices order_services (nullptr); + spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); + SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); -// set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {50, 50, 10, 10, 30}, -// new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, -// new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, -// new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, 0, 0, 0, 0); -// // verify working orders -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); -// // send fill on leg 1 (20) -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); -// // send another fill on leg 1 (10) -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (30), Price (2000)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(0), Price(2000), Quantity(100), Quantity(70), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(2002), Quantity(70), Quantity(70), false); -// // send fill on leg 2 (15) -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2001)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(15), Price(2001), Quantity(85), Quantity(55), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (15), Quantity(30), Price(2002), Quantity(70), Quantity(55), false); -// // send another fill on leg 2 (30) -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (45), Price (2001)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(45), Price(2002), Quantity(55), Quantity(25), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (45), Quantity(30), Price(2000), Quantity(70), Quantity(25), false); -// // send another fill on leg 2 (10) -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (55), Price (2001)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); -// // verify the hedgers -// // leg 1 should have 3 hedgers, for each of the 3 fills -// for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); -// for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) -// spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); -// REQUIRE (leg_data_1.n_hedgers () == 3); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); -// verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {50, 50, 10, 10, 30}, + new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, + new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, + new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, 0, 0, 0, 0); + // verify working orders + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); + // send fill on leg 1 (20) + spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); + // send another fill on leg 1 (10) + spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (30), Price (2000)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(0), Price(2000), Quantity(100), Quantity(70), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(2002), Quantity(70), Quantity(70), false); + // send fill on leg 2 (15) + spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2001)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(15), Price(2001), Quantity(85), Quantity(55), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (15), Quantity(30), Price(2002), Quantity(70), Quantity(55), false); + // send another fill on leg 2 (30) + spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (45), Price (2001)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(45), Price(2002), Quantity(55), Quantity(25), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (45), Quantity(30), Price(2000), Quantity(70), Quantity(25), false); + // send another fill on leg 2 (10) + spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (55), Price (2001)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); + // verify the hedgers + // leg 1 should have 3 hedgers, for each of the 3 fills + for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) + if(leg_data_1.get_hedger(i).is_active_order()) + spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) + if(leg_data_2.get_hedger(i).is_active_order()) + spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + REQUIRE (leg_data_1.n_active_hedgers () == 3); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); + verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// auto generic_validate_quoters = [&](QuoterState quoter_state, bool quoter_cancelled_by_spreader) -> void -// { -// verify_complete_quoter_state (leg_data_1.quoter(), quoter_state, quoter_cancelled_by_spreader, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); -// verify_complete_quoter_state (leg_data_2.quoter(), quoter_state, quoter_cancelled_by_spreader, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); -// }; -// auto generic_validate_hedgers = [&](HedgerState hedger_state) -> void -// { -// REQUIRE (leg_data_1.n_hedgers () == 3); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_hedger_state (leg_data_1.get_hedger(0), hedger_state, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger(1), hedger_state, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger(2), hedger_state, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger(0), hedger_state, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger(1), hedger_state, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// }; -// SECTION("1. init") -// { -// } -// SECTION("2. on_connect") -// { -// } -// SECTION("4. on_update") -// { -// // updating the spreader order should cause -// // the quoters to requote. hedgers should -// // be as is -// spreader_price = Price (0); -// spreader_quantity = Quantity (200); -// spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); -// 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); -// // nothing changes with the hedgers -// generic_validate_hedgers (HedgerState::WORKING); -// LOG(OrderMan, Diag, "spreader_WORKING.on_update"); -// } -// SECTION("5. on_cancel") -// { -// spreader.on_cancel(trace::CorID()); -// 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); -// LOG(OrderMan, Diag, "spreader_WORKING.on_cancel"); -// } -// SECTION("6. on_book") -// { -// // 1. change the market such that it translates to no changes in order -// // leg 1 needs 15 more to get filled. the 15 cumulative size level in leg2 -// // comes out to be at 2002, which gives leg1 = spreader_price + leg2 = 1 + 2002 = 2003. -// // changing leg 2's books such that 15 still comes at 2002 + auto generic_validate_quoters = [&](QuoterState quoter_state, bool quoter_cancelled_by_spreader) -> void + { + verify_complete_quoter_state (leg_data_1.quoter(), quoter_state, quoter_cancelled_by_spreader, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); + verify_complete_quoter_state (leg_data_2.quoter(), quoter_state, quoter_cancelled_by_spreader, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); + }; + auto generic_validate_hedgers = [&](HedgerState hedger_state) -> void + { + REQUIRE (leg_data_1.n_active_hedgers () == 3); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_hedger_state (leg_data_1.get_hedger(0), hedger_state, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger(1), hedger_state, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger(2), hedger_state, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger(0), hedger_state, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger(1), hedger_state, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + }; + SECTION("1. init") + { + } + SECTION("2. on_connect") + { + } + SECTION("4. on_update") + { + // updating the spreader order should cause + // the quoters to requote. hedgers should + // be as is + spreader_price = Price (0); + spreader_quantity = Quantity (200); + spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); + 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); + // nothing changes with the hedgers + generic_validate_hedgers (HedgerState::WORKING); + LOG(OrderMan, Diag, "spreader_WORKING.on_update"); + } + SECTION("5. on_cancel") + { + spreader.on_cancel(trace::CorID()); + 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); + LOG(OrderMan, Diag, "spreader_WORKING.on_cancel"); + } + SECTION("6. on_book") + { + // 1. change the market such that it translates to no changes in order + // leg 1 needs 15 more to get filled. the 15 cumulative size level in leg2 + // comes out to be at 2002, which gives leg1 = spreader_price + leg2 = 1 + 2002 = 2003. + // changing leg 2's books such that 15 still comes at 2002 -// uint32_t leg_1_id = leg_data_1.leg_property_data().security_key(), -// leg_2_id = leg_data_2.leg_property_data().security_key(); -// bts::orderman::Book modified_book = get_book (SecurityKey (leg_2_id), 5, -// new double[5] {2004, 2003, 2002, 2001, 2000}, -// new uint16_t[5] {5, 5, 5, 0, 0}, -// 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()); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// generic_validate_quoters (QuoterState::WORKING, false); -// generic_validate_hedgers (HedgerState::WORKING); -// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); -// // 2. change the market to induce a price change -// // we will go back to the prevoius market but make it thinner -// // to force leg 1's quoter to go deeper into leg 2's book -// modified_book = get_book (SecurityKey (leg_2_id), 5, -// new double[5] {2002, 2001, 2000, 1999, 1998}, -// new uint16_t[5] {1, 1, 1, 1, 11}, -// 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()); -// 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); -// generic_validate_hedgers (HedgerState::WORKING); -// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); -// // 3. shrink to market to force a size change -// // the remaining target is 15, so we'll make the total -// // less than 15 -// modified_book = get_book (SecurityKey (leg_2_id), 5, -// new double[5] {2002, 2001, 2000, 1999, 1998}, -// new uint16_t[5] {1, 1, 1, 1, 0}, -// 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()); -// 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); -// generic_validate_hedgers (HedgerState::WORKING); -// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); -// // 4. change the market to force both a price and size change -// modified_book = get_book (SecurityKey (leg_2_id), 5, -// new double[5] {2002, 2001, 2000, 1999, 1998}, -// new uint16_t[5] {1, 1, 13, 1, 1}, -// 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()); -// 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); -// generic_validate_hedgers (HedgerState::WORKING); -// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); -// // 5. remove the market -// // this should pull the order -// modified_book = get_book (SecurityKey (leg_2_id), 5, -// new double[5] {2002, 2001, 2000, 1999, 1998}, -// new uint16_t[5] {0, 0, 0, 0, 0}, -// 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()); -// 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); -// generic_validate_hedgers (HedgerState::WORKING); -// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); -// } -// SECTION("7. on_time") -// { -// } -// SECTION("8. on_quoter_order_error") -// { -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (30), Price (2000)); -// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); -// // the one that has an error goes to the end, the others are waiting on cancel ack's -// REQUIRE(spreader.test_only_func_spreader_full_data().get_leg_data(0).quoter().test_only_func_quoter_state() == QuoterState::END); -// REQUIRE(spreader.test_only_func_spreader_full_data().get_leg_data(1).quoter().test_only_func_quoter_state() == QuoterState::WAITING_FOR_CANCEL_ACK); -// generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); -// LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_error"); -// } -// SECTION("9. on_quoter_order_fill") -// { -// // add one more hedge -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (65), Price (2001)); -// for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); -// for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) -// spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); -// REQUIRE (leg_data_1.n_hedgers () == 4); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(65), Price(2003), Quantity(35), Quantity(5), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (65), Quantity(30), Price(1999), Quantity(70), Quantity(5), false); -// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); -// } -// SECTION("10. on_quoter_order_status_update") -// { -// // since order update has already been done in 9, lets fill -// // it completely -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); -// for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); -// for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) -// spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); -// REQUIRE (leg_data_1.n_hedgers () == 4); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); -// verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_1.get_hedger(3), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); -// } -// SECTION("11. on_hedger_order_error") -// { -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (0), Price (0)); -// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); -// generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); -// REQUIRE(leg_data_1.get_hedger(0).test_only_func_hedger_state() == HedgerState::END); -// REQUIRE(leg_data_1.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); -// REQUIRE(leg_data_1.get_hedger(2).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); -// REQUIRE(leg_data_2.get_hedger(0).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); -// REQUIRE(leg_data_2.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); -// LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_error"); -// } -// SECTION("12. on_hedger_order_update") -// { -// // send as fill for the hedger -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2002)); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// generic_validate_quoters (QuoterState::WORKING, false); -// REQUIRE (leg_data_1.n_hedgers () == 3); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); -// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_update"); -// } -// SECTION("14. on_check_termination") -// { -// // the only way to do a termination and transit -// // to END is if the orders get filled. If we cancel -// // it leaves this state; if we send terminal status -// // on the quoters, and its not fully filled, the quoters -// // resubmit and continue -// // leg has 30 hedge deduction, and 55 filled, another 15 will fill it completely -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); -// REQUIRE (leg_data_1.n_hedgers () == 4); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); -// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WAITING_FOR_FIRST_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15));//new hedger -// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// // now bring the quoter and hedgers to their end states -// // when all of them are at the end state, the spreader -// // should also go to end -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2001)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(70), Price(0), Quantity(0), Quantity(0), true); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// // // all the quoters are done now -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (30), Price (2002)); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (2002)); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (3).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (1999)); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (1999)); -// verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); -// LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); -// } -// } + uint32_t leg_1_id = leg_data_1.leg_property_data().security_key(), + leg_2_id = leg_data_2.leg_property_data().security_key(); + bts::orderman::Book modified_book = get_book (SecurityKey (leg_2_id), 5, + new double[5] {2004, 2003, 2002, 2001, 2000}, + new uint16_t[5] {5, 5, 5, 0, 0}, + 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()); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + generic_validate_quoters (QuoterState::WORKING, false); + generic_validate_hedgers (HedgerState::WORKING); + LOG(OrderMan, Diag, "spreader_WORKING.on_book"); + // 2. change the market to induce a price change + // we will go back to the prevoius market but make it thinner + // to force leg 1's quoter to go deeper into leg 2's book + modified_book = get_book (SecurityKey (leg_2_id), 5, + new double[5] {2002, 2001, 2000, 1999, 1998}, + new uint16_t[5] {1, 1, 1, 1, 11}, + 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()); + 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); + generic_validate_hedgers (HedgerState::WORKING); + LOG(OrderMan, Diag, "spreader_WORKING.on_book"); + // 3. shrink to market to force a size change + // the remaining target is 15, so we'll make the total + // less than 15 + modified_book = get_book (SecurityKey (leg_2_id), 5, + new double[5] {2002, 2001, 2000, 1999, 1998}, + new uint16_t[5] {1, 1, 1, 1, 0}, + 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()); + 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); + generic_validate_hedgers (HedgerState::WORKING); + LOG(OrderMan, Diag, "spreader_WORKING.on_book"); + // 4. change the market to force both a price and size change + modified_book = get_book (SecurityKey (leg_2_id), 5, + new double[5] {2002, 2001, 2000, 1999, 1998}, + new uint16_t[5] {1, 1, 13, 1, 1}, + 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()); + 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); + generic_validate_hedgers (HedgerState::WORKING); + LOG(OrderMan, Diag, "spreader_WORKING.on_book"); + // 5. remove the market + // this should pull the order + modified_book = get_book (SecurityKey (leg_2_id), 5, + new double[5] {2002, 2001, 2000, 1999, 1998}, + new uint16_t[5] {0, 0, 0, 0, 0}, + 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()); + 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); + generic_validate_hedgers (HedgerState::WORKING); + LOG(OrderMan, Diag, "spreader_WORKING.on_book"); + } + SECTION("7. on_time") + { + } + SECTION("8. on_quoter_order_error") + { + spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (30), Price (2000)); + verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); + // the one that has an error goes to the end, the others are waiting on cancel ack's + REQUIRE(spreader.test_only_func_spreader_full_data().get_leg_data(0).quoter().test_only_func_quoter_state() == QuoterState::END); + REQUIRE(spreader.test_only_func_spreader_full_data().get_leg_data(1).quoter().test_only_func_quoter_state() == QuoterState::WAITING_FOR_CANCEL_ACK); + generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); + LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_error"); + } + SECTION("9. on_quoter_order_fill") + { + // add one more hedge + spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (65), Price (2001)); + for (size_t i = 0; i < leg_data_1.n_active_hedgers(); i++) + spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + for (size_t i = 0; i < leg_data_2.n_active_hedgers(); i++) + spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + REQUIRE (leg_data_1.n_active_hedgers () == 4); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(65), Price(2003), Quantity(35), Quantity(5), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (65), Quantity(30), Price(1999), Quantity(70), Quantity(5), false); + verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); + } + SECTION("10. on_quoter_order_status_update") + { + // since order update has already been done in 9, lets fill + // it completely + spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); + for (size_t i = 0; i < leg_data_1.n_active_hedgers(); i++) + spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + for (size_t i = 0; i < leg_data_2.n_active_hedgers(); i++) + spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + REQUIRE (leg_data_1.n_active_hedgers () == 4); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); + verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger(3), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); + } + SECTION("11. on_hedger_order_error") + { + spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (0), Price (0)); + verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); + generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); + REQUIRE(leg_data_1.get_hedger(0).test_only_func_hedger_state() == HedgerState::END); + REQUIRE(leg_data_1.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); + REQUIRE(leg_data_1.get_hedger(2).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); + REQUIRE(leg_data_2.get_hedger(0).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); + REQUIRE(leg_data_2.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); + LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_error"); + } + SECTION("12. on_hedger_order_update") + { + // send as fill for the hedger + spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2002)); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + generic_validate_quoters (QuoterState::WORKING, false); + REQUIRE (leg_data_1.n_active_hedgers () == 3); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); + verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_update"); + } + SECTION("14. on_check_termination") + { + // the only way to do a termination and transit + // to END is if the orders get filled. If we cancel + // it leaves this state; if we send terminal status + // on the quoters, and its not fully filled, the quoters + // resubmit and continue + // leg has 30 hedge deduction, and 55 filled, another 15 will fill it completely + spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); + REQUIRE (leg_data_1.n_active_hedgers () == 4); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); + verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WAITING_FOR_FIRST_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15));//new hedger + verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + // now bring the quoter and hedgers to their end states + // when all of them are at the end state, the spreader + // should also go to end + spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2001)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(70), Price(0), Quantity(0), Quantity(0), true); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + // // all the quoters are done now + spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (30), Price (2002)); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (2002)); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger (3).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (1999)); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (1999)); + verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); + LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); + } +} // TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // { // bts::orderman::OrderKey order_key(0); @@ -2318,162 +2320,162 @@ TEST_CASE ("spreader_START", "[spreader]") // LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_check_termination"); // } // } -// TEST_CASE ("find_target_price_in_book", "[spreader]"){ -// SECTION("0.05"){ -// Quantity out_level_qty, out_cum_qty; -// bts::orderman::Book book; -// uint16_t sizes[] = { 11, 13, 17, 19, 23 }; -// double prices[] = { 22, 21.15, 20.10, 20.05, 20.00 }; -// fill_book (book, prices, sizes, bts::api::Side::SIDE_BUY); -// // middle -// bool res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.10), 0.05, out_level_qty, out_cum_qty); -// REQUIRE(res); -// REQUIRE(out_level_qty.value()==17); -// REQUIRE(out_cum_qty.value()==41); -// // first -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(22.00), 0.05, out_level_qty, out_cum_qty); -// REQUIRE(res); -// REQUIRE(out_level_qty.value()==11); -// REQUIRE(out_cum_qty.value()==11); -// // last -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.00), 0.05, out_level_qty, out_cum_qty); -// REQUIRE(res); -// REQUIRE(out_level_qty.value()==23); -// REQUIRE(out_cum_qty.value()==83); -// // not found -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(21.00), 0.05, out_level_qty, out_cum_qty); -// REQUIRE(!res); -// // rounding error -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.04999999), 0.05, out_level_qty, out_cum_qty); -// REQUIRE(res); -// REQUIRE(out_level_qty.value()==19); -// REQUIRE(out_cum_qty.value()==60); -// } -// SECTION("1/32"){ -// Quantity out_level_qty, out_cum_qty; -// bts::orderman::Book book; -// uint16_t sizes[] = { 12, 91, 5, 24, 33 }; -// double prices[] = { 100.21875, 100.28125, 101, 101.53125, 101.71875 }; -// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); -// // first -// bool res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(100.21875), 0.03125, out_level_qty, out_cum_qty); -// REQUIRE(res); -// REQUIRE(out_level_qty.value()==12); -// REQUIRE(out_cum_qty.value()==12); -// // middle -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.53125), 0.03125, out_level_qty, out_cum_qty); -// REQUIRE(res); -// REQUIRE(out_level_qty.value()==24); -// REQUIRE(out_cum_qty.value()==132); -// // end -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.71875), 0.03125, out_level_qty, out_cum_qty); -// REQUIRE(res); -// REQUIRE(out_level_qty.value()==33); -// REQUIRE(out_cum_qty.value()==165); -// // absent -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.5625), 0.03125, out_level_qty, out_cum_qty); -// REQUIRE(!res); -// REQUIRE(out_level_qty.value()==0); -// REQUIRE(out_cum_qty.value()==0); -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(101.71875), 0.03125, out_level_qty, out_cum_qty); -// REQUIRE(!res); -// REQUIRE(out_level_qty.value()==0); -// REQUIRE(out_cum_qty.value()==0); -// // rounding -// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.531249999999), 0.03125, out_level_qty, out_cum_qty); -// REQUIRE(res); -// REQUIRE(out_level_qty.value()==24); -// REQUIRE(out_cum_qty.value()==132); -// } -// } -// TEST_CASE ("prehedge_payless", "[spreader]"){ -// SECTION("payup_true_abs_threshold"){ -// bts::orderman::Book book; -// Price out_price; -// uint16_t sizes[] = { 12, 14, 17, 19, 23 }; -// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; -// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); -// spark::PreHedgeQuantityBasedPayLessTicks payless_params; -// payless_params.set_payless_ticks(1); -// payless_params.mutable_quantity_threshold()->set_absolute(25); -// auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, -// 0.05, Price(21.05), Quantity(5), out_price); -// REQUIRE(res); -// REQUIRE(out_price.value()==21.00); -// } -// SECTION("payup_false_abs_threshold"){ -// bts::orderman::Book book; -// Price out_price; -// uint16_t sizes[] = { 10, 14, 17, 19, 23 }; -// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; -// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); -// spark::PreHedgeQuantityBasedPayLessTicks payless_params; -// payless_params.set_payless_ticks(1); -// payless_params.mutable_quantity_threshold()->set_absolute(25); -// auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, -// 0.05, Price(21.05), Quantity(5), out_price); -// REQUIRE(!res); -// REQUIRE(out_price.value()==21.05); -// } -// SECTION("payup_true_ratio_threshold"){ -// bts::orderman::Book book; -// Price out_price; -// uint16_t sizes[] = { 11, 14, 26, 19, 23 }; -// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; -// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); -// spark::PreHedgeQuantityBasedPayLessTicks payless_params; -// payless_params.set_payless_ticks(2); -// payless_params.mutable_quantity_threshold()->set_ratio(5); -// auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, -// 0.05, Price(21.10), Quantity(10), out_price); -// REQUIRE(res); -// REQUIRE(out_price.value()==21.00); -// } -// SECTION("payup_true_ratio_threshold"){ -// bts::orderman::Book book; -// Price out_price; -// uint16_t sizes[] = { 11, 14, 26, 19, 23 }; -// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; -// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); -// spark::PreHedgeQuantityBasedPayLessTicks payless_params; -// payless_params.set_payless_ticks(2); -// payless_params.mutable_quantity_threshold()->set_ratio(6); -// auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, -// 0.05, Price(21.10), Quantity(10), out_price); -// REQUIRE(!res); -// REQUIRE(out_price.value()==21.10); -// } -// } -// TEST_CASE ("prehedge_payup", "[spreader]"){ -// SECTION("payup_true_abs_threshold"){ -// bts::orderman::Book book; -// Price out_price; -// uint16_t sizes[] = { 12, 18, 20, 19, 23 }; -// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; -// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); -// spark::PreHedgeQuantityBasedPayupTicks payup_params; -// payup_params.set_payup_ticks(1); -// payup_params.mutable_quantity_threshold()->set_absolute(55); -// auto res = SpreaderUtils::prehedge_quantity_base_payup_ticks_reprice(payup_params, book, api::Side::SIDE_BUY, -// 0.05, Price(21.10), Quantity(5), out_price); -// REQUIRE(res); -// REQUIRE(bts::securities::test_price_equality(out_price.value(),21.15,0.05)); -// } -// SECTION("payup_false_abs_threshold"){ -// bts::orderman::Book book; -// Price out_price; -// uint16_t sizes[] = { 12, 18, 20, 19, 23 }; -// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; -// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); -// spark::PreHedgeQuantityBasedPayupTicks payup_params; -// payup_params.set_payup_ticks(1); -// payup_params.mutable_quantity_threshold()->set_absolute(50); -// auto res = SpreaderUtils::prehedge_quantity_base_payup_ticks_reprice(payup_params, book, api::Side::SIDE_BUY, -// 0.05, Price(21.10), Quantity(5), out_price); -// REQUIRE(!res); -// REQUIRE(bts::securities::test_price_equality(out_price.value(),21.10,0.05)); -// } -// } +TEST_CASE ("find_target_price_in_book", "[spreader]"){ + SECTION("0.05"){ + Quantity out_level_qty, out_cum_qty; + bts::orderman::Book book; + uint16_t sizes[] = { 11, 13, 17, 19, 23 }; + double prices[] = { 22, 21.15, 20.10, 20.05, 20.00 }; + fill_book (book, prices, sizes, bts::api::Side::SIDE_BUY); + // middle + bool res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.10), 0.05, out_level_qty, out_cum_qty); + REQUIRE(res); + REQUIRE(out_level_qty.value()==17); + REQUIRE(out_cum_qty.value()==41); + // first + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(22.00), 0.05, out_level_qty, out_cum_qty); + REQUIRE(res); + REQUIRE(out_level_qty.value()==11); + REQUIRE(out_cum_qty.value()==11); + // last + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.00), 0.05, out_level_qty, out_cum_qty); + REQUIRE(res); + REQUIRE(out_level_qty.value()==23); + REQUIRE(out_cum_qty.value()==83); + // not found + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(21.00), 0.05, out_level_qty, out_cum_qty); + REQUIRE(!res); + // rounding error + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.04999999), 0.05, out_level_qty, out_cum_qty); + REQUIRE(res); + REQUIRE(out_level_qty.value()==19); + REQUIRE(out_cum_qty.value()==60); + } + SECTION("1/32"){ + Quantity out_level_qty, out_cum_qty; + bts::orderman::Book book; + uint16_t sizes[] = { 12, 91, 5, 24, 33 }; + double prices[] = { 100.21875, 100.28125, 101, 101.53125, 101.71875 }; + fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); + // first + bool res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(100.21875), 0.03125, out_level_qty, out_cum_qty); + REQUIRE(res); + REQUIRE(out_level_qty.value()==12); + REQUIRE(out_cum_qty.value()==12); + // middle + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.53125), 0.03125, out_level_qty, out_cum_qty); + REQUIRE(res); + REQUIRE(out_level_qty.value()==24); + REQUIRE(out_cum_qty.value()==132); + // end + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.71875), 0.03125, out_level_qty, out_cum_qty); + REQUIRE(res); + REQUIRE(out_level_qty.value()==33); + REQUIRE(out_cum_qty.value()==165); + // absent + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.5625), 0.03125, out_level_qty, out_cum_qty); + REQUIRE(!res); + REQUIRE(out_level_qty.value()==0); + REQUIRE(out_cum_qty.value()==0); + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(101.71875), 0.03125, out_level_qty, out_cum_qty); + REQUIRE(!res); + REQUIRE(out_level_qty.value()==0); + REQUIRE(out_cum_qty.value()==0); + // rounding + res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.531249999999), 0.03125, out_level_qty, out_cum_qty); + REQUIRE(res); + REQUIRE(out_level_qty.value()==24); + REQUIRE(out_cum_qty.value()==132); + } +} +TEST_CASE ("prehedge_payless", "[spreader]"){ + SECTION("payup_true_abs_threshold"){ + bts::orderman::Book book; + Price out_price; + uint16_t sizes[] = { 12, 14, 17, 19, 23 }; + double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; + fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); + spark::PreHedgeQuantityBasedPayLessTicks payless_params; + payless_params.set_payless_ticks(1); + payless_params.mutable_quantity_threshold()->set_absolute(25); + auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, + 0.05, Price(21.05), Quantity(5), out_price); + REQUIRE(res); + REQUIRE(out_price.value()==21.00); + } + SECTION("payup_false_abs_threshold"){ + bts::orderman::Book book; + Price out_price; + uint16_t sizes[] = { 10, 14, 17, 19, 23 }; + double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; + fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); + spark::PreHedgeQuantityBasedPayLessTicks payless_params; + payless_params.set_payless_ticks(1); + payless_params.mutable_quantity_threshold()->set_absolute(25); + auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, + 0.05, Price(21.05), Quantity(5), out_price); + REQUIRE(!res); + REQUIRE(out_price.value()==21.05); + } + SECTION("payup_true_ratio_threshold"){ + bts::orderman::Book book; + Price out_price; + uint16_t sizes[] = { 11, 14, 26, 19, 23 }; + double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; + fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); + spark::PreHedgeQuantityBasedPayLessTicks payless_params; + payless_params.set_payless_ticks(2); + payless_params.mutable_quantity_threshold()->set_ratio(5); + auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, + 0.05, Price(21.10), Quantity(10), out_price); + REQUIRE(res); + REQUIRE(out_price.value()==21.00); + } + SECTION("payup_true_ratio_threshold"){ + bts::orderman::Book book; + Price out_price; + uint16_t sizes[] = { 11, 14, 26, 19, 23 }; + double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; + fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); + spark::PreHedgeQuantityBasedPayLessTicks payless_params; + payless_params.set_payless_ticks(2); + payless_params.mutable_quantity_threshold()->set_ratio(6); + auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, + 0.05, Price(21.10), Quantity(10), out_price); + REQUIRE(!res); + REQUIRE(out_price.value()==21.10); + } +} +TEST_CASE ("prehedge_payup", "[spreader]"){ + SECTION("payup_true_abs_threshold"){ + bts::orderman::Book book; + Price out_price; + uint16_t sizes[] = { 12, 18, 20, 19, 23 }; + double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; + fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); + spark::PreHedgeQuantityBasedPayupTicks payup_params; + payup_params.set_payup_ticks(1); + payup_params.mutable_quantity_threshold()->set_absolute(55); + auto res = SpreaderUtils::prehedge_quantity_base_payup_ticks_reprice(payup_params, book, api::Side::SIDE_BUY, + 0.05, Price(21.10), Quantity(5), out_price); + REQUIRE(res); + REQUIRE(bts::securities::test_price_equality(out_price.value(),21.15,0.05)); + } + SECTION("payup_false_abs_threshold"){ + bts::orderman::Book book; + Price out_price; + uint16_t sizes[] = { 12, 18, 20, 19, 23 }; + double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; + fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); + spark::PreHedgeQuantityBasedPayupTicks payup_params; + payup_params.set_payup_ticks(1); + payup_params.mutable_quantity_threshold()->set_absolute(50); + auto res = SpreaderUtils::prehedge_quantity_base_payup_ticks_reprice(payup_params, book, api::Side::SIDE_BUY, + 0.05, Price(21.10), Quantity(5), out_price); + REQUIRE(!res); + REQUIRE(bts::securities::test_price_equality(out_price.value(),21.10,0.05)); + } +} // // n legged spreader price evaluation ///////////////////// // /////////////////////////////////////////////////////////// // TEST_CASE ("nlegs_compute_driver", "[spreader]"){ From 1cc5a77d7f0768588d7dd3b06dcdb56886c7c4e0 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 17 Dec 2018 16:39:50 -0500 Subject: [PATCH 007/103] more tests enabled --- .../spreader_orders/tests/spreader_tests.cpp | 458 +++++++++--------- 1 file changed, 229 insertions(+), 229 deletions(-) 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 966fc4ea5..cdbcede9d 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -2089,237 +2089,237 @@ TEST_CASE ("spreader_WORKING", "[spreader]") LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); } } -// TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") -// { -// bts::orderman::OrderKey order_key(0); -// Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); -// ContractLeg leg_1, leg_2; -// fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); -// fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); -// std::vector contract_legs; -// contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); -// Security synthetic_security; -// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); -// // execution params/order def -// LegSpreaderParams lsp_1, lsp_2, lsp_3; -// fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); -// // post hedge time out here -// std::vector spreader_params; -// spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); -// bts::api::orderman::OrderDefinition order_def; -// fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); -// // putting it together in SpreaderBookkeepingData -// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); -// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); -// std::vector leg_props; -// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); -// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); -// SpreaderOrder spreader; -// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); -// // on_init_new and activate -// spreader.test_only_on_init_new (order_def, pao_services); -// SpreaderOrderServices order_services (nullptr); -// spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); -// SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); -// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); -// SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); +TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") +{ + bts::orderman::OrderKey order_key(0); + Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); + ContractLeg leg_1, leg_2; + fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); + fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); + std::vector contract_legs; + contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); + Security synthetic_security; + fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); + // execution params/order def + LegSpreaderParams lsp_1, lsp_2, lsp_3; + fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); + // post hedge time out here + std::vector spreader_params; + spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); + bts::api::orderman::OrderDefinition order_def; + fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); + // putting it together in SpreaderBookkeepingData + SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); + SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); + std::vector leg_props; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + SpreaderOrder spreader; + REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); + // on_init_new and activate + spreader.test_only_on_init_new (order_def, pao_services); + SpreaderOrderServices order_services (nullptr); + spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); + SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); -// set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {50, 50, 10, 10, 30}, -// new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, -// new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, -// new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, 0, 0, 0, 0); -// // verify working orders -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); -// // send fill on leg 1 (20) -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); -// // send another fill on leg 1 (10) -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (30), Price (2000)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(0), Price(2000), Quantity(100), Quantity(70), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(2002), Quantity(70), Quantity(70), false); -// // send fill on leg 2 (15) -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2001)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(15), Price(2001), Quantity(85), Quantity(55), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (15), Quantity(30), Price(2002), Quantity(70), Quantity(55), false); -// // send another fill on leg 2 (30) -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (45), Price (2001)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(45), Price(2002), Quantity(55), Quantity(25), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (45), Quantity(30), Price(2000), Quantity(70), Quantity(25), false); -// // send another fill on leg 2 (10) -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (55), Price (2001)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); -// // verify the hedgers -// // leg 1 should have 3 hedgers, for each of the 3 fills -// for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); -// for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) -// spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); -// REQUIRE (leg_data_1.n_hedgers () == 3); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); -// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {50, 50, 10, 10, 30}, + new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, + new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, + new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, 0, 0, 0, 0); + // verify working orders + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); + // send fill on leg 1 (20) + spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); + // send another fill on leg 1 (10) + spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (30), Price (2000)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(0), Price(2000), Quantity(100), Quantity(70), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(2002), Quantity(70), Quantity(70), false); + // send fill on leg 2 (15) + spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2001)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(15), Price(2001), Quantity(85), Quantity(55), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (15), Quantity(30), Price(2002), Quantity(70), Quantity(55), false); + // send another fill on leg 2 (30) + spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (45), Price (2001)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(45), Price(2002), Quantity(55), Quantity(25), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (45), Quantity(30), Price(2000), Quantity(70), Quantity(25), false); + // send another fill on leg 2 (10) + spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (55), Price (2001)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); + // verify the hedgers + // leg 1 should have 3 hedgers, for each of the 3 fills + for (size_t i = 0; i < leg_data_1.n_active_hedgers(); i++) + spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + for (size_t i = 0; i < leg_data_2.n_active_hedgers(); i++) + spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + REQUIRE (leg_data_1.n_active_hedgers () == 3); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); + verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.initializing"); -// // 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()); -// auto validate_state = [&]() -> void -// { -// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); -// REQUIRE (leg_data_1.n_hedgers () == 3); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); -// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// }; -// validate_state (); -// SECTION("1. init") -// { -// } -// SECTION("2. on_connect") -// { -// } -// SECTION("4. on_update") -// { -// spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); -// validate_state(); -// // order changes dont go through -// validate_state(); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_update"); -// } -// SECTION("5. on_cancel") -// { -// spreader.on_cancel(trace::CorID()); -// // already in cancel state, no change -// validate_state(); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); -// } -// SECTION("6. on_book") -// { -// // like 4 and 5, should have no effect -// set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {1, 0, 0, 0, 0}, -// new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {1, 1, 2, 0, 0}, -// new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {1, 0, 0, 0, 0}, -// new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {1, 0, 0, 0, 0}, 30, 2000, 55, 2001); -// validate_state (); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_book"); -// } -// // SECTION("7. on_time") -// // { -// // while (spreader.test_only_func_spreader_state () != SpreaderState::END) -// // { -// // spreader.on_time (std::chrono::system_clock::now()); -// // std::this_thread::sleep_for(std::chrono::milliseconds(1)); -// // } -// // int64_t time_since_cxl = ms_diff (std::chrono::system_clock::now(), cancel_timestamp); -// // REQUIRE (time_since_cxl >= spreader.test_cancel_timeout()); -// // verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); -// // verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); -// // verify_complete_hedger_state (leg_data_1.get_hedger (0).hedger(), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// // verify_complete_hedger_state (leg_data_1.get_hedger (1).hedger(), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// // verify_complete_hedger_state (leg_data_1.get_hedger (2).hedger(), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// // verify_complete_hedger_state (leg_data_2.get_hedger (0).hedger(), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// // verify_complete_hedger_state (leg_data_2.get_hedger (1).hedger(), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// // LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_time"); -// // } -// SECTION("8. on_quoter_order_error") -// { -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (30), Price (2000)); -// validate_state(); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_error"); -// } -// SECTION("9. on_quoter_order_fill") -// { -// // send another fill on leg 1, this will update the filled -// // state of leg 1, but no other action will take place -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (40), Price (2000.5)); -// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); -// REQUIRE (leg_data_1.n_hedgers () == 3); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (40), Quantity(55), Price(2003), Quantity(45), Quantity(5), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); -// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_fill"); -// } -// SECTION("10. on_quoter_order_status_update") -// { -// // cancelled update -// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2000)); -// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); -// REQUIRE (leg_data_1.n_hedgers () == 3); -// REQUIRE (leg_data_2.n_hedgers () == 2); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); -// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); -// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_status_update"); -// } -// SECTION("11. on_hedger_order_error") -// { -// std::string err_msg = "error"; -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (0), Price (0)); -// validate_state (); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_error"); -// } -// SECTION("12. on_hedger_order_update") -// { -// // send a fill -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); -// verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); -// verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); -// verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); -// verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); -// verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_update"); -// } -// SECTION("14. on_check_termination") -// { -// // send cancel for orders, once all quoters and hedgers -// // are cancelled, spreader should come to end -// spreader.test_only_on_child_order_update (leg_data_1.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2000)); -// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); -// spreader.test_only_on_child_order_update (leg_data_2.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (55), Price (2000)); -// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(15), false); -// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); -// verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(0), Quantity (0), Quantity (15)); -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); -// verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(0), Quantity (0), Quantity (30)); -// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); -// verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); -// spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); -// verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(0), Quantity (0), Quantity (20)); -// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); -// spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); -// verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); -// verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); -// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_check_termination"); -// } -// } + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.initializing"); + // 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()); + auto validate_state = [&]() -> void + { + verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); + REQUIRE (leg_data_1.n_active_hedgers () == 3); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); + verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + }; + validate_state (); + SECTION("1. init") + { + } + SECTION("2. on_connect") + { + } + SECTION("4. on_update") + { + spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); + validate_state(); + // order changes dont go through + validate_state(); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_update"); + } + SECTION("5. on_cancel") + { + spreader.on_cancel(trace::CorID()); + // already in cancel state, no change + validate_state(); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); + } + SECTION("6. on_book") + { + // like 4 and 5, should have no effect + set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {1, 0, 0, 0, 0}, + new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {1, 1, 2, 0, 0}, + new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {1, 0, 0, 0, 0}, + new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {1, 0, 0, 0, 0}, 30, 2000, 55, 2001); + validate_state (); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_book"); + } + // SECTION("7. on_time") + // { + // while (spreader.test_only_func_spreader_state () != SpreaderState::END) + // { + // spreader.on_time (std::chrono::system_clock::now()); + // std::this_thread::sleep_for(std::chrono::milliseconds(1)); + // } + // int64_t time_since_cxl = ms_diff (std::chrono::system_clock::now(), cancel_timestamp); + // REQUIRE (time_since_cxl >= spreader.test_cancel_timeout()); + // verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); + // verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); + // verify_complete_hedger_state (leg_data_1.get_hedger (0).hedger(), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + // verify_complete_hedger_state (leg_data_1.get_hedger (1).hedger(), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + // verify_complete_hedger_state (leg_data_1.get_hedger (2).hedger(), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + // verify_complete_hedger_state (leg_data_2.get_hedger (0).hedger(), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + // verify_complete_hedger_state (leg_data_2.get_hedger (1).hedger(), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + // LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_time"); + // } + SECTION("8. on_quoter_order_error") + { + spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (30), Price (2000)); + validate_state(); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_error"); + } + SECTION("9. on_quoter_order_fill") + { + // send another fill on leg 1, this will update the filled + // state of leg 1, but no other action will take place + spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (40), Price (2000.5)); + verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); + REQUIRE (leg_data_1.n_active_hedgers () == 3); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (40), Quantity(55), Price(2003), Quantity(45), Quantity(5), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); + verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_fill"); + } + SECTION("10. on_quoter_order_status_update") + { + // cancelled update + spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2000)); + verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); + REQUIRE (leg_data_1.n_active_hedgers () == 3); + REQUIRE (leg_data_2.n_active_hedgers () == 2); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); + verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_status_update"); + } + SECTION("11. on_hedger_order_error") + { + std::string err_msg = "error"; + spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (0), Price (0)); + validate_state (); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_error"); + } + SECTION("12. on_hedger_order_update") + { + // send a fill + spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); + verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); + verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_update"); + } + SECTION("14. on_check_termination") + { + // send cancel for orders, once all quoters and hedgers + // are cancelled, spreader should come to end + spreader.test_only_on_child_order_update (leg_data_1.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2000)); + verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); + spreader.test_only_on_child_order_update (leg_data_2.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (55), Price (2000)); + verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(15), false); + verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(0), Quantity (0), Quantity (15)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(0), Quantity (0), Quantity (30)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(0), Quantity (0), Quantity (20)); + verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); + verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); + LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_check_termination"); + } +} TEST_CASE ("find_target_price_in_book", "[spreader]"){ SECTION("0.05"){ Quantity out_level_qty, out_cum_qty; From b90f6cb45c64ceb755afa5d5ac6e7b5cdc6a4cb5 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 17 Dec 2018 16:50:35 -0500 Subject: [PATCH 008/103] all spreader unit tests restored --- .../spreader_orders/tests/spreader_tests.cpp | 1688 ++++++++--------- 1 file changed, 844 insertions(+), 844 deletions(-) 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 cdbcede9d..5f438af2c 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -2476,857 +2476,857 @@ TEST_CASE ("prehedge_payup", "[spreader]"){ REQUIRE(bts::securities::test_price_equality(out_price.value(),21.10,0.05)); } } -// // n legged spreader price evaluation ///////////////////// -// /////////////////////////////////////////////////////////// -// TEST_CASE ("nlegs_compute_driver", "[spreader]"){ -// bts::orderman::OrderKey order_key(1); -// ContractLeg leg_1, leg_2, leg_3, leg_4; -// fill_future_contract_leg (leg_1, 1, "CL", bts::api::Venue::VENUE_GLBX, 2018, 1, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); -// fill_future_contract_leg (leg_2, 2, "CL", bts::api::Venue::VENUE_GLBX, 2018, 2, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); -// fill_future_contract_leg (leg_3, 3, "CL", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); -// fill_future_contract_leg (leg_4, 4, "CL", bts::api::Venue::VENUE_GLBX, 2018, 4, 15, -3.0, -3.0, api::Side::SIDE_SELL, 1.0, 0.01); -// std::vector legs; -// legs.push_back(leg_1);legs.push_back(leg_2);legs.push_back(leg_3);legs.push_back(leg_4); -// Security sec; -// fill_synthetic_security (sec, 2000, "4legs", legs); -// // execution params/order def -// LegSpreaderParams lsp_1, lsp_2, lsp_3, lsp_4; -// fill_leg_spreader_params(lsp_1, 1.0, false, 1.0);fill_leg_spreader_params(lsp_2, 1.0, false, 1.0); -// fill_leg_spreader_params(lsp_3, 1.0, false, 1.0);fill_leg_spreader_params(lsp_4, -4.0, true, 1.0); -// // // post hedge time out here -// std::vector params; -// params.push_back(lsp_1);params.push_back(lsp_2); -// params.push_back(lsp_3);params.push_back(lsp_4); -// bts::api::orderman::OrderDefinition order_def; -// fill_spreader_order_definition(order_def, Side::SIDE_BUY, sec, params); -// // putting it together in SpreaderBookkeepingData -// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices -// testonly_spreader_pao_services = _create_spreader_pao_services(sec); -// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); -// std::vector leg_props; -// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); -// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); -// SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); -// SECTION("compute_1"){ -// Quantity quoting_leg_target (300); -// Price spread_price(0.25); -// fill_book(spreader_manager, 0, new double[5]{65.31,65.32,65.34,65.36, 65.40}, -// new uint16_t[5]{12,18,20,19,23},bts::api::Side::SIDE_SELL,true); -// fill_book(spreader_manager, 1, new double[5]{64.40,64.41,64.43,64.45,64.50}, -// new uint16_t[5]{1,5,20,12,15},bts::api::Side::SIDE_SELL,true); -// fill_book(spreader_manager, 2, new double[5]{64.10,64.18,64.19,64.20,64.21}, -// new uint16_t[5]{10,43,17,50,15},bts::api::Side::SIDE_SELL,true); -// std::vector out_driver_vector; -// for (int i=0; i<4; i++) -// out_driver_vector.emplace_back(); -// SpreaderUtils::compute_drivers(quoting_leg_target, 3, spreader_manager, out_driver_vector); -// _verify_driver (out_driver_vector[0],92,65.40,276); -// _verify_driver (out_driver_vector[1],53,64.50,159); -// _verify_driver (out_driver_vector[2],100,64.20,300); -// // size of the quoting leg -// Quantity computed_quoted_qty=SpreaderUtils::compute_quoting_quantity_from_drivers(3,out_driver_vector); -// REQUIRE(computed_quoted_qty.value()==159); -// // 2nd pass drivers -// SpreaderUtils::compute_drivers(computed_quoted_qty, 3, spreader_manager, out_driver_vector); -// _verify_driver (out_driver_vector[0],53,65.36,159); -// _verify_driver (out_driver_vector[1],53,64.50,159); -// _verify_driver (out_driver_vector[2],53,64.18,159); -// // price of the quoting leg -// Price computed_price=SpreaderUtils::compute_quoting_price_from_drivers(spread_price,3,spreader_manager,out_driver_vector); -// REQUIRE(computed_price.value()==64.60); -// //hedging -// Price hedge_price; double hedge_quantity; -// SpreaderUtils::compute_hedge_price_size_n_legs(spreader_manager.get_leg_data(3), -// Price(0), -// 18, -// spreader_manager.get_leg_data(0), -// out_driver_vector[0], -// hedge_price, -// hedge_quantity); -// REQUIRE(hedge_price.value()==65.36); -// REQUIRE(hedge_quantity==6); -// } -// SECTION("compute_2_fractional"){ -// Quantity quoting_leg_target (100); -// Price spread_price(0.25); -// fill_book(spreader_manager, 0, new double[5]{65.31,65.32,65.34,65.36, 65.40}, -// new uint16_t[5]{12,18,20,19,23},bts::api::Side::SIDE_SELL,true); -// fill_book(spreader_manager, 1, new double[5]{64.40,64.41,64.43,64.45,64.50}, -// new uint16_t[5]{1,5,20,12,15},bts::api::Side::SIDE_SELL,true); -// fill_book(spreader_manager, 2, new double[5]{64.10,64.18,64.19,64.20,64.21}, -// new uint16_t[5]{11,1,1,5,1},bts::api::Side::SIDE_SELL,true); -// std::vector out_driver_vector; -// for (int i=0; i<4; i++) -// out_driver_vector.emplace_back(); -// SpreaderUtils::compute_drivers(quoting_leg_target, 3, spreader_manager, out_driver_vector); -// _verify_driver (out_driver_vector[0],34,65.34,100); -// _verify_driver (out_driver_vector[1],34,64.45,100); -// _verify_driver (out_driver_vector[2],19,64.21,57); -// // size of the quoting leg -// Quantity computed_quoted_qty=SpreaderUtils::compute_quoting_quantity_from_drivers(3,out_driver_vector); -// REQUIRE(computed_quoted_qty.value()==57); -// // // 2nd pass drivers -// SpreaderUtils::compute_drivers(computed_quoted_qty, 3, spreader_manager, out_driver_vector); -// _verify_driver (out_driver_vector[0],19,65.32,57); -// _verify_driver (out_driver_vector[1],19,64.43,57); -// _verify_driver (out_driver_vector[2],19,64.21,57); -// // // price of the quoting leg -// Price computed_price=SpreaderUtils::compute_quoting_price_from_drivers(spread_price,3,spreader_manager,out_driver_vector); -// REQUIRE(computed_price.value()==64.57); -// // //hedging -// Price hedge_price; double hedge_quantity; -// SpreaderUtils::compute_hedge_price_size_n_legs(spreader_manager.get_leg_data(3), -// Price(0), -// 10.0, -// spreader_manager.get_leg_data(0), -// out_driver_vector[0], -// hedge_price, -// hedge_quantity); -// REQUIRE(hedge_price.value()==65.32); -// REQUIRE(std::abs(hedge_quantity - 3.333333) < 0.000001); -// } -// } -// TEST_CASE ("quote driver caching", "[spreader]"){ -// SECTION("zero_search"){ -// QuoteDriverSetHistory driver_cache(5,10,0.05); -// const QuoteLegDriver* driver_ptr=driver_cache.find_driver(Price(100),3); -// REQUIRE(driver_ptr==nullptr); -// } -// SECTION("simple_search"){ -// size_t n_legs=5, cache_sz=10; -// QuoteDriverSetHistory driver_cache(n_legs,cache_sz,0.05); -// Price p1(100); std::vector d1; -// generate_driver_set(d1,n_legs); -// driver_cache.add(d1,p1); -// Price p2(100.05); std::vector d2; -// generate_driver_set(d2,n_legs); -// driver_cache.add(d2,p2); -// Price p3(100.10); std::vector d3; -// generate_driver_set(d3,n_legs); -// driver_cache.add(d3,p3); -// for(size_t i=0; i d; -// generate_driver_set(d,n_legs); -// driver_cache.add(d,p); -// } -// Price p1(100); std::vector d1; -// generate_driver_set(d1,n_legs); -// driver_cache.add(d1,p1); -// Price p2(100.05); std::vector d2; -// generate_driver_set(d2,n_legs); -// driver_cache.add(d2,p2); -// Price p3(100.10); std::vector d3; -// generate_driver_set(d3,n_legs); -// driver_cache.add(d3,p3); -// Price p4(100); std::vector d4; -// generate_driver_set(d4,n_legs); -// driver_cache.add(d4,p4); -// Price p5(100.15); std::vector d5; -// generate_driver_set(d5,n_legs); -// driver_cache.add(d5,p5); -// for(size_t i=0; i legs; + legs.push_back(leg_1);legs.push_back(leg_2);legs.push_back(leg_3);legs.push_back(leg_4); + Security sec; + fill_synthetic_security (sec, 2000, "4legs", legs); + // execution params/order def + LegSpreaderParams lsp_1, lsp_2, lsp_3, lsp_4; + fill_leg_spreader_params(lsp_1, 1.0, false, 1.0);fill_leg_spreader_params(lsp_2, 1.0, false, 1.0); + fill_leg_spreader_params(lsp_3, 1.0, false, 1.0);fill_leg_spreader_params(lsp_4, -4.0, true, 1.0); + // // post hedge time out here + std::vector params; + params.push_back(lsp_1);params.push_back(lsp_2); + params.push_back(lsp_3);params.push_back(lsp_4); + bts::api::orderman::OrderDefinition order_def; + fill_spreader_order_definition(order_def, Side::SIDE_BUY, sec, params); + // putting it together in SpreaderBookkeepingData + SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices + testonly_spreader_pao_services = _create_spreader_pao_services(sec); + SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); + std::vector leg_props; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); + SECTION("compute_1"){ + Quantity quoting_leg_target (300); + Price spread_price(0.25); + fill_book(spreader_manager, 0, new double[5]{65.31,65.32,65.34,65.36, 65.40}, + new uint16_t[5]{12,18,20,19,23},bts::api::Side::SIDE_SELL,true); + fill_book(spreader_manager, 1, new double[5]{64.40,64.41,64.43,64.45,64.50}, + new uint16_t[5]{1,5,20,12,15},bts::api::Side::SIDE_SELL,true); + fill_book(spreader_manager, 2, new double[5]{64.10,64.18,64.19,64.20,64.21}, + new uint16_t[5]{10,43,17,50,15},bts::api::Side::SIDE_SELL,true); + std::vector out_driver_vector; + for (int i=0; i<4; i++) + out_driver_vector.emplace_back(); + SpreaderUtils::compute_drivers(quoting_leg_target, 3, spreader_manager, out_driver_vector); + _verify_driver (out_driver_vector[0],92,65.40,276); + _verify_driver (out_driver_vector[1],53,64.50,159); + _verify_driver (out_driver_vector[2],100,64.20,300); + // size of the quoting leg + Quantity computed_quoted_qty=SpreaderUtils::compute_quoting_quantity_from_drivers(3,out_driver_vector); + REQUIRE(computed_quoted_qty.value()==159); + // 2nd pass drivers + SpreaderUtils::compute_drivers(computed_quoted_qty, 3, spreader_manager, out_driver_vector); + _verify_driver (out_driver_vector[0],53,65.36,159); + _verify_driver (out_driver_vector[1],53,64.50,159); + _verify_driver (out_driver_vector[2],53,64.18,159); + // price of the quoting leg + Price computed_price=SpreaderUtils::compute_quoting_price_from_drivers(spread_price,3,spreader_manager,out_driver_vector); + REQUIRE(computed_price.value()==64.60); + //hedging + Price hedge_price; double hedge_quantity; + SpreaderUtils::compute_hedge_price_size_n_legs(spreader_manager.get_leg_data(3), + Price(0), + 18, + spreader_manager.get_leg_data(0), + out_driver_vector[0], + hedge_price, + hedge_quantity); + REQUIRE(hedge_price.value()==65.36); + REQUIRE(hedge_quantity==6); + } + SECTION("compute_2_fractional"){ + Quantity quoting_leg_target (100); + Price spread_price(0.25); + fill_book(spreader_manager, 0, new double[5]{65.31,65.32,65.34,65.36, 65.40}, + new uint16_t[5]{12,18,20,19,23},bts::api::Side::SIDE_SELL,true); + fill_book(spreader_manager, 1, new double[5]{64.40,64.41,64.43,64.45,64.50}, + new uint16_t[5]{1,5,20,12,15},bts::api::Side::SIDE_SELL,true); + fill_book(spreader_manager, 2, new double[5]{64.10,64.18,64.19,64.20,64.21}, + new uint16_t[5]{11,1,1,5,1},bts::api::Side::SIDE_SELL,true); + std::vector out_driver_vector; + for (int i=0; i<4; i++) + out_driver_vector.emplace_back(); + SpreaderUtils::compute_drivers(quoting_leg_target, 3, spreader_manager, out_driver_vector); + _verify_driver (out_driver_vector[0],34,65.34,100); + _verify_driver (out_driver_vector[1],34,64.45,100); + _verify_driver (out_driver_vector[2],19,64.21,57); + // size of the quoting leg + Quantity computed_quoted_qty=SpreaderUtils::compute_quoting_quantity_from_drivers(3,out_driver_vector); + REQUIRE(computed_quoted_qty.value()==57); + // // 2nd pass drivers + SpreaderUtils::compute_drivers(computed_quoted_qty, 3, spreader_manager, out_driver_vector); + _verify_driver (out_driver_vector[0],19,65.32,57); + _verify_driver (out_driver_vector[1],19,64.43,57); + _verify_driver (out_driver_vector[2],19,64.21,57); + // // price of the quoting leg + Price computed_price=SpreaderUtils::compute_quoting_price_from_drivers(spread_price,3,spreader_manager,out_driver_vector); + REQUIRE(computed_price.value()==64.57); + // //hedging + Price hedge_price; double hedge_quantity; + SpreaderUtils::compute_hedge_price_size_n_legs(spreader_manager.get_leg_data(3), + Price(0), + 10.0, + spreader_manager.get_leg_data(0), + out_driver_vector[0], + hedge_price, + hedge_quantity); + REQUIRE(hedge_price.value()==65.32); + REQUIRE(std::abs(hedge_quantity - 3.333333) < 0.000001); + } +} +TEST_CASE ("quote driver caching", "[spreader]"){ + SECTION("zero_search"){ + QuoteDriverSetHistory driver_cache(5,10,0.05); + const QuoteLegDriver* driver_ptr=driver_cache.find_driver(Price(100),3); + REQUIRE(driver_ptr==nullptr); + } + SECTION("simple_search"){ + size_t n_legs=5, cache_sz=10; + QuoteDriverSetHistory driver_cache(n_legs,cache_sz,0.05); + Price p1(100); std::vector d1; + generate_driver_set(d1,n_legs); + driver_cache.add(d1,p1); + Price p2(100.05); std::vector d2; + generate_driver_set(d2,n_legs); + driver_cache.add(d2,p2); + Price p3(100.10); std::vector d3; + generate_driver_set(d3,n_legs); + driver_cache.add(d3,p3); + for(size_t i=0; i d; + generate_driver_set(d,n_legs); + driver_cache.add(d,p); + } + Price p1(100); std::vector d1; + generate_driver_set(d1,n_legs); + driver_cache.add(d1,p1); + Price p2(100.05); std::vector d2; + generate_driver_set(d2,n_legs); + driver_cache.add(d2,p2); + Price p3(100.10); std::vector d3; + generate_driver_set(d3,n_legs); + driver_cache.add(d3,p3); + Price p4(100); std::vector d4; + generate_driver_set(d4,n_legs); + driver_cache.add(d4,p4); + Price p5(100.15); std::vector d5; + generate_driver_set(d5,n_legs); + driver_cache.add(d5,p5); + for(size_t i=0; i contract_legs; -// contract_legs.push_back(leg_1); -// contract_legs.push_back(leg_2); -// Security synthetic_security; -// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); -// // execution params/order def -// LegSpreaderParams lsp_1, lsp_2, lsp_3; -// fill_leg_spreader_params(lsp_1, 1.0, false, 1.0); -// fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); -// std::vector spreader_params; -// spreader_params.push_back(lsp_1); -// spreader_params.push_back(lsp_2); -// bts::api::orderman::OrderDefinition order_def; -// fill_spreader_order_definition(order_def, Side::SIDE_BUY, -// synthetic_security, -// spreader_params); -// // putting it together in SpreaderBookkeepingData -// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices -// testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); -// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); -// std::vector leg_props; -// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); -// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); -// SpreaderOrder spreader; -// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); -// // on_init_new and activate -// spreader.test_only_on_init_new (order_def, pao_services); -// SpreaderOrderServices order_services (nullptr); -// spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); -// SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); -// verify_basic_spreader_state (spreader, -// SpreaderState::WORKING, -// spreader_price, -// spreader_quantity); -// SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); -// SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); -// verify_complete_quoter_state (leg_data_2.quoter(), -// QuoterState::WAITING_FOR_SIZE, -// false, -// spreader_price, -// Quantity (100), -// Quantity (0), -// Quantity(0), -// Price(0), -// Quantity(0), -// Quantity(100), -// false); +TEST_CASE ("spreader_perf_2legs", "[spreader]") +{ + bts::orderman::OrderKey order_key(0); + Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); + ContractLeg leg_1, leg_2; + fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, + 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, + 1.0, 0.25); + fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, + 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, + 1.0, 0.25); + std::vector contract_legs; + contract_legs.push_back(leg_1); + contract_legs.push_back(leg_2); + Security synthetic_security; + fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); + // execution params/order def + LegSpreaderParams lsp_1, lsp_2, lsp_3; + fill_leg_spreader_params(lsp_1, 1.0, false, 1.0); + fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); + std::vector spreader_params; + spreader_params.push_back(lsp_1); + spreader_params.push_back(lsp_2); + bts::api::orderman::OrderDefinition order_def; + fill_spreader_order_definition(order_def, Side::SIDE_BUY, + synthetic_security, + spreader_params); + // putting it together in SpreaderBookkeepingData + SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices + testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); + SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); + std::vector leg_props; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + SpreaderOrder spreader; + REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); + // on_init_new and activate + spreader.test_only_on_init_new (order_def, pao_services); + SpreaderOrderServices order_services (nullptr); + spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); + SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); + verify_basic_spreader_state (spreader, + SpreaderState::WORKING, + spreader_price, + spreader_quantity); + SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); + SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); + verify_complete_quoter_state (leg_data_2.quoter(), + QuoterState::WAITING_FOR_SIZE, + false, + spreader_price, + Quantity (100), + Quantity (0), + Quantity(0), + Price(0), + Quantity(0), + Quantity(100), + false); -// set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, -// new uint16_t[5] {50, 50, 10, 10, 30}, -// new double[5] {2000, 2001, 2002, 2003, 2004}, -// new uint16_t[5] {10, 15, 25, 50, 10}, -// new double[5] {2002, 2001, 2000, 1999, 1998}, -// new uint16_t[5] {20, 20, 20, 20, 20}, -// new double[5] {2003, 2004, 2005, 2006, 2007}, -// new uint16_t[5] {25, 25, 20, 20, 10}, -// 0, 0, 0, 0); -// // verify working orders -// verify_complete_quoter_state (leg_data_2.quoter(), -// QuoterState::WORKING, false, -// spreader_price, -// Quantity (100), -// Quantity (0), -// Quantity(0), -// Price(2002), -// Quantity(100), -// Quantity(100), -// false); -// SECTION ("book updates"){ -// Book book_1 = get_book(SecurityKey (leg_1.security().id()), -// 5, -// new double[10] {1999, 1998, 1997, 1996, 1995}, -// new uint16_t[10] {50, 10, 10, 10, 30}, -// new double[10] {2000, 2001, 2002, 2003, 2004}, -// new uint16_t[10] {50, 10, 10, 10, 30}, -// true), -// book_2 = get_book(SecurityKey (leg_1.security().id()), -// 5, -// new double[10] {1999.5, 1998.5, 1997.5, 1996.5, 1995.5}, -// new uint16_t[10] {5, 15, 20, 20, 30}, -// new double[10] {2000.25, 2001.25, 2002.25, 2003.25, 2004.25}, -// new uint16_t[10] {10, 5, 15, 25, 5}, -// true); -// uint32_t n_runs=10,n_iters = 100; -// //alternate bw the book n_runs times -// for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; -// auto n_requotes=n_iters;//leg_data_2.order_update_message().n_modifications(); -// LOG(OrderMan, Info, "2 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); -// std::cout << "2 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; -// } -// } -// SECTION ("hedges"){ -// // send hedges -// uint32_t n_hedges=20; -// bts::TimeStamp t0=bts::Timer::now(); -// for (uint32_t i=1; i<=n_hedges; i++) -// spreader.test_only_on_child_order_update (leg_data_2.order_key(), -// api::orderman::OrderStatus::ORDER_STATUS_WORKING, -// Quantity (i), -// Price (2001)); -// bts::TimeStamp t1=bts::Timer::now(); -// const auto& leg_data=bookkeeping_data.get_leg_data(0); -// REQUIRE(leg_data.n_hedgers()==n_hedges); -// double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; -// LOG(OrderMan, Info, "2 leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); -// std::cout << "2 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; -// } -// } -// TEST_CASE ("spreader_perf_4legs", "[spreader]") -// { -// bts::orderman::OrderKey order_key(0); -// Price spreader_price = Price (40); -// Quantity spreader_quantity = Quantity (250); -// ContractLeg leg_1, leg_2, leg_3, qleg_4; -// fill_future_contract_leg (leg_1, 2468, "SI", bts::api::Venue::VENUE_GLBX, -// 2019, 1, 15, -// 1.0, 1.0, -// api::Side::SIDE_BUY, -// 1.0, 0.005); -// fill_future_contract_leg (leg_2, 2469, "SI", bts::api::Venue::VENUE_GLBX, -// 2019, 2, 15, -// 1.0, 1.0, -// api::Side::SIDE_BUY, -// 1.0, 0.005); -// fill_future_contract_leg (leg_3, 2470, "SI", bts::api::Venue::VENUE_GLBX, -// 2019, 3, 15, -// 1.0, 1.0, -// api::Side::SIDE_BUY, -// 1.0, 0.005); -// fill_future_contract_leg (qleg_4, 2471, "SI", bts::api::Venue::VENUE_GLBX, -// 2019, 4, 15, -// -1.0, -1.0, -// api::Side::SIDE_SELL, -// 1.0, 0.005); -// std::vector contract_legs; -// contract_legs.push_back(leg_1); -// contract_legs.push_back(leg_2); -// contract_legs.push_back(leg_3); -// contract_legs.push_back(qleg_4); -// Security synthetic_security; -// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); -// // execution params/order def -// LegSpreaderParams lsp_1, lsp_2, lsp_3, qlsp_4; -// fill_leg_spreader_params(lsp_1, 1.0, false, 1.0); -// fill_leg_spreader_params(lsp_2, 1.0, false, 1.0); -// fill_leg_spreader_params(lsp_3, 1.0, false, 1.0); -// fill_leg_spreader_params(qlsp_4, -1.0, true, 1.0); -// std::vector spreader_params; -// spreader_params.push_back(lsp_1); -// spreader_params.push_back(lsp_2); -// spreader_params.push_back(lsp_3); -// spreader_params.push_back(qlsp_4); -// bts::api::orderman::OrderDefinition order_def; -// fill_spreader_order_definition(order_def, Side::SIDE_BUY, -// synthetic_security, -// spreader_params); -// // putting it together in SpreaderBookkeepingData -// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices -// testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); -// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); -// std::vector leg_props; -// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); -// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); -// SpreaderOrder spreader; -// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); -// // on_init_new and activate -// spreader.test_only_on_init_new (order_def, pao_services); -// SpreaderOrderServices order_services (nullptr); -// spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); -// SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); -// verify_basic_spreader_state (spreader, -// SpreaderState::WORKING, -// spreader_price, -// spreader_quantity); -// SpreaderLegData& qleg_data_4 = bookkeeping_data.get_leg_data (3); -// verify_complete_quoter_state (qleg_data_4.quoter(), -// QuoterState::WAITING_FOR_SIZE, -// false, -// spreader_price, -// spreader_quantity, -// Quantity (0), -// Quantity(0), -// Price(0), -// Quantity(0), -// spreader_quantity, -// false); -// Book book_1 = get_book(SecurityKey (leg_1.security().id()), -// 5, -// new double[5] {20, 19.995, 19.990, 19.985, 19.980}, -// new uint16_t[5] {100, 50, 75, 150, 25}, -// new double[5] {20.005, 20.010, 20.015, 20.020, 20.025}, -// new uint16_t[5] {25,125,175,225,100}, -// true), -// book_1_alt = get_book(SecurityKey (leg_1.security().id()), -// 5, -// new double[5] {20.005, 19.990, 19.890, 19.885, 19.780}, -// new uint16_t[5] {10, 25, 75, 15, 25}, -// new double[5] {20.010, 20.015, 20.025, 20.030, 20.035}, -// new uint16_t[5] {10, 25, 75, 15, 25}, -// true), -// book_2 = get_book(SecurityKey (leg_2.security().id()), -// 5, -// new double[5] {20.030,20.025,20.020,20.015,20.010}, -// new uint16_t[5] {100, 100, 200, 250, 75}, -// new double[5] {20.035, 20.040, 20.045, 20.050, 20.055}, -// new uint16_t[5] {250,275,100,5,15}, -// true), -// book_2_alt = get_book(SecurityKey (leg_2.security().id()), -// 5, -// new double[5] {20.050,20.035,20.030,20.035,20.030}, -// new uint16_t[5] {10, 10, 20, 250, 75}, -// new double[5] {20.055, 20.060, 20.065, 20.070, 20.085}, -// new uint16_t[5] {25,275,100,5,15}, -// true), -// book_3 = get_book(SecurityKey (leg_3.security().id()), -// 5, -// new double[5] {19.985,19.980,19.975,19.970,19.965}, -// new uint16_t[5] {75,250,125,100,300}, -// new double[5] {19.990,19.995,20.000,20.005,20.010}, -// new uint16_t[5] {100,150,250,25,125}, -// true), -// book_3_alt = get_book(SecurityKey (leg_3.security().id()), -// 5, -// new double[5] {19.885,19.875,19.870,19.765,19.760}, -// new uint16_t[5] {75,25,125,100,300}, -// new double[5] {19.890,19.895,19.900,19.910,19.915}, -// new uint16_t[5] {100,50,50,125,125}, -// true); -// spreader.test_only_on_book_update (BookUpdateEvent(book_1, -// trace::CorID())); -// spreader.test_only_on_book_update (BookUpdateEvent(book_2, -// trace::CorID())); -// spreader.test_only_on_book_update (BookUpdateEvent(book_3, -// trace::CorID())); -// verify_complete_quoter_state (qleg_data_4.quoter(), -// QuoterState::WAITING_FOR_FIRST_ACK, -// false, -// spreader_price, -// spreader_quantity, -// Quantity (0), -// Quantity(0), -// Price(20.045), -// spreader_quantity, -// spreader_quantity, -// false); -// spreader.test_only_on_child_order_update (qleg_data_4.order_key(), -// api::orderman::OrderStatus::ORDER_STATUS_WORKING, -// Quantity (0), -// Price (0)); -// verify_complete_quoter_state (qleg_data_4.quoter(), -// QuoterState::WORKING, -// false, -// spreader_price, -// spreader_quantity, -// Quantity (0), -// Quantity(0), -// Price(20.045), -// spreader_quantity, -// spreader_quantity, -// false); -// // SECTION ("book updates"){ -// // uint32_t n_runs=10,n_iters = 100; -// // //alternate bw the book n_runs times -// // for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; -// // auto n_requotes=n_iters;//qleg_data_4.order_update_message().n_modifications(); -// // LOG(OrderMan, Info, "4 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); -// // std::cout << "4 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; -// // } -// // } -// // SECTION ("hedges"){ -// // // send hedges -// // uint32_t n_hedges=20; -// // bts::TimeStamp t0=bts::Timer::now(); -// // for (uint32_t i=1; i<=n_hedges; i++) -// // spreader.test_only_on_child_order_update (qleg_data_4.order_key(), -// // api::orderman::OrderStatus::ORDER_STATUS_WORKING, -// // Quantity (i), -// // Price (21.045)); -// // bts::TimeStamp t1=bts::Timer::now(); -// // const auto& leg_data=bookkeeping_data.get_leg_data(0); -// // REQUIRE(leg_data.n_hedgers()==n_hedges); -// // double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; -// // LOG(OrderMan, Info, "n leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); -// // std::cout << "4 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; -// // } -// SECTION ("N_requotes_1_hedge_M_times"){ -// // N book updates followed by M fills -// // (does the hedge time stays the same as -// // in a tight loop in the "hedges" test ?) -// uint32_t n_runs=5, -// n_book_updates=200, -// n_hedges = 5; -// // since its the same quoting order we are filling -// // and the code downstream expects accumulated filled qty -// uint32_t total_filled_qty = 0, hi = 0; -// for (uint32_t i=0; i hedge_perfs; -// hedge_perfs.reserve(n_hedges); -// auto t0=utils::TimeStamp::now(); -// for (uint32_t b=0; b(1999.0), -// bts::spark::LegSpreaderParams::DIRECT, -// bts::spark::LegSpreaderParams::BOOK, -// out_book); + set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, + new uint16_t[5] {50, 50, 10, 10, 30}, + new double[5] {2000, 2001, 2002, 2003, 2004}, + new uint16_t[5] {10, 15, 25, 50, 10}, + new double[5] {2002, 2001, 2000, 1999, 1998}, + new uint16_t[5] {20, 20, 20, 20, 20}, + new double[5] {2003, 2004, 2005, 2006, 2007}, + new uint16_t[5] {25, 25, 20, 20, 10}, + 0, 0, 0, 0); + // verify working orders + verify_complete_quoter_state (leg_data_2.quoter(), + QuoterState::WORKING, false, + spreader_price, + Quantity (100), + Quantity (0), + Quantity(0), + Price(2002), + Quantity(100), + Quantity(100), + false); + SECTION ("book updates"){ + Book book_1 = get_book(SecurityKey (leg_1.security().id()), + 5, + new double[10] {1999, 1998, 1997, 1996, 1995}, + new uint16_t[10] {50, 10, 10, 10, 30}, + new double[10] {2000, 2001, 2002, 2003, 2004}, + new uint16_t[10] {50, 10, 10, 10, 30}, + true), + book_2 = get_book(SecurityKey (leg_1.security().id()), + 5, + new double[10] {1999.5, 1998.5, 1997.5, 1996.5, 1995.5}, + new uint16_t[10] {5, 15, 20, 20, 30}, + new double[10] {2000.25, 2001.25, 2002.25, 2003.25, 2004.25}, + new uint16_t[10] {10, 5, 15, 25, 5}, + true); + uint32_t n_runs=10,n_iters = 100; + //alternate bw the book n_runs times + for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; + auto n_requotes=n_iters;//leg_data_2.order_update_message().n_modifications(); + LOG(OrderMan, Info, "2 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); + std::cout << "2 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; + } + } + SECTION ("hedges"){ + // send hedges + uint32_t n_hedges=20; + bts::TimeStamp t0=bts::Timer::now(); + for (uint32_t i=1; i<=n_hedges; i++) + spreader.test_only_on_child_order_update (leg_data_2.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (i), + Price (2001)); + bts::TimeStamp t1=bts::Timer::now(); + const auto& leg_data=bookkeeping_data.get_leg_data(0); + REQUIRE(leg_data.n_hedgers()==n_hedges); + double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; + LOG(OrderMan, Info, "2 leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); + std::cout << "2 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; + } +} +TEST_CASE ("spreader_perf_4legs", "[spreader]") +{ + bts::orderman::OrderKey order_key(0); + Price spreader_price = Price (40); + Quantity spreader_quantity = Quantity (250); + ContractLeg leg_1, leg_2, leg_3, qleg_4; + fill_future_contract_leg (leg_1, 2468, "SI", bts::api::Venue::VENUE_GLBX, + 2019, 1, 15, + 1.0, 1.0, + api::Side::SIDE_BUY, + 1.0, 0.005); + fill_future_contract_leg (leg_2, 2469, "SI", bts::api::Venue::VENUE_GLBX, + 2019, 2, 15, + 1.0, 1.0, + api::Side::SIDE_BUY, + 1.0, 0.005); + fill_future_contract_leg (leg_3, 2470, "SI", bts::api::Venue::VENUE_GLBX, + 2019, 3, 15, + 1.0, 1.0, + api::Side::SIDE_BUY, + 1.0, 0.005); + fill_future_contract_leg (qleg_4, 2471, "SI", bts::api::Venue::VENUE_GLBX, + 2019, 4, 15, + -1.0, -1.0, + api::Side::SIDE_SELL, + 1.0, 0.005); + std::vector contract_legs; + contract_legs.push_back(leg_1); + contract_legs.push_back(leg_2); + contract_legs.push_back(leg_3); + contract_legs.push_back(qleg_4); + Security synthetic_security; + fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); + // execution params/order def + LegSpreaderParams lsp_1, lsp_2, lsp_3, qlsp_4; + fill_leg_spreader_params(lsp_1, 1.0, false, 1.0); + fill_leg_spreader_params(lsp_2, 1.0, false, 1.0); + fill_leg_spreader_params(lsp_3, 1.0, false, 1.0); + fill_leg_spreader_params(qlsp_4, -1.0, true, 1.0); + std::vector spreader_params; + spreader_params.push_back(lsp_1); + spreader_params.push_back(lsp_2); + spreader_params.push_back(lsp_3); + spreader_params.push_back(qlsp_4); + bts::api::orderman::OrderDefinition order_def; + fill_spreader_order_definition(order_def, Side::SIDE_BUY, + synthetic_security, + spreader_params); + // putting it together in SpreaderBookkeepingData + SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices + testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); + SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); + std::vector leg_props; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + SpreaderOrder spreader; + REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); + // on_init_new and activate + spreader.test_only_on_init_new (order_def, pao_services); + SpreaderOrderServices order_services (nullptr); + spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); + SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); + verify_basic_spreader_state (spreader, + SpreaderState::WORKING, + spreader_price, + spreader_quantity); + SpreaderLegData& qleg_data_4 = bookkeeping_data.get_leg_data (3); + verify_complete_quoter_state (qleg_data_4.quoter(), + QuoterState::WAITING_FOR_SIZE, + false, + spreader_price, + spreader_quantity, + Quantity (0), + Quantity(0), + Price(0), + Quantity(0), + spreader_quantity, + false); + Book book_1 = get_book(SecurityKey (leg_1.security().id()), + 5, + new double[5] {20, 19.995, 19.990, 19.985, 19.980}, + new uint16_t[5] {100, 50, 75, 150, 25}, + new double[5] {20.005, 20.010, 20.015, 20.020, 20.025}, + new uint16_t[5] {25,125,175,225,100}, + true), + book_1_alt = get_book(SecurityKey (leg_1.security().id()), + 5, + new double[5] {20.005, 19.990, 19.890, 19.885, 19.780}, + new uint16_t[5] {10, 25, 75, 15, 25}, + new double[5] {20.010, 20.015, 20.025, 20.030, 20.035}, + new uint16_t[5] {10, 25, 75, 15, 25}, + true), + book_2 = get_book(SecurityKey (leg_2.security().id()), + 5, + new double[5] {20.030,20.025,20.020,20.015,20.010}, + new uint16_t[5] {100, 100, 200, 250, 75}, + new double[5] {20.035, 20.040, 20.045, 20.050, 20.055}, + new uint16_t[5] {250,275,100,5,15}, + true), + book_2_alt = get_book(SecurityKey (leg_2.security().id()), + 5, + new double[5] {20.050,20.035,20.030,20.035,20.030}, + new uint16_t[5] {10, 10, 20, 250, 75}, + new double[5] {20.055, 20.060, 20.065, 20.070, 20.085}, + new uint16_t[5] {25,275,100,5,15}, + true), + book_3 = get_book(SecurityKey (leg_3.security().id()), + 5, + new double[5] {19.985,19.980,19.975,19.970,19.965}, + new uint16_t[5] {75,250,125,100,300}, + new double[5] {19.990,19.995,20.000,20.005,20.010}, + new uint16_t[5] {100,150,250,25,125}, + true), + book_3_alt = get_book(SecurityKey (leg_3.security().id()), + 5, + new double[5] {19.885,19.875,19.870,19.765,19.760}, + new uint16_t[5] {75,25,125,100,300}, + new double[5] {19.890,19.895,19.900,19.910,19.915}, + new uint16_t[5] {100,50,50,125,125}, + true); + spreader.test_only_on_book_update (BookUpdateEvent(book_1, + trace::CorID())); + spreader.test_only_on_book_update (BookUpdateEvent(book_2, + trace::CorID())); + spreader.test_only_on_book_update (BookUpdateEvent(book_3, + trace::CorID())); + verify_complete_quoter_state (qleg_data_4.quoter(), + QuoterState::WAITING_FOR_FIRST_ACK, + false, + spreader_price, + spreader_quantity, + Quantity (0), + Quantity(0), + Price(20.045), + spreader_quantity, + spreader_quantity, + false); + spreader.test_only_on_child_order_update (qleg_data_4.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (0), + Price (0)); + verify_complete_quoter_state (qleg_data_4.quoter(), + QuoterState::WORKING, + false, + spreader_price, + spreader_quantity, + Quantity (0), + Quantity(0), + Price(20.045), + spreader_quantity, + spreader_quantity, + false); + // SECTION ("book updates"){ + // uint32_t n_runs=10,n_iters = 100; + // //alternate bw the book n_runs times + // for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; + // auto n_requotes=n_iters;//qleg_data_4.order_update_message().n_modifications(); + // LOG(OrderMan, Info, "4 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); + // std::cout << "4 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; + // } + // } + // SECTION ("hedges"){ + // // send hedges + // uint32_t n_hedges=20; + // bts::TimeStamp t0=bts::Timer::now(); + // for (uint32_t i=1; i<=n_hedges; i++) + // spreader.test_only_on_child_order_update (qleg_data_4.order_key(), + // api::orderman::OrderStatus::ORDER_STATUS_WORKING, + // Quantity (i), + // Price (21.045)); + // bts::TimeStamp t1=bts::Timer::now(); + // const auto& leg_data=bookkeeping_data.get_leg_data(0); + // REQUIRE(leg_data.n_hedgers()==n_hedges); + // double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; + // LOG(OrderMan, Info, "n leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); + // std::cout << "4 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; + // } + SECTION ("N_requotes_1_hedge_M_times"){ + // N book updates followed by M fills + // (does the hedge time stays the same as + // in a tight loop in the "hedges" test ?) + uint32_t n_runs=5, + n_book_updates=200, + n_hedges = 5; + // since its the same quoting order we are filling + // and the code downstream expects accumulated filled qty + uint32_t total_filled_qty = 0, hi = 0; + for (uint32_t i=0; i hedge_perfs; + hedge_perfs.reserve(n_hedges); + auto t0=utils::TimeStamp::now(); + for (uint32_t b=0; b(1999.0), + bts::spark::LegSpreaderParams::DIRECT, + bts::spark::LegSpreaderParams::BOOK, + out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// 0.01, -// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, -// new uint16_t[5] {10, 1, 15, 14, 20}, -// true); -// } -// SECTION ("direct, book_holes"){ -// SecurityKey key(12345); -// Book in_book (key); -// fill_book(in_book, -// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, -// new uint16_t[5] {0, 1, 0, 14, 20}, //directs -// new uint16_t[5] {1, 12, 0, 0, 0}, //implieds -// api::Side::SIDE_BUY, -// true); -// Book out_book(key); -// SpreaderUtils::copy_book(in_book, -// md::IntPrice_from_double<7>(1999.0), -// bts::spark::LegSpreaderParams::DIRECT, -// bts::spark::LegSpreaderParams::BOOK, -// out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + 0.01, + new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, + new uint16_t[5] {10, 1, 15, 14, 20}, + true); + } + SECTION ("direct, book_holes"){ + SecurityKey key(12345); + Book in_book (key); + fill_book(in_book, + new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, + new uint16_t[5] {0, 1, 0, 14, 20}, //directs + new uint16_t[5] {1, 12, 0, 0, 0}, //implieds + api::Side::SIDE_BUY, + true); + Book out_book(key); + SpreaderUtils::copy_book(in_book, + md::IntPrice_from_double<7>(1999.0), + bts::spark::LegSpreaderParams::DIRECT, + bts::spark::LegSpreaderParams::BOOK, + out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// 0.01, -// new double[5] {2000.01, 2000.04, 2000.10, os::nan(), os::nan()}, -// new uint16_t[5] {1, 14, 20, 0, 0}, -// true); -// } -// SECTION ("direct, net_change"){ -// SecurityKey key(13579); -// Book in_book (key); -// fill_book(in_book, -// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, -// new uint16_t[5] {10, 1, 15, 14, 20}, -// new uint16_t[5] {1, 12, 0, 0, 0}, -// api::Side::SIDE_BUY, -// true); -// Book out_book(key); -// SpreaderUtils::copy_book(in_book, -// md::IntPrice_from_double<7>(1999.0), -// bts::spark::LegSpreaderParams::DIRECT, -// bts::spark::LegSpreaderParams::NET_CHANGE, -// out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + 0.01, + new double[5] {2000.01, 2000.04, 2000.10, os::nan(), os::nan()}, + new uint16_t[5] {1, 14, 20, 0, 0}, + true); + } + SECTION ("direct, net_change"){ + SecurityKey key(13579); + Book in_book (key); + fill_book(in_book, + new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, + new uint16_t[5] {10, 1, 15, 14, 20}, + new uint16_t[5] {1, 12, 0, 0, 0}, + api::Side::SIDE_BUY, + true); + Book out_book(key); + SpreaderUtils::copy_book(in_book, + md::IntPrice_from_double<7>(1999.0), + bts::spark::LegSpreaderParams::DIRECT, + bts::spark::LegSpreaderParams::NET_CHANGE, + out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// 0.01, -// new double[5] {1, 1.01, 1.03, 1.04, 1.1}, -// new uint16_t[5] {10, 1, 15, 14, 20}, -// true); -// } -// SECTION ("direct, net_change_nan"){ -// SecurityKey key(13579); -// Book in_book (key); -// fill_book(in_book, -// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, -// new uint16_t[5] {10, 1, 15, 14, 20}, -// new uint16_t[5] {1, 12, 0, 0, 0}, -// api::Side::SIDE_BUY, -// true); -// Book out_book(key); -// SpreaderUtils::copy_book(in_book, -// md::INT_NAN, -// bts::spark::LegSpreaderParams::DIRECT, -// bts::spark::LegSpreaderParams::NET_CHANGE, -// out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + 0.01, + new double[5] {1, 1.01, 1.03, 1.04, 1.1}, + new uint16_t[5] {10, 1, 15, 14, 20}, + true); + } + SECTION ("direct, net_change_nan"){ + SecurityKey key(13579); + Book in_book (key); + fill_book(in_book, + new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, + new uint16_t[5] {10, 1, 15, 14, 20}, + new uint16_t[5] {1, 12, 0, 0, 0}, + api::Side::SIDE_BUY, + true); + Book out_book(key); + SpreaderUtils::copy_book(in_book, + md::INT_NAN, + bts::spark::LegSpreaderParams::DIRECT, + bts::spark::LegSpreaderParams::NET_CHANGE, + out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// 0.01, -// new double[5] {os::nan(), os::nan(), os::nan(), os::nan(), os::nan()}, -// new uint16_t[5] {0, 0, 0, 0, 0}, -// true); -// } -// SECTION ("merged, book"){ -// SecurityKey key(24680); -// Book in_book (key); -// fill_book(in_book, -// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, -// new uint16_t[5] {10, 1, 15, 14, 20}, -// new uint16_t[5] {1, 12, 0, 0, 0}, -// api::Side::SIDE_BUY, -// true); -// Book out_book(key); -// SpreaderUtils::copy_book(in_book, -// md::IntPrice_from_double<7>(1999.0), -// bts::spark::LegSpreaderParams::MERGED, -// bts::spark::LegSpreaderParams::BOOK, -// out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + 0.01, + new double[5] {os::nan(), os::nan(), os::nan(), os::nan(), os::nan()}, + new uint16_t[5] {0, 0, 0, 0, 0}, + true); + } + SECTION ("merged, book"){ + SecurityKey key(24680); + Book in_book (key); + fill_book(in_book, + new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, + new uint16_t[5] {10, 1, 15, 14, 20}, + new uint16_t[5] {1, 12, 0, 0, 0}, + api::Side::SIDE_BUY, + true); + Book out_book(key); + SpreaderUtils::copy_book(in_book, + md::IntPrice_from_double<7>(1999.0), + bts::spark::LegSpreaderParams::MERGED, + bts::spark::LegSpreaderParams::BOOK, + out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// 0.01, -// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, -// new uint16_t[5] {11, 13, 15, 14, 20}, -// true); -// } -// SECTION ("merged, net_change"){ -// SecurityKey key(54321); -// Book in_book (key); -// fill_book(in_book, -// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, -// new uint16_t[5] {10, 1, 15, 14, 20}, -// new uint16_t[5] {1, 12, 0, 0, 0}, -// api::Side::SIDE_BUY, -// true); -// Book out_book(key); -// SpreaderUtils::copy_book(in_book, -// md::IntPrice_from_double<7>(1999.0), -// bts::spark::LegSpreaderParams::MERGED, -// bts::spark::LegSpreaderParams::NET_CHANGE, -// out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + 0.01, + new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, + new uint16_t[5] {11, 13, 15, 14, 20}, + true); + } + SECTION ("merged, net_change"){ + SecurityKey key(54321); + Book in_book (key); + fill_book(in_book, + new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, + new uint16_t[5] {10, 1, 15, 14, 20}, + new uint16_t[5] {1, 12, 0, 0, 0}, + api::Side::SIDE_BUY, + true); + Book out_book(key); + SpreaderUtils::copy_book(in_book, + md::IntPrice_from_double<7>(1999.0), + bts::spark::LegSpreaderParams::MERGED, + bts::spark::LegSpreaderParams::NET_CHANGE, + out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// 0.01, -// new double[5] {1, 1.01, 1.03, 1.04, 1.1}, -// new uint16_t[5] {11, 13, 15, 14, 20}, -// true); -// } -// } -// TEST_CASE ("random book addition", "[spreader]"){ -// size_t n_runs=100; -// // generates random prices, with tick size=0.01 -// size_t n_levels=5; -// double* bid_prices=new double[n_levels], -// *ask_prices=new double[n_levels]; -// uint16_t* direct_bid_sizes=new uint16_t[n_levels], -// *implied_bid_sizes=new uint16_t[n_levels], -// *direct_ask_sizes=new uint16_t[n_levels], -// *implied_ask_sizes=new uint16_t[n_levels]; -// double* exp_bid_prices=new double[n_levels], -// *exp_ask_prices=new double[n_levels]; -// uint16_t* exp_bid_sizes=new uint16_t[n_levels], -// *exp_ask_sizes=new uint16_t[n_levels]; -// for(size_t i=0;i(settlement_price), -// bts::spark::LegSpreaderParams::DIRECT, -// bts::spark::LegSpreaderParams::BOOK, -// out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// tick_size, -// bid_prices, -// direct_bid_sizes, -// false); -// validate_book(out_book, -// key, -// api::Side::SIDE_SELL, -// tick_size, -// ask_prices, -// direct_ask_sizes, -// false); -// } -// // "direct, net_change" -// { -// for(size_t i=0;i(settlement_price), -// bts::spark::LegSpreaderParams::DIRECT, -// bts::spark::LegSpreaderParams::NET_CHANGE, -// out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// tick_size, -// exp_bid_prices, -// direct_bid_sizes, -// false); -// validate_book(out_book, -// key, -// api::Side::SIDE_SELL, -// tick_size, -// exp_ask_prices, -// direct_ask_sizes, -// false); -// } -// // merged, book -// { -// for(size_t i=0;i(settlement_price), -// bts::spark::LegSpreaderParams::MERGED, -// bts::spark::LegSpreaderParams::BOOK, -// out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// tick_size, -// bid_prices, -// exp_bid_sizes, -// false); -// validate_book(out_book, -// key, -// api::Side::SIDE_SELL, -// tick_size, -// ask_prices, -// exp_ask_sizes, -// false); -// } -// // merged, net change -// { -// for(size_t i=0;i(settlement_price), -// bts::spark::LegSpreaderParams::MERGED, -// bts::spark::LegSpreaderParams::NET_CHANGE, -// out_book); -// validate_book(out_book, -// key, -// api::Side::SIDE_BUY, -// tick_size, -// exp_bid_prices, -// exp_bid_sizes, -// false); -// validate_book(out_book, -// key, -// api::Side::SIDE_SELL, -// tick_size, -// exp_ask_prices, -// exp_ask_sizes, -// false); -// } -// } -// } + validate_book(out_book, + key, + api::Side::SIDE_BUY, + 0.01, + new double[5] {1, 1.01, 1.03, 1.04, 1.1}, + new uint16_t[5] {11, 13, 15, 14, 20}, + true); + } +} +TEST_CASE ("random book addition", "[spreader]"){ + size_t n_runs=100; + // generates random prices, with tick size=0.01 + size_t n_levels=5; + double* bid_prices=new double[n_levels], + *ask_prices=new double[n_levels]; + uint16_t* direct_bid_sizes=new uint16_t[n_levels], + *implied_bid_sizes=new uint16_t[n_levels], + *direct_ask_sizes=new uint16_t[n_levels], + *implied_ask_sizes=new uint16_t[n_levels]; + double* exp_bid_prices=new double[n_levels], + *exp_ask_prices=new double[n_levels]; + uint16_t* exp_bid_sizes=new uint16_t[n_levels], + *exp_ask_sizes=new uint16_t[n_levels]; + for(size_t i=0;i(settlement_price), + bts::spark::LegSpreaderParams::DIRECT, + bts::spark::LegSpreaderParams::BOOK, + out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + tick_size, + bid_prices, + direct_bid_sizes, + false); + validate_book(out_book, + key, + api::Side::SIDE_SELL, + tick_size, + ask_prices, + direct_ask_sizes, + false); + } + // "direct, net_change" + { + for(size_t i=0;i(settlement_price), + bts::spark::LegSpreaderParams::DIRECT, + bts::spark::LegSpreaderParams::NET_CHANGE, + out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + tick_size, + exp_bid_prices, + direct_bid_sizes, + false); + validate_book(out_book, + key, + api::Side::SIDE_SELL, + tick_size, + exp_ask_prices, + direct_ask_sizes, + false); + } + // merged, book + { + for(size_t i=0;i(settlement_price), + bts::spark::LegSpreaderParams::MERGED, + bts::spark::LegSpreaderParams::BOOK, + out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + tick_size, + bid_prices, + exp_bid_sizes, + false); + validate_book(out_book, + key, + api::Side::SIDE_SELL, + tick_size, + ask_prices, + exp_ask_sizes, + false); + } + // merged, net change + { + for(size_t i=0;i(settlement_price), + bts::spark::LegSpreaderParams::MERGED, + bts::spark::LegSpreaderParams::NET_CHANGE, + out_book); + validate_book(out_book, + key, + api::Side::SIDE_BUY, + tick_size, + exp_bid_prices, + exp_bid_sizes, + false); + validate_book(out_book, + key, + api::Side::SIDE_SELL, + tick_size, + exp_ask_prices, + exp_ask_sizes, + false); + } + } +} class RV { public: @@ -3370,4 +3370,4 @@ TEST_CASE ("scratch_pad_2", "[spreader]"){ } -}} +}} \ No newline at end of file From 6a1a2d5f0a6ac4dae42136351f6b056b42f31837 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 18 Dec 2018 07:12:33 -0500 Subject: [PATCH 009/103] organizing around HegderManager 1 --- .../orders/spreader_orders/SpreaderOrder.cpp | 38 ++-- .../spreader/SpreaderLegData.h | 70 +++--- .../spreader/hedger/HedgerManager.h | 2 +- .../SpreaderWorkingStateWorker.cpp | 6 +- .../spreader_orders/tests/spreader_tests.cpp | 204 +++++++++--------- 5 files changed, 166 insertions(+), 154 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index d967d5d30..42d5e46a0 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -270,14 +270,12 @@ void SpreaderOrder::_cancel_orders(bool cancel_quotes, bool cancel_hedges){ if (leg_data.leg_property_data().is_active_quoting()) leg_data.quoter().cancel_order(); } - if (cancel_hedges) - for (size_t h_idx = 0; h_idx < leg_data.n_hedgers(); h_idx++){ - SingleFillHedger& hedger = leg_data.get_hedger(h_idx); - if (_cancel_hedges_on_cancel) - hedger.cancel_hedge(); - else - hedger.terminate(); - } + if (cancel_hedges){ + if(_cancel_hedges_on_cancel) + leg_data.hedger_manager().cancel_hedges(); + else + leg_data.hedger_manager().terminate_hedges(); + } } } bool SpreaderOrder::_all_quoter_orders_in_terminal_state(){ @@ -292,11 +290,8 @@ bool SpreaderOrder::_all_quoter_orders_in_terminal_state(){ bool SpreaderOrder::_all_hedger_orders_in_terminal_state(){ for (size_t q_idx = 0; q_idx < _bookkeeping_data().n_legs(); q_idx++){ SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(q_idx); - for (size_t h_idx = 0; h_idx < leg_data.n_hedgers(); h_idx++){ - SingleFillHedger& hedger = leg_data.get_hedger(h_idx); - if (hedger.is_active_order()) - return false; - } + if (leg_data.hedger_manager().n_active_hedgers() > 0) + return false; } return true; } @@ -318,10 +313,7 @@ void SpreaderOrder::_terminate_quoters (){ void SpreaderOrder::_terminate_hedgers (){ for (size_t q_idx = 0; q_idx < _bookkeeping_data().n_legs(); q_idx++){ SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(q_idx); - for (size_t h_idx = 0; h_idx < leg_data.n_hedgers(); h_idx++){ - SingleFillHedger& hedger = leg_data.get_hedger(h_idx); - hedger.terminate (); - } + leg_data.hedger_manager().terminate_hedges(); } } bool SpreaderOrder::_quoters_can_accept_modification (){ @@ -339,12 +331,12 @@ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, const trace::CorID trace){ // auto scoped_log = // _order_services->order_services().log_scope(trace,"SpreaderOrder::_send_hedge"); - /*SingleFillHedger& hedger = */_bookkeeping_data().add_new_hedger (*this, - hedge_leg_index, - hedge_price, - hedge_qty, - _order_services, - trace); + _bookkeeping_data().add_new_hedger (*this, + hedge_leg_index, + hedge_price, + hedge_qty, + _order_services, + trace); //_order_services->order_services().log(trace,"SpreaderOrder::_send_hedge:2"); //hedger.init (); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 8cbe0ac38..53b70ef98 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -58,34 +58,51 @@ public: SpreaderLegData& operator=(SpreaderLegData&&) = delete; // accessors //////////////////// ///////////////////////////////// - const LegPropertyData& leg_property_data() const {return _leg_property_data;} - SingleLegQuoter& quoter() {return _quoter;} - const SingleLegQuoter& quoter() const {return _quoter;} - const bts::orderman::Book& book () const {return _book;} - Price settlement_price() const {return Price(_settlement_price.price());} - bool settlement_populated() const {return !os::is_nan(_settlement_price.price());} - SpreaderChildOrderState& order_update_message () {return _quoter_child_order_state;} - bts::orderman::OrderKey key() {return _quoter_child_order_state.order_key();} - bts::orderman::OrderKey order_key() {return _quoter_child_order_state.order_key();} - SpreaderOrderBuilder& quoter_order_builder() {return _quoter_order_builder;} - SpreaderOrderBuilder& hedger_order_builder() {return _hedger_order_builder;} - UnhedgedDelta& unhedged_delta() {return _unhedged_delta;} - // returns the number of active hedgers - size_t n_hedgers() const { return _hedger_data_vector.size(); } + const LegPropertyData& leg_property_data() const { + return _leg_property_data; + } + SingleLegQuoter& quoter() { + return _quoter; + } + const SingleLegQuoter& quoter() const { + return _quoter; + } + const bts::orderman::Book& book () const { + return _book; + } + Price settlement_price() const { + return Price(_settlement_price.price()); + } + bool settlement_populated() const { + return !os::is_nan(_settlement_price.price()); + } + SpreaderChildOrderState& order_update_message () { + return _quoter_child_order_state; + } + bts::orderman::OrderKey key() { + return _quoter_child_order_state.order_key(); + } + bts::orderman::OrderKey order_key() { + return _quoter_child_order_state.order_key(); + } + SpreaderOrderBuilder& quoter_order_builder() { + return _quoter_order_builder; + } + SpreaderOrderBuilder& hedger_order_builder() { + return _hedger_order_builder; + } + UnhedgedDelta& unhedged_delta() { + return _unhedged_delta; + } size_t n_active_hedgers() const { return _hedger_manager.n_active_hedgers(); } - // returns the hedger at a given index - SingleFillHedger& get_hedger(size_t index) { - bts_assert(index<_hedger_data_vector.size()); - return _hedger_data_vector[index]; - } + HedgerManager& hedger_manager(){ + return _hedger_manager; + } // returns a hedger from its order_key - SingleFillHedger* find_hedger_from_orderkey(bts::orderman::OrderKey order_key){ - for (SingleFillHedger& hedger : _hedger_data_vector) - if (hedger.order_state().order_key() == order_key) - return &hedger; - return nullptr; + SingleFillHedger* find_hedger_from_orderkey(OrderKey order_key){ + return _hedger_manager.find_hedger_from_orderkey(order_key); } // computes the total fills and the average price of // the fills - across the quoter and all the hedgers @@ -126,5 +143,10 @@ public: _book); } + // returns the hedger at a given index + SingleFillHedger& get_hedger_test_only(size_t index) { + bts_assert(index<_hedger_data_vector.size()); + return _hedger_data_vector[index]; + } }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index cf0c5ae84..2835b4653 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -32,7 +32,7 @@ public: for (SingleFillHedger& hedger : _hedgers) hedger.on_book(book, cid); } - void udpate_time(const bts::TimeStamp& ts){ + void update_time(const bts::TimeStamp& ts){ for (SingleFillHedger& hedger : _hedgers) hedger.on_time(ts); } 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 6ce905520..4f7c31b76 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -56,8 +56,7 @@ void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){ d.quoter().on_book(md_leg.leg_property_data().leg_index(), book,trace); } //send md to hedgers hedging this security only - for (size_t h_idx = 0; h_idx < md_leg.n_hedgers(); h_idx++) - md_leg.get_hedger(h_idx).on_book(book,trace); + md_leg.hedger_manager().update_book(book,trace); } void SpreaderWorkingStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -67,8 +66,7 @@ void SpreaderWorkingStateWorker::on_time(const TimeStamp& ts){ SpreaderLegData& leg_data = bookkeeping_data.get_leg_data(q_idx); if (leg_data.leg_property_data().is_active_quoting()) leg_data.quoter().on_time(ts); - for (size_t h_idx = 0; h_idx < leg_data.n_hedgers(); h_idx++) - leg_data.get_hedger(h_idx).on_time (ts); + leg_data.hedger_manager().update_time(ts); } } void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data){ 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 5f438af2c..df2afeddd 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1824,21 +1824,21 @@ TEST_CASE ("spreader_WORKING", "[spreader]") 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); // verify the hedgers // leg 1 should have 3 hedgers, for each of the 3 fills - for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) - if(leg_data_1.get_hedger(i).is_active_order()) - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) - if(leg_data_2.get_hedger(i).is_active_order()) - spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + for (size_t i = 0; i < leg_data_1.n_active_hedgers(); i++) + //if(leg_data_1.get_hedger_test_only(i).is_active_order()) + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + for (size_t i = 0; i < leg_data_2.n_active_hedgers(); i++) + //if(leg_data_2.get_hedger_test_only(i).is_active_order()) + spreader.test_only_on_child_order_update (leg_data_2.get_hedger_test_only(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); REQUIRE (leg_data_1.n_active_hedgers () == 3); REQUIRE (leg_data_2.n_active_hedgers () == 2); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); - verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); auto generic_validate_quoters = [&](QuoterState quoter_state, bool quoter_cancelled_by_spreader) -> void { @@ -1849,11 +1849,11 @@ TEST_CASE ("spreader_WORKING", "[spreader]") { REQUIRE (leg_data_1.n_active_hedgers () == 3); REQUIRE (leg_data_2.n_active_hedgers () == 2); - verify_complete_hedger_state (leg_data_1.get_hedger(0), hedger_state, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), hedger_state, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), hedger_state, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), hedger_state, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), hedger_state, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(0), hedger_state, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(1), hedger_state, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(2), hedger_state, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(0), hedger_state, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(1), hedger_state, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); }; SECTION("1. init") { @@ -1984,19 +1984,19 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // add one more hedge spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (65), Price (2001)); for (size_t i = 0; i < leg_data_1.n_active_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); for (size_t i = 0; i < leg_data_2.n_active_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger_test_only(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); REQUIRE (leg_data_1.n_active_hedgers () == 4); REQUIRE (leg_data_2.n_active_hedgers () == 2); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(65), Price(2003), Quantity(35), Quantity(5), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (65), Quantity(30), Price(1999), Quantity(70), Quantity(5), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (3), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); } SECTION("10. on_quoter_order_status_update") @@ -2005,46 +2005,46 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // it completely spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); for (size_t i = 0; i < leg_data_1.n_active_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); for (size_t i = 0; i < leg_data_2.n_active_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger_test_only(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); REQUIRE (leg_data_1.n_active_hedgers () == 4); REQUIRE (leg_data_2.n_active_hedgers () == 2); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); - verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_1.get_hedger(3), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(3), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); } SECTION("11. on_hedger_order_error") { - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (0), Price (0)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (0), Price (0)); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); - REQUIRE(leg_data_1.get_hedger(0).test_only_func_hedger_state() == HedgerState::END); - REQUIRE(leg_data_1.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); - REQUIRE(leg_data_1.get_hedger(2).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); - REQUIRE(leg_data_2.get_hedger(0).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); - REQUIRE(leg_data_2.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); + REQUIRE(leg_data_1.get_hedger_test_only(0).test_only_func_hedger_state() == HedgerState::END); + REQUIRE(leg_data_1.get_hedger_test_only(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); + REQUIRE(leg_data_1.get_hedger_test_only(2).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); + REQUIRE(leg_data_2.get_hedger_test_only(0).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); + REQUIRE(leg_data_2.get_hedger_test_only(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_error"); } SECTION("12. on_hedger_order_update") { // send as fill for the hedger - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2002)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2002)); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WORKING, false); REQUIRE (leg_data_1.n_active_hedgers () == 3); REQUIRE (leg_data_2.n_active_hedgers () == 2); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_update"); } SECTION("14. on_check_termination") @@ -2060,12 +2060,12 @@ TEST_CASE ("spreader_WORKING", "[spreader]") REQUIRE (leg_data_2.n_active_hedgers () == 2); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WAITING_FOR_FIRST_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15));//new hedger - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (3), HedgerState::WAITING_FOR_FIRST_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15));//new hedger + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); // now bring the quoter and hedgers to their end states // when all of them are at the end state, the spreader @@ -2074,17 +2074,17 @@ TEST_CASE ("spreader_WORKING", "[spreader]") verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(70), Price(0), Quantity(0), Quantity(0), true); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); // // all the quoters are done now - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (30), Price (2002)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (30), Price (2002)); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (2002)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (2002)); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (3).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only (3).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (1999)); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger_test_only (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (1999)); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (1999)); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger_test_only (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (1999)); verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); } @@ -2156,18 +2156,18 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // verify the hedgers // leg 1 should have 3 hedgers, for each of the 3 fills for (size_t i = 0; i < leg_data_1.n_active_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); for (size_t i = 0; i < leg_data_2.n_active_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger_test_only(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); REQUIRE (leg_data_1.n_active_hedgers () == 3); REQUIRE (leg_data_2.n_active_hedgers () == 2); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), 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); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.initializing"); // now cancel the spreader @@ -2181,11 +2181,11 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") REQUIRE (leg_data_2.n_active_hedgers () == 2); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); }; validate_state (); SECTION("1. init") @@ -2230,11 +2230,11 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // REQUIRE (time_since_cxl >= spreader.test_cancel_timeout()); // verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); // verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - // verify_complete_hedger_state (leg_data_1.get_hedger (0).hedger(), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - // verify_complete_hedger_state (leg_data_1.get_hedger (1).hedger(), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - // verify_complete_hedger_state (leg_data_1.get_hedger (2).hedger(), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - // verify_complete_hedger_state (leg_data_2.get_hedger (0).hedger(), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - // verify_complete_hedger_state (leg_data_2.get_hedger (1).hedger(), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + // verify_complete_hedger_state (leg_data_1.get_hedger_test_only (0).hedger(), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + // verify_complete_hedger_state (leg_data_1.get_hedger_test_only (1).hedger(), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + // verify_complete_hedger_state (leg_data_1.get_hedger_test_only (2).hedger(), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + // verify_complete_hedger_state (leg_data_2.get_hedger_test_only (0).hedger(), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + // verify_complete_hedger_state (leg_data_2.get_hedger_test_only (1).hedger(), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); // LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_time"); // } SECTION("8. on_quoter_order_error") @@ -2253,11 +2253,11 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") REQUIRE (leg_data_2.n_active_hedgers () == 2); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (40), Quantity(55), Price(2003), Quantity(45), Quantity(5), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_fill"); } SECTION("10. on_quoter_order_status_update") @@ -2269,31 +2269,31 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") REQUIRE (leg_data_2.n_active_hedgers () == 2); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_status_update"); } SECTION("11. on_hedger_order_error") { std::string err_msg = "error"; - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (0), Price (0)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (0), Price (0)); validate_state (); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_error"); } SECTION("12. on_hedger_order_update") { // send a fill - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_update"); } SECTION("14. on_check_termination") @@ -2305,17 +2305,17 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") spreader.test_only_on_child_order_update (leg_data_2.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (55), Price (2000)); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(15), false); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(0), Quantity (0), Quantity (15)); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(0), Quantity (0), Quantity (30)); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); - spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(0), Quantity (0), Quantity (20)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(0), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(0), Quantity (0), Quantity (15)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(1), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(0), Quantity (0), Quantity (30)); + spreader.test_only_on_child_order_update (leg_data_1.get_hedger_test_only (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_1.get_hedger_test_only(2), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger_test_only (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(0), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(0), Quantity (0), Quantity (20)); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); + spreader.test_only_on_child_order_update (leg_data_2.get_hedger_test_only (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); + verify_complete_hedger_state (leg_data_2.get_hedger_test_only(1), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_check_termination"); } @@ -2796,7 +2796,7 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") Price (2001)); bts::TimeStamp t1=bts::Timer::now(); const auto& leg_data=bookkeeping_data.get_leg_data(0); - REQUIRE(leg_data.n_hedgers()==n_hedges); + REQUIRE(leg_data.n_active_hedgers()==n_hedges); double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; LOG(OrderMan, Info, "2 leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); std::cout << "2 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; @@ -2985,7 +2985,7 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") // Price (21.045)); // bts::TimeStamp t1=bts::Timer::now(); // const auto& leg_data=bookkeeping_data.get_leg_data(0); - // REQUIRE(leg_data.n_hedgers()==n_hedges); + // REQUIRE(leg_data.n_active_hedgers()==n_hedges); // double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; // LOG(OrderMan, Info, "n leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); // std::cout << "4 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; From 2305c3af32625af69c05db29eea16cb71979bed5 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 18 Dec 2018 15:42:39 -0500 Subject: [PATCH 010/103] removed the vector access ot hedger --- .../spreader_orders/spreader/LegFillState.cpp | 28 +++++++++++++++++++ .../spreader_orders/spreader/LegFillState.h | 24 ++++++++++++++++ .../spreader/SpreaderBookkeepingData.cpp | 1 - .../spreader/SpreaderLegData.cpp | 3 -- .../spreader/SpreaderLegData.h | 27 +++++++----------- .../spreader/hedger/HedgerManager.cpp | 22 +++++++++++++++ .../spreader/hedger/HedgerManager.h | 13 ++++++++- 7 files changed, 96 insertions(+), 22 deletions(-) create mode 100644 src/lib/orderman/orders/spreader_orders/spreader/LegFillState.cpp create mode 100644 src/lib/orderman/orders/spreader_orders/spreader/LegFillState.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.cpp b/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.cpp new file mode 100644 index 000000000..9a7fd5c08 --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.cpp @@ -0,0 +1,28 @@ +#include "LegFillState.h" +#include "SpreaderUtils.h" + +namespace bts{ +namespace orderman { + +LegFillState::LegFillState() +: +_price(0), +_qty(0){ +} + +void LegFillState::add_fill(Price fill_price, + Quantity fill_qty, + bool){ + Price out_price; + Quantity out_qty; + SpreaderUtils::compute_average_price(_price, + _qty, + fill_price, + fill_qty, + out_price, + out_qty); + _price=out_price; + _qty=out_qty; +} + +}} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.h b/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.h new file mode 100644 index 000000000..a69cf4e6a --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.h @@ -0,0 +1,24 @@ +#pragma once +#include "lib/orderman/orderman_utils/orderman_common.h" + +namespace bts{ +namespace orderman { + +class LegFillState{ +private: + Price _price; + Quantity _qty; +public: + LegFillState (); + Price price() const{ + return _price; + } + Quantity quantity() const{ + return _qty; + } + void add_fill (Price fill_price, + Quantity fill_qty, + bool is_quoting_fill); +}; + +}} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 1cc1f064f..33d3f54dc 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -40,7 +40,6 @@ _reported_state(){ _quoters.back(), _quoter_order_builders.back(), _hedger_order_builders.back(), - _h_managers.back().hedgers(), _h_managers.back(), _quoter_child_order_states.back(), _books.back(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp index 6cab43811..872409ba6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp @@ -7,7 +7,6 @@ SpreaderLegData::SpreaderLegData (const LegPropertyData& leg_property_data, SingleLegQuoter& quoter, SpreaderOrderBuilder& quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, - std::vector& hedger_data_vector, HedgerManager& hedger_manager, SpreaderChildOrderState& quoter_child_order_state, Book& book, @@ -18,7 +17,6 @@ _quoter(quoter), _quoter_order_builder (quoter_order_builder), _hedger_order_builder (hedger_order_builder), _quoter_child_order_state (quoter_child_order_state), -_hedger_data_vector (hedger_data_vector), _hedger_manager(hedger_manager), _book(book), _unhedged_delta(unhedged_delta), @@ -32,7 +30,6 @@ _quoter (other._quoter), _quoter_order_builder(other._quoter_order_builder), _hedger_order_builder(other._hedger_order_builder), _quoter_child_order_state (other._quoter_child_order_state), -_hedger_data_vector (other._hedger_data_vector), _hedger_manager(other._hedger_manager), _book(other._book), _unhedged_delta(other._unhedged_delta){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 53b70ef98..243c59c61 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -30,7 +30,6 @@ private: SpreaderOrderBuilder& _quoter_order_builder; SpreaderOrderBuilder& _hedger_order_builder; SpreaderChildOrderState& _quoter_child_order_state; - std::vector& _hedger_data_vector; HedgerManager& _hedger_manager; Book& _book; UnhedgedDelta& _unhedged_delta; @@ -40,7 +39,6 @@ public: SingleLegQuoter& quoter, SpreaderOrderBuilder& quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, - std::vector& hedger_data_vector, HedgerManager& hedger_manager, SpreaderChildOrderState& quoter_child_order_state, Book& book, @@ -108,21 +106,17 @@ public: // the fills - across the quoter and all the hedgers void total_fills (Quantity& out_quantity, Price& out_price) const{ - _quoter_child_order_state.total_fills(out_quantity, out_price); - double sum = out_quantity.value() * out_price.value(); - for (SingleFillHedger& hedger : _hedger_data_vector){ - Quantity hedger_quantity; Price hedger_price; - hedger.order_state().total_fills(hedger_quantity, hedger_price); - sum += hedger_quantity.value() * hedger_price.value(); - out_quantity = Quantity(out_quantity.value() + hedger_quantity.value()); - } - out_price = out_quantity.value() == 0 ? Price(0) : Price(sum / out_quantity.value()); + Price qp, hp; + Quantity qq, hq; + _quoter_child_order_state.total_fills(qq, qp); + _hedger_manager.total_fills(hq,hp); + SpreaderUtils::compute_average_price(qp,qq,hp,hq,out_price,out_quantity); } Quantity total_fills() const{ - uint32_t rv = _quoter_child_order_state.total_fills().value(); - for (SingleFillHedger& hedger : _hedger_data_vector) - rv += hedger.order_state().total_fills().value(); - return Quantity(rv); + Price out_p; + Quantity out_q; + total_fills (out_q, out_p); + return out_q; } // mutators //////////////////// //////////////////////////////// @@ -145,8 +139,7 @@ public: } // returns the hedger at a given index SingleFillHedger& get_hedger_test_only(size_t index) { - bts_assert(index<_hedger_data_vector.size()); - return _hedger_data_vector[index]; + return _hedger_manager.get_hedger_at(index); } }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp index 3f2a4e0aa..02df38647 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -18,6 +18,15 @@ _is_live(is_live) is_live); } +HedgerManager::HedgerManager(HedgerManager&& other) +: +_spreader_manager (other._spreader_manager), +_leg_property_data (other._leg_property_data), +_is_live(other._is_live), +_hedgers(other._hedgers){ + bts_assert (false); +} + SingleFillHedger& HedgerManager::get_hedger(){ for (auto& h : _hedgers) if(h.is_free()) @@ -30,5 +39,18 @@ SingleFillHedger& HedgerManager::get_hedger(){ _is_live); return _hedgers.back(); } +void HedgerManager::total_fills(Quantity& out_qty, + Price& out_price){ + double sum = 0.0; + uint32_t tot_qty; + for (SingleFillHedger& hedger : _hedgers){ + Quantity hq; Price hp; + hedger.order_state().total_fills(hq, hp); + sum += hq.value() * hp.value(); + tot_qty += hq.value(); + } + out_qty = Quantity(tot_qty); + out_price = tot_qty == 0 ? Price(0.0) : Price(sum / tot_qty); +} }} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index 2835b4653..875dbb0c7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -12,10 +12,15 @@ private: const trace::CorID _trace; bool _is_live; std::vector _hedgers; -public: +public: HedgerManager(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, bool is_live); + HedgerManager() = delete; + HedgerManager(const HedgerManager&) = delete; + HedgerManager(HedgerManager&& other); + HedgerManager& operator=(const HedgerManager&) = delete; + HedgerManager& operator=(HedgerManager&&) = delete; // gets the free hedger, if its not // creates one (which is slow) SingleFillHedger& get_hedger(); @@ -51,6 +56,12 @@ public: rv++; return rv; } + void total_fills(Quantity& out_qty, + Price& out_price); + SingleFillHedger& get_hedger_at(size_t index) { + bts_assert(index<_hedgers.size()); + return _hedgers[index]; + } }; }} \ No newline at end of file From b36715a6a06ce7d2c899e01cfcd1ab2b0856eb16 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 18 Dec 2018 15:57:53 -0500 Subject: [PATCH 011/103] fixing build --- .../spreader_orders/spreader/hedger/HedgerManager.cpp | 9 --------- .../spreader_orders/spreader/hedger/HedgerManager.h | 6 ------ 2 files changed, 15 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp index 02df38647..9c31ecfa3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -18,15 +18,6 @@ _is_live(is_live) is_live); } -HedgerManager::HedgerManager(HedgerManager&& other) -: -_spreader_manager (other._spreader_manager), -_leg_property_data (other._leg_property_data), -_is_live(other._is_live), -_hedgers(other._hedgers){ - bts_assert (false); -} - SingleFillHedger& HedgerManager::get_hedger(){ for (auto& h : _hedgers) if(h.is_free()) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index 875dbb0c7..0b781d8ff 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -17,12 +17,6 @@ public: const LegPropertyData& leg_property_data, bool is_live); HedgerManager() = delete; - HedgerManager(const HedgerManager&) = delete; - HedgerManager(HedgerManager&& other); - HedgerManager& operator=(const HedgerManager&) = delete; - HedgerManager& operator=(HedgerManager&&) = delete; - // gets the free hedger, if its not - // creates one (which is slow) SingleFillHedger& get_hedger(); std::vector& hedgers(){ return _hedgers; From 9002ca61837de88b34378d43468cef6e626d4d34 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 19 Dec 2018 09:20:54 -0500 Subject: [PATCH 012/103] some hedger interface cleanup, and tst code --- .../orders/spreader_orders/SpreaderOrder.cpp | 3 +- .../spreader/SingleFillHedger.h | 6 ++- .../spreader/SpreaderBookkeepingData.cpp | 3 +- .../spreader/SpreaderBookkeepingData.h | 5 +- .../spreader/hedger/HedgerManager.h | 14 ++++-- .../spreader_orders/tests/spreader_tests.cpp | 50 ++++++++++++++----- 6 files changed, 57 insertions(+), 24 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 42d5e46a0..06e29ea19 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -331,8 +331,7 @@ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, const trace::CorID trace){ // auto scoped_log = // _order_services->order_services().log_scope(trace,"SpreaderOrder::_send_hedge"); - _bookkeeping_data().add_new_hedger (*this, - hedge_leg_index, + _bookkeeping_data().add_new_hedger (hedge_leg_index, hedge_price, hedge_qty, _order_services, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index b7ba86c3c..8a1403f8f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -118,11 +118,13 @@ public: bool is_free() const{ return state()==HedgerState::START; } + SpreaderChildOrderState& order_state() { + return _child_order_state; + } public: HedgerState test_only_func_hedger_state() const { return _worker->state (); } const HedgePriceQuantityState& test_only_func_price_quantity_state () const { return _price_quantity_state; - } - SpreaderChildOrderState& order_state() {return _child_order_state;} + } }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 33d3f54dc..71feebd05 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -80,8 +80,7 @@ void SpreaderBookkeepingData::total_fills (Quantity& out_quantity, out_quantity = Quantity(fills); out_price = Price(avg_price); } -SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager&, - size_t leg_index, +SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, SpreaderOrderServices*, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 3272719bd..2544f08a7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -105,12 +105,11 @@ public: // and returns a ref to it // (dont keep pointers to hedgers since the vector // can resize) - SingleFillHedger& add_new_hedger(ISpreaderManager& spreader_manager, - size_t leg_index, + SingleFillHedger& add_new_hedger(size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, SpreaderOrderServices *services, - trace::CorID const &); + const trace::CorID&); // 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/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index 0b781d8ff..3d8e5d490 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -17,32 +17,38 @@ public: const LegPropertyData& leg_property_data, bool is_live); HedgerManager() = delete; + // finds a free hedger SingleFillHedger& get_hedger(); - std::vector& hedgers(){ - return _hedgers; - } + // finds a hedger that is working on + // an order with the specified key SingleFillHedger* find_hedger_from_orderkey(OrderKey order_key){ for (SingleFillHedger& hedger : _hedgers) if (hedger.order_state().order_key() == order_key) return &hedger; return nullptr; } + // udpates all the hedgers with the book update void update_book (const Book& book, trace::CorID& cid){ for (SingleFillHedger& hedger : _hedgers) hedger.on_book(book, cid); } + // udpates all the hedgers with the book update void update_time(const bts::TimeStamp& ts){ for (SingleFillHedger& hedger : _hedgers) hedger.on_time(ts); } + // cancels all the hedgers void cancel_hedges(){ for (SingleFillHedger& hedger : _hedgers) hedger.cancel_hedge(); } + // terminates all the hedgers void terminate_hedges(){ for (SingleFillHedger& hedger : _hedgers) hedger.terminate(); } + // returns the number of hedgers that + // have an active working order size_t n_active_hedgers() { size_t rv=0; for (SingleFillHedger& hedger : _hedgers) @@ -50,6 +56,8 @@ public: rv++; return rv; } + // computes the total fills and average + // fill price across all the hedgers void total_fills(Quantity& out_qty, Price& out_price); SingleFillHedger& get_hedger_at(size_t index) { 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 df2afeddd..6851f0d37 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1246,8 +1246,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") SpreaderManagerForTest& sm = *sm_ptr; ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, + SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, hedger_quantity, nullptr, @@ -1331,8 +1330,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") ChildOrder co; //SingleFillHedger hedger (sm, sm.get_leg_data (1), co, hedger_price, hedger_quantity,false); - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, + SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, hedger_quantity, nullptr, @@ -1395,8 +1393,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") SpreaderManagerForTest& sm = *sm_ptr; ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, + SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, hedger_quantity, nullptr, @@ -1475,8 +1472,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") SpreaderManagerForTest& sm = *sm_ptr; ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, + SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, hedger_quantity, nullptr, @@ -1558,8 +1554,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") SpreaderManagerForTest& sm = *sm_ptr; ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, + SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, hedger_quantity, nullptr, @@ -1622,8 +1617,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") SpreaderManagerForTest& sm = *sm_ptr; ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, + SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, hedger_quantity, nullptr, @@ -3347,6 +3341,29 @@ public: src.i=0; return *this; } + int foo (double d1, double d2){ + return static_cast(d1+d2); + } +}; +class TTemp{ +}; +class TInterface{ + virtual void foo() = 0; +}; +template +class TestContainer : public TInterface{ +private: + T _t; + std::array _at; +public: + void add (T &t){ + _at[0] = t; + } + T get() { + return _t; + } + void foo () override{ + } }; class RVUser{ public: @@ -3357,6 +3374,15 @@ public: } }; TEST_CASE ("scratch_pad", "[spreader]"){ + int (RV::*f_ptr)(double, double) = &RV::foo; + char* f_addr = (char*&)f_ptr; + TInterface* r = nullptr; + int n = gen_rand(0.0, 10.0); + if (n <= 5) + r = new TestContainer(); + else + r = new TestContainer(); + std::cout << r << std::endl; RV rv_1(100); RVUser rvuser_1(rv_1); REQUIRE(rv_1.i==0); From 950509e5d60c410f32cdb6d2b1a18d870f66fc52 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 19 Dec 2018 18:58:18 -0500 Subject: [PATCH 013/103] added new hedger behaviour (recycle) test --- .../orders/spreader_orders/SpreaderOrder.h | 6 +- .../spreader/hedger/HedgerManager.cpp | 2 +- .../spreader_orders/tests/spreader_tests.cpp | 304 +++++++++++++----- 3 files changed, 225 insertions(+), 87 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 4303a6c68..b32f7790a 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -261,7 +261,10 @@ public: 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_child_order_update (bts::orderman::OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, Price avg_price) + void test_only_on_child_order_update (OrderKey order_key, + bts::api::orderman::OrderStatus status, + Quantity total_filled_qty, + Price avg_price) { bts::api::orderman::OrderDefinition order_def; order_def.set_security_key(0); @@ -269,6 +272,7 @@ public: order_state.set_status(status); order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); + order_state.set_price(avg_price.value()); OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,trace::CorID()); _on_child_order_update (ord_ev); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp index 9c31ecfa3..03b99f1d8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -33,7 +33,7 @@ SingleFillHedger& HedgerManager::get_hedger(){ void HedgerManager::total_fills(Quantity& out_qty, Price& out_price){ double sum = 0.0; - uint32_t tot_qty; + uint32_t tot_qty = 0; for (SingleFillHedger& hedger : _hedgers){ Quantity hq; Price hp; hedger.order_state().total_fills(hq, hp); 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 6851f0d37..d80dbd8c5 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -2948,95 +2948,229 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") spreader_quantity, spreader_quantity, false); - // SECTION ("book updates"){ - // uint32_t n_runs=10,n_iters = 100; - // //alternate bw the book n_runs times + SECTION ("Testing Hedge Reuse"){ + Quantity t_qty; + Price t_price; + // to keep the compiler warning happy + LOG(OrderMan, Info, "{} {} {}", book_1_alt.n_levels(), + book_2_alt.n_levels(), + book_3_alt.n_levels()); + // this sends fills, makes sure the hedgers are + // working, and on fill and recycled + // the hedge prices used are + // 20.015, 20.035 and 19.995 + SpreaderLegData& qleg_data_4 = bookkeeping_data.get_leg_data (3); + // lets concentrate on the hedges sent on leg 1 + SpreaderLegData& hleg_1 = bookkeeping_data.get_leg_data (0); + auto& hm_1 = hleg_1.hedger_manager(); + REQUIRE(hm_1.n_active_hedgers()==0); + // send a 1 lot quoter fill ///////// + ///////////////////////////////////// + spreader.test_only_on_child_order_update (qleg_data_4.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (1), + Price (20.045)); + REQUIRE(hm_1.n_active_hedgers()==1); + // legs 2 and 3 + REQUIRE(securities::test_price_equality( + bookkeeping_data.get_leg_data (1).hedger_manager().get_hedger_at (0).order_state().out_price().value(), + 20.035, + 0.005)); + REQUIRE(securities::test_price_equality( + bookkeeping_data.get_leg_data (2).hedger_manager().get_hedger_at (0).order_state().out_price().value(), + 19.995, + 0.005)); + // back to leg1's hedger, this is what will + // be mainly tested here on + { + auto& hedger_1_1 = hm_1.get_hedger_at (0); + REQUIRE(hedger_1_1.order_state().out_quantity().value() == 1); + REQUIRE(securities::test_price_equality( + hedger_1_1.order_state().out_price().value(), + 20.015, + 0.005)); + REQUIRE(hedger_1_1.state()==HedgerState::WAITING_FOR_FIRST_ACK); + spreader.test_only_on_child_order_update (hedger_1_1.order_state().order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (0), + Price (0)); + REQUIRE(hedger_1_1.state()==HedgerState::WORKING); + // fill h1 and it goes back to start //// + ///////////////////////////////////////// + spreader.test_only_on_child_order_update (hedger_1_1.order_state().order_key(), + api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, + Quantity (1), + Price (20.015)); + REQUIRE(hedger_1_1.state()==HedgerState::START); + } + REQUIRE(hm_1.n_active_hedgers()==0); + hm_1.total_fills(t_qty, t_price); + REQUIRE(t_qty.value() == 1); + REQUIRE(securities::test_price_equality(t_price.value(),20.015,0.005)); + //////////////////////////// + // send another 1 lot q fill + spreader.test_only_on_child_order_update (qleg_data_4.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (2), + Price (20.045)); + REQUIRE(hm_1.n_active_hedgers()==1); + // since 2 and 3 were never filled, they should have 2 hedgers + REQUIRE(bookkeeping_data.get_leg_data (1).hedger_manager().n_active_hedgers()==2); + REQUIRE(bookkeeping_data.get_leg_data (2).hedger_manager().n_active_hedgers()==2); + { + auto& hedger_1_1 = hm_1.get_hedger_at (0); + REQUIRE(hedger_1_1.order_state().out_quantity().value() == 1); + REQUIRE(securities::test_price_equality( + hedger_1_1.order_state().out_price().value(), + 20.015, + 0.005)); + REQUIRE(hedger_1_1.state()==HedgerState::WAITING_FOR_FIRST_ACK); + spreader.test_only_on_child_order_update (hedger_1_1.order_state().order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (0), + Price (0)); + REQUIRE(hedger_1_1.state()==HedgerState::WORKING); + // fill h1 /////// + ////////////////// + spreader.test_only_on_child_order_update (hedger_1_1.order_state().order_key(), + api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, + Quantity (1), + Price (20.025)); + REQUIRE(hedger_1_1.state()==HedgerState::START); + } + REQUIRE(hm_1.n_active_hedgers()==0); + hm_1.total_fills(t_qty, t_price); + REQUIRE(t_qty.value() == 2); + REQUIRE(securities::test_price_equality(t_price.value(),20.020,0.005)); + // send 4 more q fills ///////// + //////////////////////////////// + for(size_t f=4; f <= 10; f+= 2) + spreader.test_only_on_child_order_update (qleg_data_4.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (f), + Price (20.045)); + REQUIRE(hm_1.n_active_hedgers()==4); + REQUIRE(bookkeeping_data.get_leg_data (1).hedger_manager().n_active_hedgers()==6); + REQUIRE(bookkeeping_data.get_leg_data (2).hedger_manager().n_active_hedgers()==6); + REQUIRE(bookkeeping_data.get_leg_data (3).hedger_manager().n_active_hedgers()==0); + for (size_t i=0;i<4;i++){ + auto& h = hm_1.get_hedger_at(i); + REQUIRE(h.state()==HedgerState::WAITING_FOR_FIRST_ACK); + REQUIRE(h.order_state().out_quantity().value()==2); + REQUIRE(securities::test_price_equality( + h.order_state().out_price().value(), + 20.015, + 0.005)); + } + // send order acks ////////// + ///////////////////////////// + for (size_t i=0;i<4;i++){ + auto& h = hm_1.get_hedger_at(i); + spreader.test_only_on_child_order_update (h.order_state().order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (0), + Price (0)); + REQUIRE(h.state()==HedgerState::WORKING); + REQUIRE(h.order_state().out_quantity().value()==2); + REQUIRE(securities::test_price_equality( + h.order_state().out_price().value(), + 20.015, + 0.005)); + } + REQUIRE(hm_1.n_active_hedgers()==4); + // fills 1 lot on each order // + /////////////////////////////// + for (size_t i=0;i<4;i++){ + auto& h = hm_1.get_hedger_at(i); + // previous hedger fills were 20.015, 20.025 + spreader.test_only_on_child_order_update (h.order_state().order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (1), + Price (20.035)); + REQUIRE(h.state()==HedgerState::WORKING); + REQUIRE(h.order_state().out_quantity().value()==2); + REQUIRE(securities::test_price_equality( + h.order_state().out_price().value(), + 20.015, + 0.005)); + } + REQUIRE(hm_1.n_active_hedgers()==4); + hm_1.total_fills(t_qty, t_price); + REQUIRE(securities::test_price_equality(t_price.value(),20.03,0.005)); + REQUIRE(t_qty.value()==6); + + // fills additional 1 lot on each, /////// + // which should complete the orders ////// + ////////////////////////////////////////// + for (size_t i=0;i<4;i++){ + auto& h = hm_1.get_hedger_at(i); + // previous hedger fills were 20.015, 20.025 + spreader.test_only_on_child_order_update (h.order_state().order_key(), + api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, + Quantity (2), + Price (20.03)); + REQUIRE(h.state()==HedgerState::START); + REQUIRE(h.order_state().out_quantity().value()==0); + } + REQUIRE(hm_1.n_active_hedgers()==0); + hm_1.total_fills(t_qty, t_price); + REQUIRE(securities::test_price_equality(t_price.value(),20.03,0.005)); + REQUIRE(t_qty.value()==10); + } + // SECTION ("N_requotes_1_hedge_M_times"){ + // // N book updates followed by M fills + // // (does the hedge time stays the same as + // // in a tight loop in the "hedges" test ?) + // uint32_t n_runs=5, + // n_book_updates=200, + // n_hedges = 5; + // // since its the same quoting order we are filling + // // and the code downstream expects accumulated filled qty + // uint32_t total_filled_qty = 0, hi = 0; // for (uint32_t i=0; i hedge_perfs; + // hedge_perfs.reserve(n_hedges); + // auto t0=utils::TimeStamp::now(); + // for (uint32_t b=0; b(us_diff (t1,t0))/n_iters; - // auto n_requotes=n_iters;//qleg_data_4.order_update_message().n_modifications(); - // LOG(OrderMan, Info, "4 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); - // std::cout << "4 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; + // for (auto d : hedge_perfs) + // std::cout << ++hi << " hedge: " << d << std::endl; + // double min, max, mean, median; + // stats(hedge_perfs,min,max,mean,median); + // std::cout << "1Q 3H legs, requoting mean=" << avg_bookupdate_time << std::endl; + // std::cout << "1Q 3H legs, hedging median=" << median << " mean=" << mean << std::endl; + // std::cout << "------------------------------------------------------" << std::endl; // } // } - // SECTION ("hedges"){ - // // send hedges - // uint32_t n_hedges=20; - // bts::TimeStamp t0=bts::Timer::now(); - // for (uint32_t i=1; i<=n_hedges; i++) - // spreader.test_only_on_child_order_update (qleg_data_4.order_key(), - // api::orderman::OrderStatus::ORDER_STATUS_WORKING, - // Quantity (i), - // Price (21.045)); - // bts::TimeStamp t1=bts::Timer::now(); - // const auto& leg_data=bookkeeping_data.get_leg_data(0); - // REQUIRE(leg_data.n_active_hedgers()==n_hedges); - // double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; - // LOG(OrderMan, Info, "n leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); - // std::cout << "4 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; - // } - SECTION ("N_requotes_1_hedge_M_times"){ - // N book updates followed by M fills - // (does the hedge time stays the same as - // in a tight loop in the "hedges" test ?) - uint32_t n_runs=5, - n_book_updates=200, - n_hedges = 5; - // since its the same quoting order we are filling - // and the code downstream expects accumulated filled qty - uint32_t total_filled_qty = 0, hi = 0; - for (uint32_t i=0; i hedge_perfs; - hedge_perfs.reserve(n_hedges); - auto t0=utils::TimeStamp::now(); - for (uint32_t b=0; b Date: Thu, 20 Dec 2018 10:05:07 -0500 Subject: [PATCH 014/103] added comments to SpreaderChildOrder and cleaned it up a bit --- .../spreader/SpreaderChildOrderState.cpp | 13 +++---- .../spreader/SpreaderChildOrderState.h | 36 ++++++++++++++----- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp index 267290f7b..7bac526e5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp @@ -30,13 +30,10 @@ SpreaderChildOrderState::SpreaderChildOrderState(SecurityKey sec_key, bool is_live, bool is_quoting) : -_is_live (is_live), -_sec_key (sec_key), -_is_quoting (is_quoting), -_test_only_order_key((uint32_t)bts::Timer::now().time_since_epoch().count()){ - _init_base_values(); +SpreaderChildOrderState (_empty_order(),sec_key,is_live,is_quoting){ } -SpreaderChildOrderState::SpreaderChildOrderState (bts::orderman::ChildOrder& child_order, + +SpreaderChildOrderState::SpreaderChildOrderState (ChildOrder& child_order, SecurityKey sec_key, bool is_live, bool is_quoting) @@ -55,7 +52,7 @@ void SpreaderChildOrderState::_init_base_values(){ void SpreaderChildOrderState::_init_running_values(){ _n_cancel_orders = _n_modify_orders = 0; _n_place_orders = 0; - _child_order = bts::orderman::ChildOrder(); + _child_order = ChildOrder(); _status = bts::api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; _filled_price = Price(0); _filled_quantity = Quantity (0); @@ -72,7 +69,7 @@ void SpreaderChildOrderState::re_init(){ _base_price, _base_quantity); _init_running_values(); } -void SpreaderChildOrderState::re_init (bts::orderman::ChildOrder& child_order){ +void SpreaderChildOrderState::re_init (ChildOrder& child_order){ re_init(); _child_order = std::move(child_order); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 212bf3f5b..0699fea73 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -19,20 +19,34 @@ private: const bool _is_live; const SecurityKey _sec_key; const bool _is_quoting; - const bts::orderman::OrderKey _test_only_order_key; + const OrderKey _test_only_order_key; + // just for statistics uint16_t _n_place_orders, _n_cancel_orders; uint32_t _n_modify_orders; + // while child orders can recycle, their + // accumulated price, qty is kept here Price _base_price; Quantity _base_quantity; - bts::orderman::ChildOrder _child_order; + ChildOrder _child_order; api::orderman::OrderStatus _status; + // this is the total filled qty and + // average price for the active order Price _filled_price; Quantity _filled_quantity; + // this is the fill price, qty reported + // in the last update for this order + // (if no fill was reported but it was + // merely an order update, the qty + // here will be 0). + // _last_reported_order_price is the + // the working order price as it was + // last reported Price _last_filled_price; Price _last_reported_order_price; Quantity _last_filled_quantity; + // this is latest price, qty sent out Price _out_price; - Quantity _out_quantity; + Quantity _out_quantity; bts::TimeStamp _order_place_time; public: // constructors /////////////////// @@ -42,7 +56,7 @@ public: SpreaderChildOrderState(SecurityKey sec_key, bool is_live, bool is_quoting); - SpreaderChildOrderState(bts::orderman::ChildOrder& child_order, + SpreaderChildOrderState(ChildOrder& child_order, SecurityKey sec_key, bool is_live, bool is_quoting); @@ -54,12 +68,12 @@ public: bool is_active() const{ return _child_order.is_active(); } - bts::orderman::OrderKey order_key() const { + OrderKey order_key() const { if (_is_live){ if(is_active()) return _child_order.key(); else{ - LOG(OrderMan, Error, "OrderKey::order_key() is an illegal " + LOG(OrderMan, Error, "OrderKey::order_key() is illegal " "when inactive"); return OrderKey(0); } @@ -123,11 +137,15 @@ public: // this assignes a new order, and subsumes the earlier order's // fills and filled price into the base quantity and // base filled price - void re_init (bts::orderman::ChildOrder& child_order); + void re_init (ChildOrder& child_order); + ChildOrder& _empty_order(){ + _child_order = ChildOrder(); + return _child_order; + } /*************************on order updates**************************/ // OrderStateUpdateEvent gives total filled qty and // last filled price - void on_order_update(const bts::orderman::OrderStateUpdateEvent& e){ + void on_order_update(const OrderStateUpdateEvent& e){ bts_assert(!_is_live || e.key == order_key()); bts_assert(e.filled_quantity >= _filled_quantity.value()); _status = e.status; @@ -141,7 +159,7 @@ public: _last_filled_quantity, _filled_price, _filled_quantity); - } + } // order actions //////////////////// ///////////////////////////////////// void place_order(Price price, From 641141810edde56bcd57b0ca0d82de9be9e7998e Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 20 Dec 2018 17:07:52 -0500 Subject: [PATCH 015/103] Cleaned up HedgerPriceQuantity --- .../spreader/SingleFillHedger.cpp | 3 +- .../spreader/SingleFillHedger.h | 15 +++-- .../spreader/SpreaderChildOrderState.h | 4 ++ .../spreader/hedger/HedgePriceQuantityState.h | 65 +++++++------------ .../hedger_states/HedgerEndStateWorker.cpp | 5 +- .../hedger_states/HedgerStartStateWorker.cpp | 7 +- .../HedgerWaitingForCancelAckStateWorker.cpp | 3 - ...WaitingForFirstAckCancelledStateWorker.cpp | 6 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 4 +- .../HedgerWorkingStateWorker.cpp | 10 ++- .../spreader_orders/tests/spreader_tests.cpp | 28 ++++---- .../spreader_orders/tests/tests_common.h | 3 +- 12 files changed, 64 insertions(+), 89 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 799b8105f..8312e74a2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -21,8 +21,7 @@ _child_order_state (leg_property_data.leg_security_key(), is_live, false), _price_quantity_state(Price(0), - Quantity(0), - leg_property_data.trading_side()), + Quantity(0)), _is_permenantly_cancelled(false), _fill_trace(fill_trace), _worker (nullptr), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 8a1403f8f..ff87d3635 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -40,10 +40,10 @@ private: HedgerWaitingForCancelAckStateWorker _waiting_for_cancel_ack_state_worker; HedgerEndStateWorker _end_state_worker; private: - void _re_init(){ - _child_order_state.re_init(); - _price_quantity_state.re_init(); - } + // void _re_init(){ + // _child_order_state.re_init(); + // _price_quantity_state.re_init(); + // } // state handling void transform_to_START(); void transform_to_WAITING_FOR_FIRST_ACK(); @@ -61,9 +61,7 @@ private: _fill_trace); } void _modify_order (Price new_price){ - _price_quantity_state.update_out_price (new_price); - _child_order_state.modify_order(_price_quantity_state.out_price(), - _price_quantity_state.target_quantity()); + _child_order_state.modify_order(new_price); } void _cancel_order () { _child_order_state.cancel_order(); @@ -121,6 +119,9 @@ public: SpreaderChildOrderState& order_state() { return _child_order_state; } + const SpreaderChildOrderState& order_state() const { + return _child_order_state; + } public: HedgerState test_only_func_hedger_state() const { return _worker->state (); } const HedgePriceQuantityState& test_only_func_price_quantity_state () const { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 0699fea73..684402996 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -179,6 +179,10 @@ public: if (_is_live) _child_order.activate(price, quantity, trace); } + void modify_order(Price price){ + trace::CorID dont_care; + modify_order(price,_out_quantity,dont_care); + } void modify_order(Price price, Quantity quantity){ trace::CorID dont_care; modify_order(price,quantity,dont_care); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h index 07e6bffbe..1cb528fd5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h @@ -12,64 +12,43 @@ private: // side of the hedger order Price _target_price; Quantity _target_quantity; - const api::Side _side; // filled part of the order, updated as fills come in Quantity _aggregated_filled_quantity; - // the price of the "active" hedger order - Price _out_price; - Quantity _out_quantity; public: - HedgePriceQuantityState(Price target_price, Quantity target_quantity, api::Side target_side) + HedgePriceQuantityState(Price target_price, + Quantity target_quantity) : _target_price(target_price), _target_quantity(target_quantity), - _side (target_side), - _aggregated_filled_quantity(0), - _out_price (0), - _out_quantity (0) + _aggregated_filled_quantity(0) { } - void re_init(){ - _target_price = Price(0); - _target_quantity = Quantity(0); + void re_init(Price price, + Quantity quantity){ + _target_price = price; + _target_quantity = quantity; _aggregated_filled_quantity = Quantity(0); - _out_price = Price(0); - _out_quantity = Quantity(0); } - void update_target (Price price, - Quantity quantity){ - _target_price=price; - _target_quantity=quantity; + Price target_price() const { + return _target_price; + } + Quantity target_quantity() const { + return _target_quantity; + } + Quantity aggregated_filled_quantity() const { + return _aggregated_filled_quantity; } - Price target_price() const { return _target_price; } - Quantity target_quantity() const { return _target_quantity; } - api::Side side() const { return _side; } - Quantity aggregated_filled_quantity() const { return _aggregated_filled_quantity; } - Price out_price () const {return _out_price;} - Quantity out_quantity () const {return _out_quantity;} // this is the order quantity net of the fills - Quantity remaining_to_fill() const - { - uint32_t rv = _aggregated_filled_quantity.value() >= _target_quantity.value() ? 0 : _target_quantity.value() - _aggregated_filled_quantity.value(); + Quantity remaining_to_fill() const{ + uint32_t rv = + _aggregated_filled_quantity.value() >= _target_quantity.value() ? 0 : + _target_quantity.value() - _aggregated_filled_quantity.value(); return Quantity(rv); } // called as the hedge order gets filled - void update_fill(Quantity fill_quantity) - { - _aggregated_filled_quantity = Quantity(_aggregated_filled_quantity.value() + fill_quantity.value()); + void update_fill(Quantity fill_quantity){ + _aggregated_filled_quantity = + Quantity(_aggregated_filled_quantity.value() + fill_quantity.value()); } - void update_out_price_quantity (Price out_price, Quantity out_quantity) - { - _out_price = out_price; - _out_quantity = out_quantity; - } - void update_out_price (Price out_price) - { - _out_price = out_price; - } - void clear_out_price_quantity () - { - update_out_price_quantity (Price (0), Quantity (0)); - } }; }} 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 4d1582c32..2f6d9b2b1 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 @@ -5,9 +5,10 @@ namespace bts{ namespace orderman{ -void HedgerEndStateWorker::on_transition (){ +void HedgerEndStateWorker::on_transition (){ if(!_hedger->_is_permenantly_cancelled){ - _hedger->_re_init(); + _hedger->_price_quantity_state.re_init(Price(0),Quantity(0)); + _hedger->_child_order_state.re_init(); _hedger->transform_to_START(); } } 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 5430df181..3e84e60e3 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 @@ -9,11 +9,10 @@ namespace orderman{ void HedgerStartStateWorker::init (Price price, Quantity quantity, ChildOrder& child_order){ - _hedger->_price_quantity_state.update_target(price,quantity); - _hedger->_price_quantity_state.update_out_price_quantity (price,quantity); + _hedger->_price_quantity_state.re_init(price,quantity); _hedger->_child_order_state.re_init(child_order); - _hedger->_place_order (_hedger->_price_quantity_state.out_price(), - _hedger->_price_quantity_state.out_quantity()); + _hedger->_place_order (price, + quantity); _hedger->transform_to_WAITING_FOR_FIRST_ACK (); } void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ 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 18f16afd0..6155bf46d 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 @@ -15,10 +15,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr bts_assert (order_update.acknowledged()); _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); if (order_update.terminal_status()) - { - _hedger->_price_quantity_state.clear_out_price_quantity (); _hedger->transform_to_END (); - } } void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } 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 68d8f0fc7..b3980a2c5 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 @@ -16,10 +16,8 @@ void HedgerWaitingForFirstAckCancelledStateWorker::init( void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); - if (order_update.terminal_status()){ - _hedger->_price_quantity_state.clear_out_price_quantity(); - _hedger->transform_to_END (); - } + if (order_update.terminal_status()) + _hedger->transform_to_END (); else{ // this means the first ack is here and we should // be able to cancel it now 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 a074fa523..6389ba52d 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 @@ -13,10 +13,8 @@ void HedgerWaitingForFirstAckStateWorker::init (Price, void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); - if (order_update.terminal_status()){ - _hedger->_price_quantity_state.clear_out_price_quantity (); + if (order_update.terminal_status()) _hedger->transform_to_END (); - } else // this means the first ack _hedger->transform_to_WORKING (); 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 1c22e439a..8fe84cb6a 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 @@ -17,15 +17,13 @@ void HedgerWorkingStateWorker::init(Price, void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); - if (order_update.terminal_status()){ - _hedger->_price_quantity_state.clear_out_price_quantity (); - _hedger->transform_to_END (); - } + if (order_update.terminal_status()) + _hedger->transform_to_END (); } void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ 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(), + if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_child_order_state.out_price().value(), + _hedger->_child_order_state.out_quantity().value(), _hedger->_price_quantity_state.remaining_to_fill().value(), _hedger->_leg_property_data, _hedger->_spreader.get_book (_hedger->_leg_property_data.leg_index()), new_price)) 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 d80dbd8c5..26474b857 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1432,11 +1432,11 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); hedger.on_order_update (u); verify_complete_hedger_state (hedger, - HedgerState::END, - hedger_price, + HedgerState::END, + hedger_price, hedger_quantity, - Quantity (0), - Price(0), + Quantity (0), + hedger_price, hedger_quantity, hedger_quantity); LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_order_update"); @@ -1518,7 +1518,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") // cancel the order now on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (15), Price (2000)); hedger.on_order_update(u); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (15), Price(0), Quantity(0), Quantity(5)); + verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (15), hedger_price, Quantity(0), Quantity(5)); LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.on_order_update"); } SECTION("3. on_book") @@ -1574,34 +1574,34 @@ TEST_CASE ("hedger_END_state", "[spreader]") hedger.cancel_hedge (); on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); hedger.on_order_update (u1); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); + verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, Quantity (0), Quantity(20)); SECTION("1. init") { } SECTION ("2. on_order_update") - { + { on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); hedger.on_order_update (u1); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); + verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, Quantity (0), Quantity(20)); LOG(OrderMan, Diag, "hedger_END_state.on_order_update"); } SECTION("3. on_book") { double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); + verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, Quantity (0), Quantity(20)); LOG(OrderMan, Diag, "hedger_END_state.on_book"); } SECTION("4. cancel_hedge") { hedger.cancel_hedge (); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); + verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, Quantity (0), Quantity(20)); LOG(OrderMan, Diag, "hedger_END_state.cancel_hedge"); } SECTION("5. terminate") { hedger.terminate(); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); + verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, Quantity (0), Quantity(20)); LOG(OrderMan, Diag, "hedger_END_state.terminate"); } } @@ -1694,9 +1694,9 @@ TEST_CASE ("hedger_WORKING", "[spreader]") LOG(OrderMan, Diag, "hedger_WORKING.terminate"); } } -// /************************************************************************************************************/ -// /*********************************************Spreader State Tests*********************************************/ -// /************************************************************************************************************/ +// // /************************************************************************************************************/ +// // /*********************************************Spreader State Tests*********************************************/ +// // /************************************************************************************************************/ TEST_CASE ("spreader_START", "[spreader]") { bts::orderman::OrderKey order_key(0); 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 bd5183305..b598d48f3 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -458,7 +458,8 @@ void verify_complete_hedger_state (const SingleFillHedger& hedger, REQUIRE (hedger_pq_state.target_price() == target_price); REQUIRE (hedger_pq_state.target_quantity() == target_quantity); REQUIRE (hedger_pq_state.aggregated_filled_quantity() == aggregated_filled_quantity); - REQUIRE (hedger_pq_state.out_price() == out_price); + if (hedger.is_active_order()) + REQUIRE (hedger.order_state().out_price() == out_price); REQUIRE (hedger_pq_state.remaining_to_fill() == remaining_to_fill); } /**********************************************************************/ From ab9d3cede36bc4155abfee80c7f0a1aa8274920d Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 24 Dec 2018 09:14:22 -0500 Subject: [PATCH 016/103] odified some test code --- .../spreader_orders/tests/spreader_tests.cpp | 53 ++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) 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 26474b857..36ad4887a 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,5 +1,6 @@ #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include +#include namespace bts { @@ -3318,7 +3319,7 @@ TEST_CASE ("simple book addition", "[spreader]"){ true); } } -TEST_CASE ("random book addition", "[spreader]"){ +TEST_CASE ("random book addition", "[spreader]"){ size_t n_runs=100; // generates random prices, with tick size=0.01 size_t n_levels=5; @@ -3455,6 +3456,54 @@ TEST_CASE ("random book addition", "[spreader]"){ } } } +TEST_CASE ("memory layout", "[spreader]"){ + std::cout << "Spreader Order = " << sizeof(SpreaderOrder) << " bytes" << std::endl; + SpreaderOrder sp; + std::cout << "-----------------------" << std::endl; + std::cout << sizeof(SpreaderOrder) << " , " << (long long)&(sp) << std::endl; + std::cout << "-----------------------" << std::endl; + std::cout << sizeof(bool) << " , " << (long long)&(sp._cancelled) << std::endl; + std::cout << sizeof(int64_t) << " , " << (long long)&(sp._cancel_timeout) << std::endl; + std::cout << sizeof(int64_t) << " , " << (long long)&(sp._check_termination_period) << std::endl; + std::cout << sizeof(bool) << " , " << (long long)&(sp._active) << std::endl; + std::cout << sizeof(bool) << " , " << (long long)&(sp._cancel_hedges_on_cancel) << std::endl; + + std::cout << sizeof(std::unique_ptr) << " , " << (long long)&(sp._bookkeeping_data_ptr) << std::endl; + std::cout << sizeof(SpreaderOrderServices*) << " , " << (long long)&(sp._order_services) << std::endl; + + std::cout << sizeof(bts::TimeStamp) << " , " << (long long)&(sp._curr_timestamp) << std::endl; + std::cout << sizeof(bts::TimeStamp) << " , " << (long long)&(sp._last_check_termination_timestamp) << std::endl; + std::cout << sizeof(utils::TimeStamp) << " , " << (long long)&(sp._perf_ts) << std::endl; + std::cout << sizeof(ISpreaderStateWorker*) << " , " << (long long)&(sp._state_worker) << std::endl; + std::cout << sizeof(SpreaderStartStateWorker) << " , " << (long long)&(sp._start_state_worker) << std::endl; + std::cout << sizeof(SpreaderWaitingForInitialDataStateWorker) << " , " << (long long)&(sp._waiting_for_initial_data_state_worker) << std::endl; + std::cout << sizeof(SpreaderWorkingStateWorker) << " , " << (long long)&(sp._working_state_worker) << std::endl; + std::cout << sizeof(SpreaderWaitingForCancelAllStateWorker) << " , " << (long long)&(sp._waiting_for_cancel_all_state_worker) << std::endl; + std::cout << sizeof(SpreaderEndStateWorker) << " , " << (long long)&(sp._end_state_worker) << std::endl; + + std::cout << "-----------------------" << std::endl; + // SpreaderBookkeepingData /////////////////// + ////////////////////////////////////////////// + std::cout << "SpreaderBookkeepingData = " << sizeof(SpreaderBookkeepingData) << std::endl; + std::cout << "flat_map = " << sizeof(boost::container::flat_map) << std::endl; + std::cout << "api::orderman::OrderState = " << sizeof(bts::api::orderman::OrderState) << std::endl; + std::cout << "SingleLegQuoter = " << sizeof(SingleLegQuoter) << std::endl; + std::cout << "SingleFillHedger = " << sizeof(SingleFillHedger) << std::endl; + std::cout << "SpreaderChildOrderState = " << sizeof(SpreaderChildOrderState) << std::endl; + std::cout << "LegPropertyData = " << sizeof(LegPropertyData) << std::endl; + std::cout << "\tbts::api::ContractLeg = " << sizeof(bts::api::ContractLeg) << std::endl; + std::cout << "\tbts::spark::LegSpreaderParams = " << sizeof(bts::spark::LegSpreaderParams) << std::endl; + std::cout << "\tbts::api::orderman::OrderDefinition = " << sizeof(bts::api::orderman::OrderDefinition) << std::endl; + std::cout << "\tbts::orderman::OrderBuilder = " << sizeof(bts::orderman::OrderBuilder) << std::endl; + std::cout << "SpreaderLegData = " << sizeof(SpreaderLegData) << std::endl; + std::cout << "Book = " << sizeof(Book) << std::endl; + std::cout << "SpreaderOrderBuilder = " << sizeof(SpreaderOrderBuilder) << std::endl; + std::cout << "UnhedgedDelta = " << sizeof(UnhedgedDelta) << std::endl; + std::cout << "HedgerManager = " << sizeof(HedgerManager) << std::endl; + std::cout << "QuoteDriverSetHistory = " << sizeof(QuoteDriverSetHistory) << std::endl; + std::cout << "QuoteDriverSet = " << sizeof(QuoteDriverSet) << std::endl; + //std::cout << "QuoteLegDriver = " << sizeof(QuoteLegDriver) << std::endl; +} class RV { public: @@ -3516,7 +3565,7 @@ TEST_CASE ("scratch_pad", "[spreader]"){ r = new TestContainer(); else r = new TestContainer(); - std::cout << r << std::endl; + REQUIRE(r != nullptr); RV rv_1(100); RVUser rvuser_1(rv_1); REQUIRE(rv_1.i==0); From 0d66054e8e58b26f94efbed1f6129aa19c96caee Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 24 Dec 2018 15:11:40 -0500 Subject: [PATCH 017/103] dealing with the Hedger._key() for hedgers with no working orders --- .../spreader_orders/spreader/SingleFillHedger.cpp | 8 ++++++++ .../spreader_orders/spreader/SingleFillHedger.h | 12 +++--------- .../spreader/SpreaderChildOrderState.h | 14 ++------------ 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 8312e74a2..58161b74e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -77,6 +77,14 @@ _end_state_worker (this, other._end_state_worker){ } bts_assert(_worker!=nullptr); } +OrderKey SingleFillHedger::_key(){ + if(is_active_order()) + return _child_order_state.order_key(); + else{ + LOG(OrderMan, Error, "Calling key() on an inactive order"); + return OrderKey(0); + } +} /********************************************************************/ /****************************External Calls**************************/ /********************************************************************/ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index ff87d3635..c7b91f39b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -40,10 +40,6 @@ private: HedgerWaitingForCancelAckStateWorker _waiting_for_cancel_ack_state_worker; HedgerEndStateWorker _end_state_worker; private: - // void _re_init(){ - // _child_order_state.re_init(); - // _price_quantity_state.re_init(); - // } // state handling void transform_to_START(); void transform_to_WAITING_FOR_FIRST_ACK(); @@ -66,12 +62,10 @@ private: void _cancel_order () { _child_order_state.cancel_order(); } - bts::orderman::OrderKey _key() { - // TODO clean up - return _child_order_state.is_active() ? - _child_order_state.order_key() : OrderKey(0); + bts::orderman::OrderKey _key(); + TimeStamp _current_time () const { + return _spreader.current_time(); } - TimeStamp _current_time () const {return _spreader.current_time();} public: SingleFillHedger(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 684402996..6137f897c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -65,19 +65,9 @@ public: SpreaderChildOrderState& operator=(SpreaderChildOrderState&&) = delete; // const accessors //////////////////// /////////////////////////////////////// - bool is_active() const{ - return _child_order.is_active(); - } OrderKey order_key() const { - if (_is_live){ - if(is_active()) - return _child_order.key(); - else{ - LOG(OrderMan, Error, "OrderKey::order_key() is illegal " - "when inactive"); - return OrderKey(0); - } - } + if (_is_live) + return _child_order.key(); else return _test_only_order_key; } From 6ba1de8c5c22adae8809330903139ff9c9f04be8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 25 Dec 2018 10:31:35 -0500 Subject: [PATCH 018/103] changing order_key name --- .../spreader/SingleFillHedger.cpp | 18 +++++++++++------- .../spreader/SingleFillHedger.h | 2 +- .../spreader/hedger/HedgerManager.h | 3 ++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 58161b74e..fcbf28d44 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -77,13 +77,17 @@ _end_state_worker (this, other._end_state_worker){ } bts_assert(_worker!=nullptr); } -OrderKey SingleFillHedger::_key(){ +OrderKey SingleFillHedger::_hedge_order_key(){ + // this function is only called for logging + // purposes. if(is_active_order()) return _child_order_state.order_key(); - else{ - LOG(OrderMan, Error, "Calling key() on an inactive order"); + else + // when the hedger does not have an active order + // (ie when in START or END states). since this + // function is only called for logging purposes + // it is safe to return 0 return OrderKey(0); - } } /********************************************************************/ /****************************External Calls**************************/ @@ -97,7 +101,7 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ //bts_assert (u.order_key() == _order.order_key()); LOG(OrderMan, Info, "SingleFillHedger::update_order_status " "key:{} state:{} order status:{} fills:{}", - _key(), _worker->state_text(), + _hedge_order_key(), _worker->state_text(),! static_cast(u.status()), u.last_update_filled_quantity()); _worker->on_order_update (u); @@ -107,13 +111,13 @@ void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &tra } void SingleFillHedger::cancel_hedge(){ LOG(OrderMan, Info, "SingleFillHedger::cancel_order key:{} state:{}", - _key(), _worker->state_text()); + _hedge_order_key(), _worker->state_text()); _is_permenantly_cancelled=true; _worker->cancel (); } void SingleFillHedger::terminate (){ LOG(OrderMan, Info, "SingleFillHedger::terminate key:{} state:{}", - _key(), _worker->state_text()); + _hedge_order_key(), _worker->state_text()); _is_permenantly_cancelled=true; _worker->terminate(); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index c7b91f39b..5dcc3c84e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -62,7 +62,7 @@ private: void _cancel_order () { _child_order_state.cancel_order(); } - bts::orderman::OrderKey _key(); + bts::orderman::OrderKey _hedge_order_key(); TimeStamp _current_time () const { return _spreader.current_time(); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index 3d8e5d490..0a5916cda 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -23,7 +23,8 @@ public: // an order with the specified key SingleFillHedger* find_hedger_from_orderkey(OrderKey order_key){ for (SingleFillHedger& hedger : _hedgers) - if (hedger.order_state().order_key() == order_key) + if (hedger.is_active_order() && + hedger.order_state().order_key() == order_key) return &hedger; return nullptr; } From 6116e24df0b5f4fad0a2dd55cb4a5b943bd03c36 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 25 Dec 2018 23:50:26 -0500 Subject: [PATCH 019/103] added comments to hedger, and formatted --- .../spreader/SingleFillHedger.cpp | 33 +++++++++++-------- .../spreader/SingleFillHedger.h | 11 ++++--- .../hedger_states/HedgerEndStateWorker.cpp | 8 +++-- .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 9 ++--- .../hedger_states/HedgerStartStateWorker.h | 5 +-- ...WaitingForFirstAckCancelledStateWorker.cpp | 13 +++++--- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 11 ++++--- .../HedgerWaitingForFirstAckStateWorker.h | 7 ++-- .../HedgerWorkingStateWorker.cpp | 30 +++++++++++------ .../hedger_states/HedgerWorkingStateWorker.h | 2 +- 12 files changed, 83 insertions(+), 50 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index fcbf28d44..948d0e5b4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -48,11 +48,16 @@ _is_permenantly_cancelled(other._is_permenantly_cancelled), _fill_trace(other._fill_trace), _worker(nullptr), _start_state_worker (this, other._start_state_worker), -_waiting_for_first_ack_state_worker (this, other._waiting_for_first_ack_state_worker), -_waiting_for_first_ack_cancelled_state_worker (this, - other._waiting_for_first_ack_cancelled_state_worker), +_waiting_for_first_ack_state_worker ( + this, + other._waiting_for_first_ack_state_worker), +_waiting_for_first_ack_cancelled_state_worker ( + this, + other._waiting_for_first_ack_cancelled_state_worker), _working_state_worker (this, other._working_state_worker), -_waiting_for_cancel_ack_state_worker (this, other._waiting_for_cancel_ack_state_worker), +_waiting_for_cancel_ack_state_worker ( + this, + other._waiting_for_cancel_ack_state_worker), _end_state_worker (this, other._end_state_worker){ HedgerState state = other._worker->state(); switch(state){ @@ -106,11 +111,12 @@ 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 Book& book, + trace::CorID &trace){ _worker->on_book (book,trace); } void SingleFillHedger::cancel_hedge(){ - LOG(OrderMan, Info, "SingleFillHedger::cancel_order key:{} state:{}", + LOG(OrderMan, Info, "SingleFillHedger::cancel_order key:{} state:{}", _hedge_order_key(), _worker->state_text()); _is_permenantly_cancelled=true; _worker->cancel (); @@ -136,25 +142,26 @@ bool SingleFillHedger::is_terminal_state () const { /*************************State Transformations**********************/ /********************************************************************/ void SingleFillHedger::transform_to_START(){ - bts_assert (_worker == nullptr || - _worker->state() == HedgerState::END); + bts_assert(_worker == nullptr || + _worker->state() == HedgerState::END); _switch_state (&_start_state_worker); } void SingleFillHedger::transform_to_WAITING_FOR_FIRST_ACK(){ - bts_assert (_worker->state() == HedgerState::START); + bts_assert(_worker->state() == HedgerState::START); _switch_state (&_waiting_for_first_ack_state_worker); } void SingleFillHedger::transform_to_WAITING_FOR_FIRST_ACK_CANCELLED () { - bts_assert (_worker->state() == HedgerState::WAITING_FOR_FIRST_ACK); + bts_assert(_worker->state() == HedgerState::WAITING_FOR_FIRST_ACK); _switch_state (&_waiting_for_first_ack_cancelled_state_worker); } void SingleFillHedger::transform_to_WORKING() { - bts_assert (_worker->state() == HedgerState::WAITING_FOR_FIRST_ACK); + bts_assert(_worker->state() == HedgerState::WAITING_FOR_FIRST_ACK); _switch_state (&_working_state_worker); } void SingleFillHedger::transform_to_WAITING_FOR_CANCEL_ACK(){ - bts_assert (_worker->state() == HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED || - _worker->state() == HedgerState::WORKING); + bts_assert( + _worker->state() == HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED || + _worker->state() == HedgerState::WORKING); _switch_state (&_waiting_for_cancel_ack_state_worker); } void SingleFillHedger::transform_to_END() { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 5dcc3c84e..ae3646d4f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -35,7 +35,8 @@ private: IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker; - HedgerWaitingForFirstAckCancelledStateWorker _waiting_for_first_ack_cancelled_state_worker; + HedgerWaitingForFirstAckCancelledStateWorker + _waiting_for_first_ack_cancelled_state_worker; HedgerWorkingStateWorker _working_state_worker; HedgerWaitingForCancelAckStateWorker _waiting_for_cancel_ack_state_worker; HedgerEndStateWorker _end_state_worker; @@ -84,7 +85,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 Book& book,trace::CorID &); //d. called when the hedge order is cancelled, either // manually or automatically void cancel_hedge(); @@ -117,8 +118,10 @@ public: return _child_order_state; } public: - HedgerState test_only_func_hedger_state() const { return _worker->state (); } - const HedgePriceQuantityState& test_only_func_price_quantity_state () const { + HedgerState test_only_func_hedger_state() const { + return _worker->state (); + } + const HedgePriceQuantityState& test_only_func_price_quantity_state() const { return _price_quantity_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 2f6d9b2b1..bb985497a 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 @@ -5,7 +5,10 @@ namespace bts{ namespace orderman{ -void HedgerEndStateWorker::on_transition (){ +void HedgerEndStateWorker::on_transition (){ + // this is to allow the hedger to be re-used. + // the state is cleared and the hedger returns + // to the start state, waiting for the init call if(!_hedger->_is_permenantly_cancelled){ _hedger->_price_quantity_state.re_init(Price(0),Quantity(0)); _hedger->_child_order_state.re_init(); @@ -20,7 +23,8 @@ void HedgerEndStateWorker::init (Price, } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } -void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerEndStateWorker::on_book(const Book&, + trace::CorID &){ } 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 609c62d64..f1c59c6c5 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 @@ -25,7 +25,7 @@ public: const std::string state_text () const override {return "END";} void init (Price price,Quantity quantity,ChildOrder& child_order) 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 Book& book,trace::CorID &) 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 3e84e60e3..86f618d80 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 @@ -11,16 +11,17 @@ void HedgerStartStateWorker::init (Price price, ChildOrder& child_order){ _hedger->_price_quantity_state.re_init(price,quantity); _hedger->_child_order_state.re_init(child_order); + // this is the only place an order is enterred _hedger->_place_order (price, quantity); _hedger->transform_to_WAITING_FOR_FIRST_ACK (); } void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ - bts_assert_msg (false, "HedgerStartStateWorker::on_order_update illegal operation"); + bts_assert_msg (false, "HedgerStartStateWorker::on_order_update " + "illegal operation"); } -void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ - // market data will not be sent until out of start. - //bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); +void HedgerStartStateWorker::on_book(const Book&, + trace::CorID &){ } void HedgerStartStateWorker::cancel(){ _hedger->transform_to_END (); 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 233f8915c..df5c7fea8 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 @@ -4,7 +4,8 @@ namespace bts{ namespace orderman{ - +// this is the starting node. since the hedger +// can be reused, the end state can lead back to this class HedgerStartStateWorker : public IHedgerStateWorker { private: @@ -22,7 +23,7 @@ public: const std::string state_text () const override {return "START";} void init (Price price,Quantity quantity,ChildOrder& child_order) 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 Book& book,trace::CorID &) 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 b3980a2c5..95af11a31 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 @@ -13,9 +13,11 @@ void HedgerWaitingForFirstAckCancelledStateWorker::init( bts_assert_msg (false, "HedgerWaitingForFirstAckCancelledStateWorker::init " "illegal operation"); } -void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update( + const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); - _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); + _hedger->_price_quantity_state.update_fill + (order_update.last_update_filled_quantity()); if (order_update.terminal_status()) _hedger->transform_to_END (); else{ @@ -25,13 +27,14 @@ 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 Book&, + trace::CorID &){ } void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){ } void HedgerWaitingForFirstAckCancelledStateWorker::terminate(){ _hedger->transform_to_END (); } -void HedgerWaitingForFirstAckCancelledStateWorker::on_time(const TimeStamp&){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_time(const TimeStamp&){ } -}} +}} \ No newline at end of file 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 ffb5156d5..ae53227d3 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 @@ -27,7 +27,7 @@ public: } void init (Price price,Quantity quantity,ChildOrder& child_order) 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 Book& book,trace::CorID &) 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 6389ba52d..df5626813 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 @@ -10,16 +10,19 @@ void HedgerWaitingForFirstAckStateWorker::init (Price, bts_assert_msg (false, "HedgerWaitingForFirstAckStateWorker::init " "illegal operation"); } -void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ +void HedgerWaitingForFirstAckStateWorker::on_order_update( + const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); - _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); + _hedger->_price_quantity_state.update_fill( + order_update.last_update_filled_quantity()); if (order_update.terminal_status()) _hedger->transform_to_END (); else // this means the first ack _hedger->transform_to_WORKING (); } -void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForFirstAckStateWorker::on_book(const Book&, + trace::CorID &){ } void HedgerWaitingForFirstAckStateWorker::cancel(){ _hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); @@ -27,6 +30,6 @@ void HedgerWaitingForFirstAckStateWorker::cancel(){ void HedgerWaitingForFirstAckStateWorker::terminate(){ _hedger->transform_to_END (); } -void HedgerWaitingForFirstAckStateWorker::on_time(const TimeStamp&){ +void HedgerWaitingForFirstAckStateWorker::on_time(const TimeStamp&){ } }} 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 84d1f1556..5d05c3c60 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 @@ -18,16 +18,17 @@ public: const HedgerWaitingForFirstAckStateWorker&) : HedgerWaitingForFirstAckStateWorker (hedger) {} - void on_transition () override {} + void on_transition () override { + } HedgerState state () const override { return HedgerState::WAITING_FOR_FIRST_ACK; } const std::string state_text () const override { return "WAITING_FOR_FIRST_ACK"; } - void init (Price price,Quantity quantity,ChildOrder& child_order) override; + void init (Price price,Quantity quantity, ChildOrder& child_order) 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 Book& book,trace::CorID &) 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 8fe84cb6a..59a385fe1 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 @@ -14,19 +14,25 @@ void HedgerWorkingStateWorker::init(Price, ChildOrder&){ bts_assert_msg (false, "HedgerWorkingStateWorker::init illegal operation"); } -void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& order_update){ +void HedgerWorkingStateWorker::on_order_update( + const SpreaderChildOrderState& order_update){ bts_assert (order_update.acknowledged()); - _hedger->_price_quantity_state.update_fill (order_update.last_update_filled_quantity()); + _hedger->_price_quantity_state.update_fill( + order_update.last_update_filled_quantity()); if (order_update.terminal_status()) _hedger->transform_to_END (); } -void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWorkingStateWorker::on_book(const Book&, + trace::CorID &){ double new_price; - if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_child_order_state.out_price().value(), - _hedger->_child_order_state.out_quantity().value(), - _hedger->_price_quantity_state.remaining_to_fill().value(), - _hedger->_leg_property_data, - _hedger->_spreader.get_book (_hedger->_leg_property_data.leg_index()), new_price)) + if (SpreaderUtils::post_hedge_market_based_price_action( + _hedger->_child_order_state.out_price().value(), + _hedger->_child_order_state.out_quantity().value(), + _hedger->_price_quantity_state.remaining_to_fill().value(), + _hedger->_leg_property_data, + _hedger->_spreader.get_book( + _hedger->_leg_property_data.leg_index()), + new_price)) _hedger->_modify_order (Price(new_price)); } void HedgerWorkingStateWorker::cancel(){ @@ -38,8 +44,12 @@ void HedgerWorkingStateWorker::terminate(){ } void HedgerWorkingStateWorker::on_time(const TimeStamp& ts){ double new_price; - if (SpreaderUtils::post_hedge_time_based_price_action (_order_touch_time, ts, _hedger->_leg_property_data, - _hedger->_spreader.get_book (_hedger->_leg_property_data.leg_index()), new_price)){ + if (SpreaderUtils::post_hedge_time_based_price_action ( + _order_touch_time, + ts, + _hedger->_leg_property_data, + _hedger->_spreader.get_book (_hedger->_leg_property_data.leg_index()), + new_price)){ _hedger->_modify_order (Price(new_price)); _order_touch_time = _hedger->_current_time(); } 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 e5b119602..e8f42acaf 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 @@ -25,7 +25,7 @@ public: const std::string state_text () const override {return "WORKING";} void init (Price price,Quantity quantity,ChildOrder& child_order) 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 Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; From e2f4a86fcf84b50a0c6c6bde0f0f5100b9b3ce47 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 31 Dec 2018 13:05:27 -0500 Subject: [PATCH 020/103] added tests to isolate the first hedge condition --- .../orders/spreader_orders/SpreaderOrder.cpp | 40 ++++ .../orders/spreader_orders/SpreaderOrder.h | 10 +- .../spreader_orders/spreader/SpreaderUtils.h | 2 +- .../spreader/hedger/HedgerManager.h | 7 + .../SpreaderWorkingStateWorker.cpp | 14 +- .../spreader_orders/tests/spreader_tests.cpp | 222 ++++++++++++++++++ .../spreader_orders/tests/tests_common.h | 19 +- 7 files changed, 306 insertions(+), 8 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 12e4e6394..843b4df87 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -354,6 +354,8 @@ void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, hedge_quantity); else{ const QuoteLegDriver& driver_data = filled_leg_data.quoter().driver_data(quote_order_price, hedge_leg_index); + // QuoteLegDriver driver_data; + // driver_data.set(quote_order_price,Quantity(1),Quantity(1)); SpreaderUtils::compute_hedge_price_size_n_legs (filled_leg_data.leg_property_data(), fill_price, fill_quantity, @@ -480,4 +482,42 @@ void SpreaderOrder::_keep_hedging_path_hot(){ } } } + +// keep all the data hot, by just loading +// it in memory +void SpreaderOrder::_touch_hedging_data (){ + if (_inited()){ + SpreaderBookkeepingData& d=_bookkeeping_data(); + for (size_t i=0; i namespace bts{ namespace orderman{ @@ -12,6 +13,9 @@ private: const trace::CorID _trace; bool _is_live; std::vector _hedgers; + //small_vector unf needs operator= which is deleted + //for the Hedger + //boost::container::small_vector _hedgers; public: HedgerManager(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, @@ -65,6 +69,9 @@ public: bts_assert(index<_hedgers.size()); return _hedgers[index]; } + size_t pool_size() const{ + return _hedgers.size(); + } }; }} \ 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 d6d20a38d..84b06382f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -78,8 +78,8 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, trace::CorID trace){ LOG(OrderMan, Info,"h_p w start {0}",_spreader->_diff_ns()); - _spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); - + //_spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); + auto state_ts = utils::TimeStamp::now(); // 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 @@ -98,12 +98,14 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // getting overfilled SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); bts_assert (order_update_message.last_update_filled_quantity().value() > 0); - for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ - if (q_idx != leg_data.leg_property_data().leg_index()){ + LOG(OrderMan, Info,"h_p_i beg {}", _spreader->_diff_ns(state_ts)); + for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ + state_ts = utils::TimeStamp::now(); + if (q_idx != leg_data.leg_property_data().leg_index()){ SpreaderLegData& other_leg_data = _spreader->_bookkeeping_data().get_leg_data (q_idx); Price hedge_price; double hedge_qty; - + LOG(OrderMan, Info,"h_p_i chpq_b {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); _spreader->_compute_hedge_price_quantity(leg_data.leg_property_data().leg_index(), order_update_message.last_update_filled_price(), order_update_message.last_update_filled_quantity().value(), @@ -111,9 +113,11 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, q_idx, hedge_price, hedge_qty); + LOG(OrderMan, Info,"h_p_i chpq_e {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); uint32_t total_unhedged_qty=leg_unhedged_delta.subtract_hedge_if_available(); + LOG(OrderMan, Info,"h_p_i delta {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); LOG(OrderMan, Info,"h_p comp {0} {1}", q_idx, _spreader->_diff_ns()); if (total_unhedged_qty != 0){ // if it is an actively quoting leg, inform the quoter about it 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 fe9c272c7..5ac4671e7 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3479,6 +3479,228 @@ TEST_CASE ("memory layout", "[spreader]"){ std::cout << "QuoteDriverSetHistory = " << sizeof(QuoteDriverSetHistory) << std::endl; std::cout << "QuoteDriverSet = " << sizeof(QuoteDriverSet) << std::endl; } +TEST_CASE ("4legs_hedging", "[spreader_perf]") +{ + bts::orderman::OrderKey order_key(0); + Price spreader_price = Price (40); + Quantity spreader_quantity = Quantity (250); + ContractLeg leg_1, leg_2, leg_3, qleg_4; + fill_future_contract_leg (leg_1, 2468, "SI", bts::api::Venue::VENUE_GLBX, + 2019, 1, 15, + 1.0, 1.0, + api::Side::SIDE_BUY, + 1.0, 0.005); + fill_future_contract_leg (leg_2, 2469, "SI", bts::api::Venue::VENUE_GLBX, + 2019, 2, 15, + 1.0, 1.0, + api::Side::SIDE_BUY, + 1.0, 0.005); + fill_future_contract_leg (leg_3, 2470, "SI", bts::api::Venue::VENUE_GLBX, + 2019, 3, 15, + 1.0, 1.0, + api::Side::SIDE_BUY, + 1.0, 0.005); + fill_future_contract_leg (qleg_4, 2471, "SI", bts::api::Venue::VENUE_GLBX, + 2019, 4, 15, + -1.0, -1.0, + api::Side::SIDE_SELL, + 1.0, 0.005); + std::vector contract_legs; + contract_legs.push_back(leg_1); + contract_legs.push_back(leg_2); + contract_legs.push_back(leg_3); + contract_legs.push_back(qleg_4); + Security synthetic_security; + fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); + // execution params/order def + LegSpreaderParams lsp_1, lsp_2, lsp_3, qlsp_4; + fill_leg_spreader_params(lsp_1, 1.0, false, 1.0); + fill_leg_spreader_params(lsp_2, 1.0, false, 1.0); + fill_leg_spreader_params(lsp_3, 1.0, false, 1.0); + fill_leg_spreader_params(qlsp_4, -1.0, true, 1.0); + std::vector spreader_params; + spreader_params.push_back(lsp_1); + spreader_params.push_back(lsp_2); + spreader_params.push_back(lsp_3); + spreader_params.push_back(qlsp_4); + bts::api::orderman::OrderDefinition order_def; + fill_spreader_order_definition(order_def, Side::SIDE_BUY, + synthetic_security, + spreader_params); + // putting it together in SpreaderBookkeepingData + SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices + testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); + SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); + std::vector leg_props; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + SpreaderOrder spreader; + REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); + // on_init_new and activate + spreader.test_only_on_init_new (order_def, pao_services); + SpreaderOrderServices order_services (nullptr); + spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); + SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); + verify_basic_spreader_state (spreader, + SpreaderState::WORKING, + spreader_price, + spreader_quantity); + SpreaderLegData& qleg_data_4 = bookkeeping_data.get_leg_data (3); + verify_complete_quoter_state (qleg_data_4.quoter(), + QuoterState::WAITING_FOR_SIZE, + false, + spreader_price, + spreader_quantity, + Quantity (0), + Quantity(0), + Price(0), + Quantity(0), + spreader_quantity, + false); + Book book_1 = get_book(SecurityKey (leg_1.security().id()), + 5, + new double[5] {20, 19.995, 19.990, 19.985, 19.980}, + new uint16_t[5] {100, 50, 75, 150, 25}, + new double[5] {20.005, 20.010, 20.015, 20.020, 20.025}, + new uint16_t[5] {25,125,175,225,100}, + true), + book_1_alt = get_book(SecurityKey (leg_1.security().id()), + 5, + new double[5] {20.005, 19.990, 19.890, 19.885, 19.780}, + new uint16_t[5] {10, 25, 75, 15, 25}, + new double[5] {20.010, 20.015, 20.025, 20.030, 20.035}, + new uint16_t[5] {10, 25, 75, 15, 25}, + true), + book_2 = get_book(SecurityKey (leg_2.security().id()), + 5, + new double[5] {20.030,20.025,20.020,20.015,20.010}, + new uint16_t[5] {100, 100, 200, 250, 75}, + new double[5] {20.035, 20.040, 20.045, 20.050, 20.055}, + new uint16_t[5] {250,275,100,5,15}, + true), + book_2_alt = get_book(SecurityKey (leg_2.security().id()), + 5, + new double[5] {20.050,20.035,20.030,20.035,20.030}, + new uint16_t[5] {10, 10, 20, 250, 75}, + new double[5] {20.055, 20.060, 20.065, 20.070, 20.085}, + new uint16_t[5] {25,275,100,5,15}, + true), + book_3 = get_book(SecurityKey (leg_3.security().id()), + 5, + new double[5] {19.985,19.980,19.975,19.970,19.965}, + new uint16_t[5] {75,250,125,100,300}, + new double[5] {19.990,19.995,20.000,20.005,20.010}, + new uint16_t[5] {100,150,250,25,125}, + true), + book_3_alt = get_book(SecurityKey (leg_3.security().id()), + 5, + new double[5] {19.885,19.875,19.870,19.765,19.760}, + new uint16_t[5] {75,25,125,100,300}, + new double[5] {19.890,19.895,19.900,19.910,19.915}, + new uint16_t[5] {100,50,50,125,125}, + true); + spreader.test_only_on_book_update (BookUpdateEvent(book_1, + trace::CorID())); + spreader.test_only_on_book_update (BookUpdateEvent(book_2, + trace::CorID())); + spreader.test_only_on_book_update (BookUpdateEvent(book_3, + trace::CorID())); + verify_complete_quoter_state (qleg_data_4.quoter(), + QuoterState::WAITING_FOR_FIRST_ACK, + false, + spreader_price, + spreader_quantity, + Quantity (0), + Quantity(0), + Price(20.045), + spreader_quantity, + spreader_quantity, + false); + spreader.test_only_on_child_order_update (qleg_data_4.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity (0), + Price (0)); + verify_complete_quoter_state (qleg_data_4.quoter(), + QuoterState::WORKING, + false, + spreader_price, + spreader_quantity, + Quantity (0), + Quantity(0), + Price(20.045), + spreader_quantity, + spreader_quantity, + false); + SECTION ("I_requotes_J_hedges_N_times"){ + // N book updates followed by M fills + // (does the hedge time stays the same as + // in a tight loop in the "hedges" test ?) + uint32_t n_runs=1, + n_book_updates=200, + n_hedges = 20; + // since its the same quoting order we are filling + // and the code downstream expects accumulated filled qty + uint32_t total_filled_qty = 0, hi = 0; + + auto fire_book = [&](size_t n_upates) -> void + { + for (uint32_t b=0; b hedge_perfs; + hedge_perfs.reserve(n_hedges); + auto t0=utils::TimeStamp::now(); + fire_book(200); + auto t1=utils::TimeStamp::now(); + double avg_bookupdate_time=(t1-t0).nanoseconds()/(1000.0 * 6*n_book_updates); + // tight hedging loop is 3-4 usecs + // the following sleep controls how much the first + // hedging takes + // 30,000 : 30,10-40 (initial call, subsequent first calls) + // 30,000* : 40,20-40 (real sleep vs busy spin) + test_sleep(30000,false); + spreader._touch_hedging_data(); + for(uint32_t h=0; h& p, +void stats (std::vector p, double& min, double& max, double& mean, From f12c1d5e748a423fb758e24f5de4c1a0be59b225 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 2 Jan 2019 12:28:16 -0500 Subject: [PATCH 021/103] SPARK-1946 --- .../orders/spreader_orders/SpreaderOrder.cpp | 173 ++++++++++-------- .../orders/spreader_orders/SpreaderOrder.h | 38 +++- .../SpreaderWorkingStateWorker.cpp | 4 +- .../spreader_orders/tests/spreader_tests.cpp | 18 +- 4 files changed, 145 insertions(+), 88 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 843b4df87..7c2994d1a 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -116,94 +116,111 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event.settlement_price.price()); _state_worker->on_settlement_price(settlement_event); } -void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ - if (!_active) return; +void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ _perf_ts=utils::TimeStamp::now(); - auto now = _perf_ts; - char cb_type='q'; //q=quoter non fill, f=quoter fill, h=hedger - auto scoped_log = - _order_services->log_scope(ord_ev.trace, - "SpreaderOrder::_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; - - Quantity filled_qty = Quantity (ord_ev.filled_quantity); - Price last_price = Price(ord_ev.last_price), - order_price=Price(ord_ev.price); - if (!SpreaderUtils::order_acknowledged(status)){ - LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update, unack'ed " - "callback for key:{} sec_key:{} order_key:{} " - "status:{} ignoring", - key(), sec_key, order_key, status); - bts_assert(filled_qty.value() == 0); - return; - } - SpreaderLegData* leg_data_ptr = _bookkeeping_data().find_leg_from_quoter_orderkey(order_key); - if (leg_data_ptr != nullptr){ - SpreaderLegData& leg_data = *leg_data_ptr; - ChildOrderError order_error = _get_order_error (ord_ev, - leg_data.quoter().expecting_cancel_update()); - LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " - "key:{} sec_key:{} state:{} order_key:{} status:{} " - "filled_qty:{} price:{} last_price:{} " - "msg:{} child_order_error:{}", - key(), sec_key, - static_cast(_state_worker->state()), order_key, status, - filled_qty, order_price, last_price, - ord_ev.last_msg, static_cast(order_error)); - 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){ - cb_type='f'; - LOG(OrderMan,Info,"h_p f child update {0}",_diff_ns()); - _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); - } - else{ - cb_type='q'; - LOG(OrderMan,Info,"h_p q child update {0}",_diff_ns()); - _state_worker->on_quoter_order_status_update (leg_data); - } + auto start = _perf_ts; + bool order_acked = SpreaderUtils::order_acknowledged(ord_ev.status); + if (!_active || !order_acked) + LOG(OrderMan,Info,"SpreaderOrder::_on_child_order_update ignoring " + "key:{} order_key:{} active:{} acked: {}", + key(),ord_ev.definition->security_key(),_active,order_acked); + else{ + //q=quoter non fill, f=quoter fill, h=hedger + char cb_type='q'; + SpreaderLegData* leg_data_ptr = + _bookkeeping_data().find_leg_from_quoter_orderkey(ord_ev.key); + auto scoped_log = _order_services->log_scope(ord_ev.trace, + "SpreaderOrder::_on_child_order_update", + key().value()); + if (leg_data_ptr == nullptr){ + cb_type = 'h'; + _on_non_quoter_order(ord_ev); } else - _state_worker->on_quoter_order_error (leg_data); + _on_quoter_order(ord_ev,*leg_data_ptr,cb_type); + LOG(OrderMan,Info,"h_p cb done {} {}",cb_type, _diff_ns()); + _send_check_termination(true); + _report_state(); + LOG(OrderMan, Info,"h_p end {} {}",cb_type, _diff_ns()); + LOG(OrderMan, Info,"_on_child_order_update {} {}", + cb_type, + (utils::TimeStamp::now()-start).nanoseconds()); } +} +void SpreaderOrder::_on_quoter_order(const OrderStateUpdateEvent& ord_ev, + SpreaderLegData& leg_data, + char& ord_indicator){ + ChildOrderError order_error = _get_order_error (ord_ev, + leg_data.quoter().expecting_cancel_update()); + LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " + "key:{} sec_key:{} state:{} order_key:{} status:{} " + "filled_qty:{} price:{} last_price:{} " + "msg:{} child_order_error:{}", + key(), + ord_ev.definition->security_key(), + static_cast(_state_worker->state()), + ord_ev.key, + ord_ev.status, + ord_ev.filled_quantity, + ord_ev.price, + ord_ev.last_price, + ord_ev.last_msg, + static_cast(order_error)); + leg_data.order_update_message().on_order_update(ord_ev); + if (order_error != ChildOrderError::NONE) + _state_worker->on_quoter_order_error (leg_data); else{ - // should be a hedge order then - SingleFillHedger* hedger = _bookkeeping_data().find_hedger_from_orderkey(order_key); - if (hedger != nullptr){ - cb_type='h'; - ChildOrderError order_error = _get_order_error (ord_ev, - hedger->expecting_cancel_update()); - LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger " + if (leg_data.order_update_message().last_update_filled_quantity().value() == 0){ + LOG(OrderMan,Info,"h_p q child update {0}",_diff_ns()); + _state_worker->on_quoter_order_status_update (leg_data); + } + else{ + ord_indicator = 'f'; + LOG(OrderMan,Info,"h_p f child update {0}",_diff_ns()); + _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); + } + } +} +void SpreaderOrder::_on_non_quoter_order(const OrderStateUpdateEvent& ord_ev){ + + SingleFillHedger* hedger_ptr = + _bookkeeping_data().find_hedger_from_orderkey(ord_ev.key); + if (hedger_ptr != nullptr){ + SingleFillHedger& hedger = *hedger_ptr; + ChildOrderError order_error = _get_order_error (ord_ev, + hedger.expecting_cancel_update()); + LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger " "key:{} sec_key:{} state:{} order_key:{} status:{} " "filled_qty:{} price:{} last_price:{} " "msg:{} child_order_error:{}", - key(), sec_key, - static_cast(_state_worker->state()), order_key, status, - filled_qty, order_price, last_price, - ord_ev.last_msg, static_cast(order_error)); - hedger->order_state().on_order_update(ord_ev); - if (order_error == ChildOrderError::NONE) - _state_worker->on_hedger_order_update (*hedger); - else - _state_worker->on_hedger_order_error (*hedger); - } + key(), + ord_ev.definition->security_key(), + static_cast(_state_worker->state()), + ord_ev.key, + ord_ev.status, + ord_ev.filled_quantity, + ord_ev.price, + ord_ev.last_price, + ord_ev.last_msg, + static_cast(order_error)); + hedger.order_state().on_order_update(ord_ev); + if (order_error == ChildOrderError::NONE) + _state_worker->on_hedger_order_update (hedger); else - LOG(OrderMan, Error, "SpreaderOrder::_on_child_order_update unknown ord " - "key:{} sec_key:{} order_key:{} status:{} " - "filled_qty:{} last_price:{} msg:{}", - key(), sec_key, order_key, status, filled_qty, - last_price, ord_ev.last_msg); + _state_worker->on_hedger_order_error (hedger); } - LOG(OrderMan,Info,"h_p cb done {} {}",cb_type, _diff_ns()); - _send_check_termination(true); - _report_state(); - LOG(OrderMan, Info,"h_p end {} {}",cb_type, _diff_ns()); - LOG(OrderMan, Info,"_on_child_order_update {} {}", - cb_type, - (utils::TimeStamp::now()-now).nanoseconds()); + else + LOG(OrderMan, Error, "SpreaderOrder::_on_child_order_update " + "unknown ord " + "key:{} sec_key:{} order_key:{} status:{} " + "filled_qty:{} last_price:{} msg:{}", + key(), + ord_ev.definition->security_key(), + ord_ev.key, + ord_ev.status, + ord_ev.filled_quantity, + ord_ev.last_price, + ord_ev.last_msg); } // State Transformations //////////////////// ///////////////////////////////////////////// diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 6733bc25f..9910a0ef6 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -132,6 +132,11 @@ private: void _on_book_update(const BookUpdateEvent&); void _on_settlement_update(const SettlementUpdateEvent&); void _on_child_order_update(const OrderStateUpdateEvent&); + // order handling + void _on_quoter_order (const OrderStateUpdateEvent& ord_ev, + SpreaderLegData& leg, + char& ord_indicator); + void _on_non_quoter_order (const OrderStateUpdateEvent& ord_ev); // State Transformations //////////////////// ///////////////////////////////////////////// void _transform_to_START(); @@ -263,12 +268,23 @@ private: // access to the internal state ////////////////////////////////// public: - SpreaderState test_only_func_spreader_state () {return _state_worker->state();} - SpreaderLegData& test_only_func_spreader_leg_data (size_t index) {return _bookkeeping_data().get_leg_data (index);} - SpreaderBookkeepingData& test_only_func_spreader_full_data () {return _bookkeeping_data();} + SpreaderState test_only_func_spreader_state () const { + return _state_worker->state(); + } + SpreaderLegData& test_only_func_spreader_leg_data (size_t index) { + return _bookkeeping_data().get_leg_data (index); + } + 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 BookUpdateEvent& b) { + _on_book_update(b); + } + void test_only_on_book_update(const Book& b, + trace::CorID const&trace) { + _on_book_update(BookUpdateEvent(b, trace)); + } void test_only_on_child_order_update (OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, @@ -281,10 +297,18 @@ public: order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); order_state.set_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, + trace::CorID()); _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);} + void test_only_on_init_new( + const bts::api::orderman::OrderDefinition& order_def, + const SpreaderPreActivationOrderServices& pao_services) { + _on_init_new(order_def, pao_services); + } void test_only_on_activate(Price price, Quantity quantity, SpreaderOrderServices& order_services) { 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 84b06382f..3ade9ddae 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -105,7 +105,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, SpreaderLegData& other_leg_data = _spreader->_bookkeeping_data().get_leg_data (q_idx); Price hedge_price; double hedge_qty; - LOG(OrderMan, Info,"h_p_i chpq_b {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); + LOG(OrderMan, Info,"h_p_i c_b {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); _spreader->_compute_hedge_price_quantity(leg_data.leg_property_data().leg_index(), order_update_message.last_update_filled_price(), order_update_message.last_update_filled_quantity().value(), @@ -113,7 +113,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, q_idx, hedge_price, hedge_qty); - LOG(OrderMan, Info,"h_p_i chpq_e {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); + LOG(OrderMan, Info,"h_p_i c_e {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); uint32_t total_unhedged_qty=leg_unhedged_delta.subtract_hedge_if_available(); 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 5ac4671e7..1132d7c89 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3675,7 +3675,22 @@ TEST_CASE ("4legs_hedging", "[spreader_perf]") // hedging takes // 30,000 : 30,10-40 (initial call, subsequent first calls) // 30,000* : 40,20-40 (real sleep vs busy spin) - test_sleep(30000,false); + // this is how the sleep bw the hedges + // effect the tight loop time + // 0 4-5 + // 1000 4-5 + // 3000 4-5 + // 5000 4-5 + // 10000 6-7 + // 15000 6-7 + // 20000 6-7 + // 30000 6-7 + // --------------- + // sleeping the thread gives much + // higher times + // 1* 25 + // 30000* 25 + test_sleep(30000,true); spreader._touch_hedging_data(); for(uint32_t h=0; h Date: Wed, 2 Jan 2019 13:37:56 -0500 Subject: [PATCH 022/103] cleaning up logs, and indentation --- .../orders/spreader_orders/SpreaderOrder.cpp | 28 +++++++++---------- .../SpreaderWorkingStateWorker.cpp | 9 ++---- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 7c2994d1a..f41fb6937 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -153,20 +153,20 @@ void SpreaderOrder::_on_quoter_order(const OrderStateUpdateEvent& ord_ev, ChildOrderError order_error = _get_order_error (ord_ev, leg_data.quoter().expecting_cancel_update()); LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " - "key:{} sec_key:{} state:{} order_key:{} status:{} " - "filled_qty:{} price:{} last_price:{} " - "msg:{} child_order_error:{}", - key(), - ord_ev.definition->security_key(), - static_cast(_state_worker->state()), - ord_ev.key, - ord_ev.status, - ord_ev.filled_quantity, - ord_ev.price, - ord_ev.last_price, - ord_ev.last_msg, - static_cast(order_error)); - leg_data.order_update_message().on_order_update(ord_ev); + "key:{} sec_key:{} state:{} order_key:{} status:{} " + "filled_qty:{} price:{} last_price:{} " + "msg:{} child_order_error:{}", + key(), + ord_ev.definition->security_key(), + static_cast(_state_worker->state()), + ord_ev.key, + ord_ev.status, + ord_ev.filled_quantity, + ord_ev.price, + ord_ev.last_price, + ord_ev.last_msg, + static_cast(order_error)); + leg_data.order_update_message().on_order_update(ord_ev); if (order_error != ChildOrderError::NONE) _state_worker->on_quoter_order_error (leg_data); else{ 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 3ade9ddae..623bd149c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -79,7 +79,6 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, trace::CorID trace){ LOG(OrderMan, Info,"h_p w start {0}",_spreader->_diff_ns()); //_spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); - auto state_ts = utils::TimeStamp::now(); // 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 @@ -98,14 +97,11 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // getting overfilled SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); bts_assert (order_update_message.last_update_filled_quantity().value() > 0); - LOG(OrderMan, Info,"h_p_i beg {}", _spreader->_diff_ns(state_ts)); for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ - state_ts = utils::TimeStamp::now(); if (q_idx != leg_data.leg_property_data().leg_index()){ SpreaderLegData& other_leg_data = _spreader->_bookkeeping_data().get_leg_data (q_idx); Price hedge_price; double hedge_qty; - LOG(OrderMan, Info,"h_p_i c_b {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); _spreader->_compute_hedge_price_quantity(leg_data.leg_property_data().leg_index(), order_update_message.last_update_filled_price(), order_update_message.last_update_filled_quantity().value(), @@ -113,12 +109,11 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, q_idx, hedge_price, hedge_qty); - LOG(OrderMan, Info,"h_p_i c_e {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); + LOG(OrderMan, Info,"h_p comp {0} {1}", q_idx, _spreader->_diff_ns()); UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); uint32_t total_unhedged_qty=leg_unhedged_delta.subtract_hedge_if_available(); - LOG(OrderMan, Info,"h_p_i delta {0} {1}", q_idx, _spreader->_diff_ns(state_ts)); - LOG(OrderMan, Info,"h_p comp {0} {1}", q_idx, _spreader->_diff_ns()); + LOG(OrderMan, Info,"h_p delta {0} {1}", q_idx, _spreader->_diff_ns()); if (total_unhedged_qty != 0){ // if it is an actively quoting leg, inform the quoter about it // so it can decrease the proportional size From 17a8d47452ef77120465991b4aca24820d2102fb Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Fri, 30 Nov 2018 09:51:01 -0500 Subject: [PATCH 023/103] Spark-1877: Add TestType to TestGroupAttribute --- src/client/spark_core/TestRunner/TestAttributes.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/client/spark_core/TestRunner/TestAttributes.cs b/src/client/spark_core/TestRunner/TestAttributes.cs index 67db1a889..67728d29a 100644 --- a/src/client/spark_core/TestRunner/TestAttributes.cs +++ b/src/client/spark_core/TestRunner/TestAttributes.cs @@ -2,8 +2,16 @@ namespace bts.test { + public enum TestType { + Unit, System, Shell + } + [AttributeUsage(AttributeTargets.Class)] public class TestGroupAttribute : Attribute { + public TestGroupAttribute() { + this.TestType = TestType.Unit; + } + public TestType TestType; } [AttributeUsage(AttributeTargets.Method)] public class TestAttribute : Attribute { From 64e2408b59a8072ff2c69ff57cae7702032e9e19 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 20 Dec 2018 20:30:10 -0500 Subject: [PATCH 024/103] It is not always safe to convert Foo to FooImmutable. It is always safe to convert it to Nullabke --- .../Market/MarketView/MarketViewRow.cs | 24 +++++++------------ .../Market/TimeAndSales/TimeAndSalesModel.cs | 7 ++++-- .../spark/Modules/Spreader/SpreaderModel.cs | 4 ++-- .../Modules/Spreader/VM/SyntheticEditorVM.cs | 6 ++--- .../spark/Modules/Trading/Fills/FillsVM.cs | 4 ++-- .../spark/Orders/OrderPropertiesEditorVM.cs | 10 ++++---- .../Orders/OrderTypeVMs/SpreaderOrderVM.cs | 3 ++- src/client/spark/Orders/OrdersModel.cs | 11 +++++---- .../Dialogs/SupportRequestWindow.xaml.cs | 8 ++++--- src/client/spark/view/Spark/Core/TickUtils.cs | 12 +++++++--- .../view/Spark/Utilities/OrderDataHelper.cs | 3 ++- src/client/spark_api/md/MDSource.cs | 2 +- .../spark_api/security/SecurityFormatter.cs | 3 ++- .../spark_api/security/SecurityHelper.cs | 22 ++++------------- .../spark_test/Security/SecurityTests.cs | 7 +++--- .../templates/c#/immutable.pb.cs | 5 ++-- 16 files changed, 64 insertions(+), 67 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 4dce5ec3a..5eda77cdf 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -210,36 +210,28 @@ namespace mbts.spark { var order = _orders_model.factory.order(security); switch (col) { case MarketViewView.Columns.Bid: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, bid_price, 0u)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), bid_price, 0u)); break; case MarketViewView.Columns.BidMergedSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, bid_price, bid_merged_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), bid_price, bid_merged_size)); break; case MarketViewView.Columns.BidDirectSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, bid_price, bid_direct_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), bid_price, bid_direct_size)); break; case MarketViewView.Columns.BidImpliedSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, bid_price, bid_implied_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), bid_price, bid_implied_size)); break; case MarketViewView.Columns.Ask: - order.Side = Side.Buy; - _bus.post(SparkTags.ShowOrderTicketTag, (order, ask_price, 0u)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Buy), ask_price, 0u)); break; case MarketViewView.Columns.AskMergedSize: - order.Side = Side.Buy; - _bus.post(SparkTags.ShowOrderTicketTag, (order, ask_price, ask_merged_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Buy), ask_price, ask_merged_size)); break; case MarketViewView.Columns.AskDirectSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, ask_price, ask_direct_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), ask_price, ask_direct_size)); break; case MarketViewView.Columns.AskImpliedSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, ask_price, ask_implied_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), ask_price, ask_implied_size)); break; case MarketViewView.Columns.Last: _bus.post(SparkTags.ShowOrderTicketTag, (order, last_price, 0u)); diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs index fb5b92f62..090cd58ad 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs @@ -97,8 +97,11 @@ namespace mbts.spark { public IEnumerable read_trades() { var copy = _securities; foreach (var tm in _channel.read_trades(ref _cursor)) { - if (copy.TryGetValue(tm.Key, out SecurityImmutable sec)) - yield return new TradeInfo(sec, tm); + if (copy.TryGetValue(tm.Key, out SecurityImmutable sec)) { + if (tm != null) { + yield return new TradeInfo(sec, new TradeMessageImmutable(tm)); + } + } } } } diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index c1f82ab8a..346f74e22 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -53,8 +53,8 @@ namespace mbts.spark { return null; } - public async Task create_synthetic(SecurityImmutable synthetic) { - var result = await _service.create_synthetic_async(synthetic); + public async Task create_synthetic(SecurityImmutable? synthetic) { + var result = await _service.create_synthetic_async(synthetic.Value); return _error.handle_error(result, "Error creating synthetic: {0}", r => r.Error, e => e == CreateResult.Types.Error.Ok, r => new uint?(r.Key), () => null).result; } diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index 6381e8f5d..093d9f4d9 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -294,9 +294,9 @@ namespace mbts.spark { base.Dispose(disposing); } - static string _deduce_symbol(SecurityImmutable security) { - if (!string.IsNullOrWhiteSpace(security.Symbol)) return security.Symbol; - if (security.Synthetic.Legs.Count() > 0) return security.Synthetic.Legs.First().Security.Symbol; + static string _deduce_symbol(SecurityImmutable? security) { + if (!string.IsNullOrWhiteSpace(security?.Symbol)) return security?.Symbol; + if (security?.Synthetic.Legs.Count() > 0) return security?.Synthetic.Legs.First().Security.Symbol; return string.Empty; } diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 320db04d9..595108167 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -178,7 +178,7 @@ namespace mbts.spark { } else return model.on_fill_tuples; } - static IConnectableObservable> _get_observable(IBus bus, OrdersModel model, IObservable state) => + static IConnectableObservable> _get_observable(IBus bus, OrdersModel model, IObservable state) => state.SelectManyInSeries(s => _get_observable(bus, model, s)); public class Row : SecurityRow, IEquatable, IRowVM { @@ -186,7 +186,7 @@ namespace mbts.spark { readonly FillImmutable _fill; readonly OrderRecordImmutable _order; - public Row(FillTuple fill_tuple, OrdersModel model) : base(fill_tuple.security_md.HasValue ? fill_tuple.security_md.Value.security : SecurityDataHelper.Defaults.Security) { + public Row(FillTuple fill_tuple, OrdersModel model) : base(fill_tuple.security_md.HasValue ? fill_tuple.security_md.Value.security : SecurityDataHelper.Defaults.SecurityImmutable) { _fill = fill_tuple.fill; _order = fill_tuple.order ?? OrderDataHelper.Defaults.OrderRecordImmutable; _model = model; diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 509c67f35..53cb911f1 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -139,13 +139,13 @@ namespace mbts.spark { tif => time_in_forces.Contains(tif)); _dispose = Disposable.Create(() => _order_type.Changed -= on_selected_order_type_changed); // local methods - IOrderTypeVM create_order_type_vm(CustomOrderDefinitionImmutable cd, string id, string display_name) { + IOrderTypeVM create_order_type_vm(CustomOrderDefinitionImmutable? cd, string id, string display_name) { IOrderTypeVM vm = null; - if(cd.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) - vm = OrderTypeVMFactory.create(cd.CustomCase, id, display_name, model, security_md_source, cd.Dynamic.DynamicOrderType); + if(cd?.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) + vm = OrderTypeVMFactory.create(cd.Value.CustomCase, id, display_name, model, security_md_source, cd.Value.Dynamic.DynamicOrderType); else - vm = OrderTypeVMFactory.create(cd.CustomCase, id, display_name, model, security_md_source); - vm.load_from(cd); + vm = OrderTypeVMFactory.create(cd.Value.CustomCase, id, display_name, model, security_md_source); + vm.load_from(cd.Value); return vm; } InlineUserProperty get_order_type_vm_prop(InlineOrderProperties p) { diff --git a/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs index 7ac53dcc6..f869cc4fd 100644 --- a/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs @@ -19,7 +19,8 @@ namespace mbts.spark { var so = model.factory.spreader_order(); so.Security = s.CloneToMutable(); so.ExecutionStrategy = strategy.CloneToMutable(); - return new InlineUserProperty(so, true); + var soi = new SpreaderOrderDefinitionImmutable(so); + return new InlineUserProperty(soi, true); })), id, display_name) { } public SpreaderOrderVM( diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index bf24da63c..eba27fea3 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -93,10 +93,13 @@ namespace mbts.spark { #endregion #region Input - public async Task send_order(OrderDefinitionImmutable order, double price, uint size) { - var result = (await send_order_get_error(order, price, size)); - _activity.on_send_order(order, price, size, result.key, result.error); - return result.key; + public async Task send_order(OrderDefinitionImmutable? order, double price, uint size) { + if (order.HasValue) { + var result = (await send_order_get_error(order.Value, price, size)); + _activity.on_send_order(order.Value, price, size, result.key, result.error); + return result.key; + } + return 0; } async Task<(uint? key, string error)> send_order_get_error(OrderDefinitionImmutable order, double price, uint size) { diff --git a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs index 5f4638b6b..89e202b05 100644 --- a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs +++ b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs @@ -34,9 +34,11 @@ namespace bts.view.controls { private void any_button_click(object sender, RoutedEventArgs e) { Close(); } - internal static void Show(ErrorReportService srv, ErrorReport report) { - var window = new SupportRequestWindow(new SupportRequestVM(srv, report)); - window.Show(); + internal static void Show(ErrorReportService srv, ErrorReportImmutable? report) { + if (report.HasValue) { + var window = new SupportRequestWindow(new SupportRequestVM(srv, report.Value)); + window.Show(); + } } } diff --git a/src/client/spark/view/Spark/Core/TickUtils.cs b/src/client/spark/view/Spark/Core/TickUtils.cs index 180f1a3b1..e2658ce21 100644 --- a/src/client/spark/view/Spark/Core/TickUtils.cs +++ b/src/client/spark/view/Spark/Core/TickUtils.cs @@ -123,7 +123,7 @@ namespace mbts.spark { return intpart + floatpart; } - public static RegionalTickFactors get_regional_ticks(ContractSpecificationImmutable spec) => + public static RegionalTickFactors get_regional_ticks(ContractSpecificationImmutable? spec) => TickStore.get(spec); public static RegionalTickFactors get_regional_ticks(SecurityImmutable security) => @@ -177,8 +177,14 @@ namespace mbts.spark { public static RegionalTickFactors get(ContractSpecification spec) => _exchange_ticks.GetOrAdd(new SpecKey(spec), _create_rtf); - public static RegionalTickFactors get(ContractSpecificationImmutable spec) => - _exchange_ticks.GetOrAdd(new SpecKey(spec), _create_rtf); + public static RegionalTickFactors get(ContractSpecificationImmutable? spec) { + if (spec.HasValue) { + return _exchange_ticks.GetOrAdd(new SpecKey(spec.Value), _create_rtf); + } + else { + return null; + } + } public static RegionalTickFactors get(SecurityImmutable security) => security.HasContractSpec ? get(security.ContractSpec) : default_rtf; diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index e9ef09d5b..922765656 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -165,7 +165,8 @@ namespace mbts.spark.utilities { } #endregion - public OrderDefinition order(SecurityImmutable security) => order(security, _admin_model.get_default_account()); + public OrderDefinitionImmutable order(SecurityImmutable security) => + new OrderDefinitionImmutable(order(security, _admin_model.get_default_account())); public OrderDefinition order(SecurityImmutable security, AccountTuple? account) { var rv = new OrderDefinition { SecurityKey = security.Id, diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs index c329f6216..9fdebb63b 100644 --- a/src/client/spark_api/md/MDSource.cs +++ b/src/client/spark_api/md/MDSource.cs @@ -54,7 +54,7 @@ namespace bts.md { foreach (var v in values) { - var smd = new SecurityMD(v.security, v.handle); + var smd = new SecurityMD(new SecurityImmutable(v.security), v.handle); _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); } _version += 1; diff --git a/src/client/spark_api/security/SecurityFormatter.cs b/src/client/spark_api/security/SecurityFormatter.cs index c03482ef1..2c3da3954 100644 --- a/src/client/spark_api/security/SecurityFormatter.cs +++ b/src/client/spark_api/security/SecurityFormatter.cs @@ -22,7 +22,8 @@ namespace bts.api { static readonly ConcurrentDictionary _formatted_names_cache = new ConcurrentDictionary(); public static string format(Security security) => - _formatted_names_cache.GetOrAdd(security.Id, _format(security)); + security != null ? + _formatted_names_cache.GetOrAdd(security.Id, _format(new SecurityImmutable(security))) : ""; public static string format(SecurityImmutable security) => _formatted_names_cache.GetOrAdd(security.Id, _ => _format(security)); diff --git a/src/client/spark_api/security/SecurityHelper.cs b/src/client/spark_api/security/SecurityHelper.cs index af11abc23..7ef75b988 100644 --- a/src/client/spark_api/security/SecurityHelper.cs +++ b/src/client/spark_api/security/SecurityHelper.cs @@ -66,24 +66,10 @@ namespace bts.api { public static readonly IComparer InstanceImmutable = Comparer.Create(Compare); public static int Compare(Security x, Security y) { - if (x.ContractCase == ContractOneofCase.Future) return y.ContractCase == ContractOneofCase.Future ? Compare(x.Symbol, x.Future, y.Symbol, y.Future) : -1; - else if (y.ContractCase == ContractOneofCase.Future) return 1; - var xlegs = get_flat_future_legs(x).ToList(); - var ylegs = get_flat_future_legs(y).ToList(); - int max = Math.Min(xlegs.Count, ylegs.Count); - for (int i = 0; i < max; i++) { - int rv = Compare(xlegs[i].symbol, xlegs[i].future, ylegs[i].symbol, ylegs[i].future); - if (rv != 0) return rv; - } - for (int i = 0; i < max; i++) { - int rv = xlegs[i].quantity.CompareTo(ylegs[i].quantity); - if (rv != 0) return rv; - } - for (int i = 0; i < max; i++) { - int rv = xlegs[i].exchange.CompareTo(ylegs[i].exchange); - if (rv != 0) return rv; - } - return xlegs.Count.CompareTo(ylegs.Count); + if (ReferenceEquals(x, y)) return 0; // x ==y + if (x == null) return 1; // y > x + if (y == null) return -1; // x > y + return Compare(new SecurityImmutable(x), new SecurityImmutable(y)); } public static int Compare(SecurityImmutable x, SecurityImmutable y) { diff --git a/src/client/spark_test/Security/SecurityTests.cs b/src/client/spark_test/Security/SecurityTests.cs index 63104702a..f564bd858 100644 --- a/src/client/spark_test/Security/SecurityTests.cs +++ b/src/client/spark_test/Security/SecurityTests.cs @@ -12,9 +12,10 @@ namespace bts.mcore class SecurityTests { [Test] public void test_security_equal() { - SecurityImmutable a = new Security() { Id = 42 }; - SecurityImmutable b = new Security() { Id = 42 }; - SecurityImmutable c = new Security() { Id = 4 }; + + SecurityImmutable a = new SecurityImmutable(new Security() { Id = 42 }); + SecurityImmutable b = new SecurityImmutable(new Security() { Id = 42 }); + SecurityImmutable c = new SecurityImmutable(new Security() { Id = 4 }); Assert.IsTrue(a == b); Assert.IsTrue(a.Equals(b)); diff --git a/src/lib/api/service_compiler/templates/c#/immutable.pb.cs b/src/lib/api/service_compiler/templates/c#/immutable.pb.cs index 4972886db..06c8260c6 100644 --- a/src/lib/api/service_compiler/templates/c#/immutable.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/immutable.pb.cs @@ -31,8 +31,9 @@ namespace {{package}} { public {{name}} CloneToMutable() { return _impl.Clone(); } // Implicit conversion operator - public static implicit operator {{name}}Immutable({{name}} other) { - return new {{name}}Immutable(other, false); + public static implicit operator Nullable<{{name}}Immutable>({{name}} other) { + if (other == null) return null; + else return new {{name}}Immutable(other, false); } public override bool Equals(object other) { From c2070b8e52a1cf32142607e541637370b39489de Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 21 Dec 2018 10:38:56 -0500 Subject: [PATCH 025/103] CR feedback - immutables --- .../Market/TimeAndSales/TimeAndSalesModel.cs | 4 ++-- .../spark_api/security/SecurityFormatter.cs | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs index 090cd58ad..48a11aff0 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs @@ -97,8 +97,8 @@ namespace mbts.spark { public IEnumerable read_trades() { var copy = _securities; foreach (var tm in _channel.read_trades(ref _cursor)) { - if (copy.TryGetValue(tm.Key, out SecurityImmutable sec)) { - if (tm != null) { + if (tm != null) { + if (copy.TryGetValue(tm.Key, out SecurityImmutable sec)) { yield return new TradeInfo(sec, new TradeMessageImmutable(tm)); } } diff --git a/src/client/spark_api/security/SecurityFormatter.cs b/src/client/spark_api/security/SecurityFormatter.cs index 2c3da3954..0a328cdf2 100644 --- a/src/client/spark_api/security/SecurityFormatter.cs +++ b/src/client/spark_api/security/SecurityFormatter.cs @@ -22,8 +22,7 @@ namespace bts.api { static readonly ConcurrentDictionary _formatted_names_cache = new ConcurrentDictionary(); public static string format(Security security) => - security != null ? - _formatted_names_cache.GetOrAdd(security.Id, _format(new SecurityImmutable(security))) : ""; + _formatted_names_cache.GetOrAdd(security.Id, _format(security)); public static string format(SecurityImmutable security) => _formatted_names_cache.GetOrAdd(security.Id, _ => _format(security)); @@ -38,17 +37,17 @@ namespace bts.api { $"{symbol}{DateFormatter.Format(future.ExpirationYear, future.ExpirationMonth, future.ExpirationDay, DateFormat.MonthCodeLastDigitYear)}" : exch_desc; - static string _format(SecurityImmutable security) { - switch (security.ContractCase) { - case ContractOneofCase.Future: return format_future(security.Symbol, security.glbx_desc(), security.Future); + static string _format(SecurityImmutable? security) { + switch (security?.ContractCase) { + case ContractOneofCase.Future: return format_future(security?.Symbol, security?.glbx_desc(), security.Value.Future); case ContractOneofCase.Spread: - if (security.HasGlbx) { + if (security?.HasGlbx == true) { // In case we ever bring it back, pretty printed spread names can be found here: // GlbxSecurityFormatter.FormatSpread(security, out string result) - return security.Glbx.SecurityDesc; + return security?.Glbx.SecurityDesc; } - return string.Join("", _format_future_legs(SecurityHelper.get_flat_future_legs(security.Spread.Legs))); - case ContractOneofCase.Synthetic: return security.Synthetic.Name; + return string.Join("", _format_future_legs(SecurityHelper.get_flat_future_legs(security?.Spread.Legs))); + case ContractOneofCase.Synthetic: return security?.Synthetic.Name; default: return "Unknown-security"; } } From b866157bff562762de34bc5cbbd324948f8c3ae2 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 3 Jan 2019 14:24:33 -0500 Subject: [PATCH 026/103] SPARK-1959 partially done --- .../orderman/events/OrderStateUpdateEvent.h | 4 +- .../orders/spreader_orders/SpreaderOrder.cpp | 30 +++++++++++++-- .../orders/spreader_orders/SpreaderOrder.h | 1 + .../spreader/SingleLegQuoter.h | 7 ++++ .../spreader/SpreaderChildOrderState.h | 38 ++++++++++++------- .../hedger_states/HedgerStartStateWorker.cpp | 8 ++-- .../SpreaderWorkingStateWorker.cpp | 11 ++++-- .../spreader_orders/tests/spreader_tests.cpp | 2 +- 8 files changed, 75 insertions(+), 26 deletions(-) diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 678b5f9c9..2c38a8a78 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -16,7 +16,8 @@ class OrderStateUpdateEvent : public mercury::Event { api::orderman::OrderDefinition const &def, api::orderman::OrderState const &state, trace::CorID const &trace = trace::CorID()) - : key(key), parent_key(parent_key), trace(trace), definition(&def) { + : key(key), parent_key(parent_key), trace(trace), definition(&def), + fake_fill_qty(0) { status = state.status(); price = state.price(); @@ -64,6 +65,7 @@ class OrderStateUpdateEvent : public mercury::Event { mercury::TimeStampStr last_transact_time; api::orderman::OrderDefinition const *definition; + uint32_t fake_fill_qty; api::orderman::OrderState rebuild_state() const { api::orderman::OrderState result; diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index f41fb6937..4829d7e08 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -104,7 +104,6 @@ void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ auto scoped = _order_services->log_scope(book_event.trace, "SpreaderOrder::_on_book_update", key().value()); _state_worker->on_book (book_event.book,book_event.trace); - //_keep_hedging_path_hot (); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event){ @@ -116,15 +115,38 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event.settlement_price.price()); _state_worker->on_settlement_price(settlement_event); } +void SpreaderOrder::_keep_hedging_path_hot_2(){ + // for each quoting leg + if(_inited() && _active) + for(size_t i=0;i<_bookkeeping_data().n_legs();i++){ + SpreaderLegData& leg=_bookkeeping_data().get_leg_data(i); + if(leg.leg_property_data().is_active_quoting() && + leg.quoter().is_working_order()){ + auto& q_ord = leg.order_update_message(); + bts::api::orderman::OrderState state; + state.set_filled_quantity(q_ord.current_fills().value()); + state.set_last_price(q_ord.last_update_filled_price().value()); + OrderStateUpdateEvent ord_ev (q_ord.order_key(), + key(), + leg.leg_property_data().quoter_order_definition(), + state); + ord_ev.status=q_ord.status(); + ord_ev.price=q_ord.last_reported_order_price().value(); + ord_ev.fake_fill_qty = 77; + _on_child_order_update(ord_ev); + } + } +} + void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ _perf_ts=utils::TimeStamp::now(); auto start = _perf_ts; bool order_acked = SpreaderUtils::order_acknowledged(ord_ev.status); if (!_active || !order_acked) LOG(OrderMan,Info,"SpreaderOrder::_on_child_order_update ignoring " - "key:{} order_key:{} active:{} acked: {}", - key(),ord_ev.definition->security_key(),_active,order_acked); - else{ + "key:{} active:{} acked: {}", + key(),_active,order_acked); + else{ //q=quoter non fill, f=quoter fill, h=hedger char cb_type='q'; SpreaderLegData* leg_data_ptr = diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 9910a0ef6..91f8c62a6 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -260,6 +260,7 @@ private: return rv; } public:void _keep_hedging_path_hot(); + void _keep_hedging_path_hot_2(); // void _touch_hedging_data (); // testing only ////////////////// diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index c31199d21..e6966ca3d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -119,6 +119,13 @@ public: // be in an unknown state, but as long as an order has been sent // and it has not reached a terminal state, its considered "active" bool is_active_order() const; + // contrary t theabove, the order is surely in a working state, ie + // has been acknowledged and is out there + bool is_working_order() const{ + return _worker != nullptr && + _worker->state() == QuoterState::WORKING && + _child_order_state.status() == api::orderman::OrderStatus::ORDER_STATUS_WORKING; + } // returns true if the quoter is in the final state, from which // it will never come back bool is_terminal_state () const; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 6137f897c..dfd216c8f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -48,6 +48,8 @@ private: Price _out_price; Quantity _out_quantity; bts::TimeStamp _order_place_time; +public: + Quantity fake_fill_qty; public: // constructors /////////////////// /////////////////////////////////// @@ -85,7 +87,8 @@ public: // if the last fill was a status change // this will be zero Quantity last_update_filled_quantity () const { - return _last_filled_quantity; + return Quantity(_last_filled_quantity.value() + + fake_fill_qty.value()); } bool terminal_status() const { return SpreaderUtils::order_in_terminal_state(_status); @@ -136,19 +139,26 @@ public: // OrderStateUpdateEvent gives total filled qty and // last filled price void on_order_update(const OrderStateUpdateEvent& e){ - bts_assert(!_is_live || e.key == order_key()); - bts_assert(e.filled_quantity >= _filled_quantity.value()); - _status = e.status; - _last_filled_quantity = Quantity(e.filled_quantity - - _filled_quantity.value()); - _last_filled_price = Price(e.last_price); - _last_reported_order_price=Price(e.price); - SpreaderUtils::compute_average_price(_filled_price, - _filled_quantity, - _last_filled_price, - _last_filled_quantity, - _filled_price, - _filled_quantity); + fake_fill_qty = Quantity(e.fake_fill_qty); + if (e.fake_fill_qty != 0){ + LOG(OrderMan, Info, "SpreaderChildOrderState::on_order_update " + "fake update"); + } + else{ + bts_assert(!_is_live || e.key == order_key()); + bts_assert(e.filled_quantity >= _filled_quantity.value()); + _status = e.status; + _last_filled_quantity = Quantity(e.filled_quantity + - _filled_quantity.value()); + _last_filled_price = Price(e.last_price); + _last_reported_order_price=Price(e.price); + SpreaderUtils::compute_average_price(_filled_price, + _filled_quantity, + _last_filled_price, + _last_filled_quantity, + _filled_price, + _filled_quantity); + } } // order actions //////////////////// ///////////////////////////////////// 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 86f618d80..9cd60deb1 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 @@ -12,9 +12,11 @@ void HedgerStartStateWorker::init (Price price, _hedger->_price_quantity_state.re_init(price,quantity); _hedger->_child_order_state.re_init(child_order); // this is the only place an order is enterred - _hedger->_place_order (price, - quantity); - _hedger->transform_to_WAITING_FOR_FIRST_ACK (); + if(quantity.value() > 0){ + _hedger->_place_order (price, + quantity); + _hedger->transform_to_WAITING_FOR_FIRST_ACK (); + } } void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ bts_assert_msg (false, "HedgerStartStateWorker::on_order_update " 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 623bd149c..266f34d37 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -95,7 +95,10 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // ii. not send a hedge on leg_2 since its already filled // however doing the above would mess up the leg ratio's so we are preffering // getting overfilled - SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); + SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); + double mult = 1.0; + if (order_update_message.fake_fill_qty.value()>0) + mult = 0.0; bts_assert (order_update_message.last_update_filled_quantity().value() > 0); for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ if (q_idx != leg_data.leg_property_data().leg_index()){ @@ -109,12 +112,14 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, q_idx, hedge_price, hedge_qty); + hedge_qty = hedge_qty * mult; // 0's it out for fake fills LOG(OrderMan, Info,"h_p comp {0} {1}", q_idx, _spreader->_diff_ns()); UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); - uint32_t total_unhedged_qty=leg_unhedged_delta.subtract_hedge_if_available(); + uint32_t total_unhedged_qty=leg_unhedged_delta.subtract_hedge_if_available(mult); + total_unhedged_qty = total_unhedged_qty * mult; LOG(OrderMan, Info,"h_p delta {0} {1}", q_idx, _spreader->_diff_ns()); - if (total_unhedged_qty != 0){ + if (total_unhedged_qty + order_update_message.fake_fill_qty.value() != 0 ){ // if it is an actively quoting leg, inform the quoter about it // so it can decrease the proportional size if (other_leg_data.leg_property_data().is_active_quoting()){ 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 1132d7c89..2019a615b 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3691,7 +3691,7 @@ TEST_CASE ("4legs_hedging", "[spreader_perf]") // 1* 25 // 30000* 25 test_sleep(30000,true); - spreader._touch_hedging_data(); + spreader._keep_hedging_path_hot_2(); for(uint32_t h=0; h Date: Thu, 3 Jan 2019 15:18:53 -0500 Subject: [PATCH 027/103] SPARK-1959 added get_new_hedger_order to ISpreaderManager --- src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp | 5 +++++ src/lib/orderman/orders/spreader_orders/SpreaderOrder.h | 1 + .../orders/spreader_orders/spreader/ISpreaderManager.h | 5 +++++ src/lib/orderman/orders/spreader_orders/tests/tests_common.h | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 4829d7e08..760d21a96 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -89,6 +89,11 @@ void SpreaderOrder::setup_new_quoter_order(size_t leg_index){ bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); leg_data.order_update_message().re_init(child_order); } +ChildOrder SpreaderOrder::get_new_hedge_order(size_t leg_index){ + SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(leg_index); + bts::orderman::ChildOrder child_order = leg_data.hedger_order_builder().build(); + return child_order; +} // events from orders system //////////////////// ///////////////////////////////////////////////// void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 91f8c62a6..03553a0dc 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -125,6 +125,7 @@ public: return _bookkeeping_data().get_leg_data(leg_index).leg_property_data(); } void setup_new_quoter_order (size_t leg_index) override; + ChildOrder get_new_hedge_order (size_t leg_index) override; private: // events from orders system //////////////////// ///////////////////////////////////////////////// diff --git a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h index c2275c050..ec3f7a116 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h @@ -1,5 +1,6 @@ #pragma once #include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/actors/order_manager/ChildOrder.h" namespace bts { namespace orderman { @@ -22,6 +23,10 @@ public: // this replaces the current quoter order with a new one // and updates the bookkeeping data virtual void setup_new_quoter_order (size_t leg_index) = 0; + // this simply returns a new ChildOrder for the hedger, + // it does not alter the state or has side effects (as + // as the spreader goes) + virtual ChildOrder get_new_hedge_order (size_t leg_index) = 0; virtual ~ISpreaderManager() {} }; }} 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 a8e1eee17..1c02c8f62 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -81,6 +81,10 @@ public: bts::orderman::ChildOrder child_order; _bookkeeping_data.get_leg_data(leg_idx).order_update_message().re_init(child_order); } + ChildOrder get_new_hedge_order (size_t) override{ + ChildOrder rv; + return rv; + } }; /**********************************************************************/ /***************************orders ************************************/ From 97d16115e8c41db8683b4563cbc8c76cd7ec49ae Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 3 Jan 2019 17:01:27 -0500 Subject: [PATCH 028/103] SPARK-1959 new order is constructed by the Hedger in init --- src/lib/CMakeDeps.cmake | 10 +--------- .../spreader/SingleFillHedger.cpp | 5 ++--- .../spreader/SingleFillHedger.h | 2 +- .../spreader/SpreaderBookkeepingData.cpp | 4 +--- .../spreader/hedger/IHedgerStateWorker.h | 3 +-- .../hedger_states/HedgerEndStateWorker.cpp | 8 ++------ .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 19 +++++++++++++------ .../hedger_states/HedgerStartStateWorker.h | 4 ++-- .../HedgerWaitingForCancelAckStateWorker.cpp | 3 +-- .../HedgerWaitingForCancelAckStateWorker.h | 2 +- ...WaitingForFirstAckCancelledStateWorker.cpp | 3 +-- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 3 +-- .../HedgerWaitingForFirstAckStateWorker.h | 2 +- .../HedgerWorkingStateWorker.cpp | 3 +-- .../hedger_states/HedgerWorkingStateWorker.h | 2 +- 17 files changed, 32 insertions(+), 45 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 635ebae7c..afd768425 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) -======= -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) ->>>>>>> master -======= -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) ->>>>>>> master +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 948d0e5b4..3f916c4fd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -98,9 +98,8 @@ OrderKey SingleFillHedger::_hedge_order_key(){ /****************************External Calls**************************/ /********************************************************************/ void SingleFillHedger::init (Price price, - Quantity quantity, - ChildOrder& child_order){ - _worker->init(price, quantity, child_order); + Quantity quantity){ + _worker->init(price, quantity); } void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ //bts_assert (u.order_key() == _order.order_key()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index ae3646d4f..62b7baecb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -79,7 +79,7 @@ public: SingleFillHedger& operator=(const SingleFillHedger&) = delete; SingleFillHedger& operator=(SingleFillHedger&&) = delete; //a. leave the start state and submit the order - void init (Price price, Quantity quantity, ChildOrder& child_order); + void init (Price price, Quantity quantity); //b. called by the spreader when there is an order update // reported by the exchange void on_order_update(const SpreaderChildOrderState& order_update_message); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index cb64a29c1..839d41c83 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -95,10 +95,8 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(size_t leg_index, SpreaderOrderServices*, const trace::CorID&){ HedgerManager& l_hm = _h_managers[leg_index]; - SpreaderLegData& leg_data = _leg_data[leg_index]; - ChildOrder hedge_order = leg_data.hedger_order_builder().build(); SingleFillHedger& rv = l_hm.get_hedger(); - rv.init (hedge_price,hedge_quantity,hedge_order); + rv.init (hedge_price,hedge_quantity); return rv; } }} \ No newline at end of file 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 c39a84c59..33af4192c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -22,8 +22,7 @@ public: virtual const std::string state_text () const = 0; // called once and only once, before any other calls. virtual void init (Price price, - Quantity quantity, - ChildOrder& child_order) = 0; + Quantity quantity) = 0; // called only when this hedger's order is updated virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on 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 bb985497a..306deb49c 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,16 +9,12 @@ void HedgerEndStateWorker::on_transition (){ // this is to allow the hedger to be re-used. // the state is cleared and the hedger returns // to the start state, waiting for the init call - if(!_hedger->_is_permenantly_cancelled){ - _hedger->_price_quantity_state.re_init(Price(0),Quantity(0)); - _hedger->_child_order_state.re_init(); + if(!_hedger->_is_permenantly_cancelled) _hedger->transform_to_START(); - } } void HedgerEndStateWorker::init (Price, - Quantity, - ChildOrder&){ + Quantity){ bts_assert_msg (false, "HedgerEndStateWorker::init illegal operation"); } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ 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 f1c59c6c5..179273213 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 @@ -23,7 +23,7 @@ public: void on_transition () override; HedgerState state () const override {return HedgerState::END;} const std::string state_text () const override {return "END";} - void init (Price price,Quantity quantity,ChildOrder& child_order) override; + void init (Price price,Quantity quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const Book& book,trace::CorID &) override; void cancel() 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 9cd60deb1..ce2e9bf44 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 @@ -6,15 +6,22 @@ namespace bts{ namespace orderman{ +void HedgerStartStateWorker::on_transition (){ + _hedger->_price_quantity_state.re_init(Price(0),Quantity(0)); + _hedger->_child_order_state.re_init(); +} + void HedgerStartStateWorker::init (Price price, - Quantity quantity, - ChildOrder& child_order){ + Quantity quantity){ _hedger->_price_quantity_state.re_init(price,quantity); - _hedger->_child_order_state.re_init(child_order); - // this is the only place an order is enterred - if(quantity.value() > 0){ + _hedger->_child_order_state.re_init(); + size_t leg_idx = _hedger->_leg_property_data.leg_index(); + if(quantity.value() > 0){ + ChildOrder new_order = _hedger->_spreader.get_new_hedge_order(leg_idx); + _hedger->_child_order_state.re_init(new_order); + // this is the only place an order is enterred _hedger->_place_order (price, - quantity); + quantity); _hedger->transform_to_WAITING_FOR_FIRST_ACK (); } } 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 df5c7fea8..a664f9ee1 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 @@ -18,10 +18,10 @@ public: const HedgerStartStateWorker&) : HedgerStartStateWorker (hedger) {} - void on_transition () override {} + void on_transition () override; HedgerState state () const override {return HedgerState::START;} const std::string state_text () const override {return "START";} - void init (Price price,Quantity quantity,ChildOrder& child_order) override; + void init (Price price,Quantity quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const Book& book,trace::CorID &) override; void cancel() 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 6155bf46d..63962bdde 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 @@ -6,8 +6,7 @@ namespace bts{ namespace orderman{ void HedgerWaitingForCancelAckStateWorker::init (Price, - Quantity, - ChildOrder&){ + Quantity){ bts_assert_msg (false, "HedgerWaitingForCancelAckStateWorker::init " "illegal operation"); } 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 34d1ad0f6..eabae4a84 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 @@ -25,7 +25,7 @@ public: const std::string state_text () const override { return "WAITING_FOR_CANCEL_ACK"; } - void init (Price price,Quantity quantity,ChildOrder& child_order) override; + void init (Price price,Quantity quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() 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 95af11a31..9c8328bb6 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 @@ -8,8 +8,7 @@ namespace orderman{ void HedgerWaitingForFirstAckCancelledStateWorker::init( Price, - Quantity, - ChildOrder&){ + Quantity){ bts_assert_msg (false, "HedgerWaitingForFirstAckCancelledStateWorker::init " "illegal operation"); } 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 ae53227d3..155c93c65 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 @@ -25,7 +25,7 @@ public: const std::string state_text () const override { return "WAITING_FOR_FIRST_ACK_CANCELLED"; } - void init (Price price,Quantity quantity,ChildOrder& child_order) override; + void init (Price price,Quantity quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const Book& book,trace::CorID &) override; void cancel() 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 df5626813..4b7bba19f 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 @@ -5,8 +5,7 @@ namespace bts{ namespace orderman{ void HedgerWaitingForFirstAckStateWorker::init (Price, - Quantity, - ChildOrder&){ + Quantity){ bts_assert_msg (false, "HedgerWaitingForFirstAckStateWorker::init " "illegal operation"); } 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 5d05c3c60..429a6200d 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 @@ -26,7 +26,7 @@ public: const std::string state_text () const override { return "WAITING_FOR_FIRST_ACK"; } - void init (Price price,Quantity quantity, ChildOrder& child_order) override; + void init (Price price,Quantity quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const Book& book,trace::CorID &) override; void cancel() 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 59a385fe1..0bc7ce8cd 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 @@ -10,8 +10,7 @@ void HedgerWorkingStateWorker::on_transition(){ _order_touch_time = _hedger->_current_time(); } void HedgerWorkingStateWorker::init(Price, - Quantity, - ChildOrder&){ + Quantity){ bts_assert_msg (false, "HedgerWorkingStateWorker::init illegal operation"); } void HedgerWorkingStateWorker::on_order_update( 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 e8f42acaf..02d2db428 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 @@ -23,7 +23,7 @@ public: void on_transition () override; HedgerState state () const override {return HedgerState::WORKING;} const std::string state_text () const override {return "WORKING";} - void init (Price price,Quantity quantity,ChildOrder& child_order) override; + void init (Price price,Quantity quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (const Book& book,trace::CorID &) override; void cancel() override; From a833944ec509431d707887f6c766fc1add7f556d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 3 Jan 2019 19:07:18 -0500 Subject: [PATCH 029/103] Improved perf log latency. --- src/data_files/files/perf_trace/perf_log.sql | 212 ++++++++++++------ src/lib/config/protos/perflog_cfg.proto | 1 - .../jetfix/connection/SocketConnection.cpp | 3 +- src/lib/tracing/PerfLog.cpp | 88 +++++--- 4 files changed, 199 insertions(+), 105 deletions(-) diff --git a/src/data_files/files/perf_trace/perf_log.sql b/src/data_files/files/perf_trace/perf_log.sql index f4c084a43..df7393430 100644 --- a/src/data_files/files/perf_trace/perf_log.sql +++ b/src/data_files/files/perf_trace/perf_log.sql @@ -21,54 +21,37 @@ trace ( uint32_1 INTEGER ); -drop view if exists recent_trace; -create view recent_trace as -select * from trace order by rowid desc limit 140123; - create index if not exists trace_idx on trace(session_start,channel,sn,ts); - -drop view if exists ordered_trace; -create view ordered_trace as -select - recent_trace.*, - row_number() over (order by session_start,ts) entry_rank -from - recent_trace; - -drop view if exists delta_trace; -create view delta_trace as -select - current.*, - (current.ts - previous.ts) / 1000.0 delta -from - ordered_trace current, - ordered_trace previous -where - current.entry_rank = previous.entry_rank+1; +create index if not exists trace_t_idx on trace(session_start,ts); drop view if exists log; create view log as select - delta_trace.*, + trace.*, + trace.rowid entry_id, + (ts-lag(ts) over by_session_ts)/1000.0 delta, case cor_event>0 when 1 then (ts-cor_event)/1000.0 else 0 end scope_delta, case cor_event>0 when 1 then "end of " || entry_kind else entry_kind end scoped_entry from - delta_trace; + trace +window + by_session_ts as (order by session_start,ts); drop view if exists events; create view events as select fix_reads.session_start, "hedge" event_type, + fix_reads.hts hts_start, + fix_reads.entry_id event_id, fix_reads.ts start, fix_writes.ts stop, (fix_writes.ts - fix_reads.ts) / 1000.0 duration, - row_number() over (order by fix_reads.session_start,fix_reads.ts,fix_writes.ts) event_rank , fix_reads.channel, fix_reads.sn from - (select session_start, channel, sn, ts from recent_trace where entry_kind='fix_msg_r') fix_reads, - (select session_start, channel, sn, ts from recent_trace where entry_kind='before_fix_socket_w') fix_writes + (select session_start, channel, sn, hts,ts,rowid entry_id from trace where entry_kind='fix_msg_r') fix_reads, + (select session_start, channel, sn, hts,ts,rowid entry_id from trace where entry_kind='before_fix_socket_w') fix_writes where fix_reads.session_start = fix_writes.session_start and fix_reads.channel = fix_writes.channel and @@ -77,15 +60,16 @@ union select md_reads.session_start, "requote" event_type, + md_reads.hts hts_start, + md_reads.entry_id event_id, md_reads.ts start, fix_writes.ts stop, (fix_writes.ts - md_reads.ts) / 1000.0 duration, - row_number() over (order by md_reads.session_start,md_reads.ts,fix_writes.ts) event_rank , md_reads.channel, md_reads.sn from - (select session_start, channel, sn, ts from recent_trace where entry_kind='md') md_reads, - (select session_start, channel, sn, ts from recent_trace where entry_kind='before_fix_socket_w') fix_writes + (select session_start, channel, sn, hts,ts,rowid entry_id from trace where entry_kind='md') md_reads, + (select session_start, channel, sn, hts,ts,rowid entry_id from trace where entry_kind='before_fix_socket_w') fix_writes where md_reads.session_start = fix_writes.session_start and md_reads.channel = fix_writes.channel and @@ -96,8 +80,9 @@ create view event_log as select log.*, event_type, - event_rank, + event_id, events.duration event_duration, + events.hts_start hts_start, events.start event_start, events.stop event_stop from @@ -107,6 +92,32 @@ where log.session_start = events.session_start and log.ts >= events.start and log.ts <= events.stop; +create table if not exists +event_log_archive ( + session_start TIMESTAMP, + ts INTEGER, + hts timestamp, + channel TEXT, + entry_kind TEXT, + txt_1 TEXT, + uint64_1 INTEGER, + thread TEXT, + cor_event INTEGER, + sn INTEGER, + uint32_1 INTEGER, + entry_id INTEGER, + delta float, + scope_delta float, + scoped_entry text, + event_type text, + event_id integer, + event_duration float, + hts_start TIMESTAMP, + event_start integer, + event_stop integer +); +create index if not exists event_log_archive_idx on event_log_archive(session_start,ts); + drop view if exists pretty_log; create view pretty_log as select @@ -121,63 +132,124 @@ select session_start, entry_rank from - event_log; + event_log_archive; drop view if exists last_pretty_log; create view last_pretty_log as select * from pretty_log where session_start=(select max(session_start) from session); --- drop view if exists summary; --- create view summary as --- select session_start,event_type,count(*) count, avg(duration) avg, max(duration) max, min(duration) min, median(duration) median, stdev(duration) stdev from events group by session_start,event_type; +drop view if exists event_summary; +create view event_summary as +select + max(session_start) session_start, + max(event_type) event_type, + max(event_duration) duration, + min(event_start) start, + min(event_stop) stop, + max(hts_start) hts_start +from + event_log_archive +group by + event_id; +-- drop view if exists event_stats; +-- create view event_stats as +-- select +-- session_start, +-- event_type, +-- count(*) count, +-- avg(duration) avg, +-- max(duration) max, +-- min(duration) min, +-- median(duration) median, +-- stdev(duration) stdev +-- from +-- event_summary +-- group by +-- session_start, +-- event_type; -drop view if exists hedge_trace; -create view hedge_trace as -select +drop view if exists hedge_trace_view; +create view hedge_trace_view as +select session.version, session.host, session.build_type, session.session_start, - recent_trace.hts trace_time, - recent_trace.uint64_1 order_key, - hedge_events.duration total, - hedge_events.event_rank rank -from - recent_trace, - (select * from events where event_type='hedge') hedge_events, - session -where - entry_kind='NativeOrder::on_activate' and - recent_trace.cor_event = 0 and - recent_trace.channel = hedge_events.channel and - recent_trace.session_start = hedge_events.session_start and - recent_trace.sn = hedge_events.sn and - recent_trace.session_start = session.session_start; + event_log.hts trace_time, + event_log.uint64_1 order_key, + event_log.event_duration total, + event_log.event_id event_id +from + event_log,session +where + event_log.session_start=session.session_start and + event_type='hedge' and + entry_kind='NativeOrder::on_activate' and + cor_event=0; -drop view if exists requote_trace; -create view requote_trace as +create table if not exists +hedge_trace_archive ( + version TEXT, + host TEXT, + build_type TEXT, + session_start TIMESTAMP, + trace_time TIMESTAMP, + order_key INTEGER, + total float, + event_id integer +); + +drop view if exists hedge_trace; +create view hedge_trace as +select * from hedge_trace_view union select * from hedge_trace_archive; + + +drop view if exists requote_trace_view; +create view requote_trace_view as select session.version, session.host, session.build_type, session.session_start, - recent_trace.hts trace_time, - recent_trace.uint64_1 order_key, - requote_events.duration total, - requote_events.event_rank rank + event_log.hts trace_time, + event_log.uint64_1 order_key, + event_log.event_duration total, + event_log.event_id event_id from - recent_trace, - (select * from events where event_type='requote') requote_events, - session + event_log, session where + event_log.session_start=session.session_start and + event_type='requote' and entry_kind='NativeOrder::on_update' and - recent_trace.cor_event = 0 and - recent_trace.channel = requote_events.channel and - recent_trace.session_start = requote_events.session_start and - recent_trace.sn = requote_events.sn and - recent_trace.session_start = session.session_start ; + event_log.cor_event = 0; -delete from trace where -rowid in (select rowid from trace order by rowid desc limit -1 offset 10000123); +create table if not exists +requote_trace_archive ( + version TEXT, + host TEXT, + build_type TEXT, + session_start TIMESTAMP, + trace_time TIMESTAMP, + order_key INTEGER, + total float, + event_id integer +); + +drop view if exists requote_trace; +create view requote_trace as +select * from requote_trace_view union select * from requote_trace_archive; + +begin transaction; +insert into event_log_archive select * from event_log; +insert into hedge_trace_archive select * from hedge_trace_view; +insert into requote_trace_archive select * from requote_trace_view; +delete from trace; +delete from event_log_archive where +rowid in (select rowid from event_log_archive order by rowid desc limit -1 offset 10000123); +delete from hedge_trace_archive where +rowid in (select rowid from hedge_trace_archive order by rowid desc limit -1 offset 10000123); +delete from requote_trace_archive where +rowid in (select rowid from requote_trace_archive order by rowid desc limit -1 offset 10000123); +commit; diff --git a/src/lib/config/protos/perflog_cfg.proto b/src/lib/config/protos/perflog_cfg.proto index e1b69905c..353f370c5 100644 --- a/src/lib/config/protos/perflog_cfg.proto +++ b/src/lib/config/protos/perflog_cfg.proto @@ -3,7 +3,6 @@ package bts.config; message PerfLogCfg { optional bool active = 1 [default=true]; - optional uint32 recent_traces_size = 2 [default=140123]; optional uint32 max_rows = 3 [default=10000123]; optional uint32 entry_batch_size = 4 [default=200]; } diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index 9e040e148..40f95c1de 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -109,7 +109,8 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, _perf_log.log(trace,"before_fix_socket_w"); auto result = ::writev(_fd, iv, (int)vec_size); _perf_log.log(trace,"after_fix_socket_w"); - _perf_log.flush(); + if (trace.sn) + _perf_log.flush(); if (_log && result > 0) { for (size_t i = 0; i < vec_size; i++) diff --git a/src/lib/tracing/PerfLog.cpp b/src/lib/tracing/PerfLog.cpp index e6cf9a37d..78980b5bb 100644 --- a/src/lib/tracing/PerfLog.cpp +++ b/src/lib/tracing/PerfLog.cpp @@ -3,9 +3,10 @@ #include "lib/config/protos/perflog_cfg.pb.h" #include "lib/config/protos/system.pb.h" #include "lib/persistence/persistence_utils.h" +#include "lib/utils/bts_array_size.h" #include "lib/utils/datetime.h" #include "lib/utils/stats.h" -#include "lib/utils/bts_array_size.h" +#include "lib/utils/thread_manager.h" #include #include @@ -81,6 +82,8 @@ struct PerfLog::PImpl { std::string session_start; boost::circular_buffer entry_batch; std::mutex lock; + std::thread init_thread; + std::atomic init_completed; }; PerfLog::PerfLog() : _pending(), _disabled(false), me() { @@ -98,38 +101,56 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { try { me = std::make_unique(loc); - init_db(); - - me->insert_trace_statement = - std::make_unique(me->db, insert_trace); - me->insert_session_statement = - std::make_unique(me->db, insert_session); - me->requote_query_statement = - std::make_unique(me->db, requote_query); - me->hedge_query_statement = - std::make_unique(me->db, hedge_query); - me->session_start = datetime::FIX_timestamp(datetime::local_now()); - - me->insert_session_statement->bind( - ":version", config::get().version()); - me->insert_session_statement->bind( - ":host", config::get().host_name()); -#ifdef DEBUG - me->insert_session_statement->bind(":build_type", "debug"); -#else - me->insert_session_statement->bind(":build_type", "release"); -#endif - me->insert_session_statement->bind(":session_start", me->session_start); - me->insert_session_statement->exec(); - me->insert_session_statement->reset(); } catch (SQLite::Exception const &e) { LOG(persist, Error, "Error initializing perf_trace DB {}. Error: {}", loc, std::string(e.getErrorStr())); _disabled = true; + return; } + + me->init_completed = false; + me->init_thread = threading::make_thread("perf_log_ini", [loc,this]() { + try { + LOG(persist,Info, "Started initialization of perf_log db"); + init_db(); + + me->insert_trace_statement = + std::make_unique(me->db, insert_trace); + me->insert_session_statement = + std::make_unique(me->db, insert_session); + me->requote_query_statement = + std::make_unique(me->db, requote_query); + me->hedge_query_statement = + std::make_unique(me->db, hedge_query); + me->session_start = datetime::FIX_timestamp(datetime::local_now()); + + me->insert_session_statement->bind( + ":version", config::get().version()); + me->insert_session_statement->bind( + ":host", config::get().host_name()); +#ifdef DEBUG + me->insert_session_statement->bind(":build_type", "debug"); +#else + me->insert_session_statement->bind(":build_type", "release"); +#endif + me->insert_session_statement->bind(":session_start", + me->session_start); + me->insert_session_statement->exec(); + me->insert_session_statement->reset(); + } catch (SQLite::Exception const &e) { + LOG(persist, Error, + "Error initializing perf_trace DB (2) {}. Error: {}", loc, + std::string(e.getErrorStr())); + _disabled = true; + } + LOG(persist,Info, "Finished initialization of perf_log db"); + me->init_completed = true; + }); } -PerfLog::~PerfLog() {} +PerfLog::~PerfLog() { + me->init_thread.join(); +} std::string PerfLog::init_storage_location() { auto loc = persistence::storage_location("perf_log"); @@ -145,7 +166,7 @@ std::string PerfLog::init_storage_location() { } size_t PerfLog::store_log_entries() { - if (_disabled) { + if (!me->init_completed || _disabled) { _pending.clear(); return 0; } @@ -167,9 +188,6 @@ void PerfLog::init_db() { std::string str((std::istreambuf_iterator(f)), (std::istreambuf_iterator())); config::PerfLogCfg defaults; - boost::replace_all( - str, std::to_string(defaults.recent_traces_size()), - std::to_string(config::get().recent_traces_size())); boost::replace_all( str, std::to_string(defaults.max_rows()), std::to_string(config::get().max_rows())); @@ -187,7 +205,9 @@ std::string encode_number(SQLite::Column const &c) { std::vector> PerfLog::get_latest_requote_traces(size_t n) { std::vector> result; - + if (!me->init_completed) + return result; + std::lock_guard l(me->lock); try { me->requote_query_statement->bind(1, (long long)n); @@ -221,7 +241,9 @@ PerfLog::get_latest_requote_traces(size_t n) { std::vector> PerfLog::get_latest_hedge_traces(size_t n) { std::vector> result; - + if (!me->init_completed) + return result; + std::lock_guard l(me->lock); try { me->hedge_query_statement->bind(1, (long long)n); @@ -276,7 +298,7 @@ size_t PerfLog::flush_current_batch_to_disk() { me->insert_trace_statement->bind(":cor_event", (long long)ev.cor_event.to_uint64()); char tn[17]; - pthread_getname_np(ev.thread_id, tn, BTS_ARRAYSIZE(tn)-1); + pthread_getname_np(ev.thread_id, tn, BTS_ARRAYSIZE(tn) - 1); me->insert_trace_statement->bind(":thread", tn); me->insert_trace_statement->exec(); count++; From 6b84dc433a8e9c9e193cb61eeddefe985bc82c08 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 4 Jan 2019 09:23:59 -0500 Subject: [PATCH 030/103] Making log analysis faster. --- src/data_files/files/perf_trace/perf_log.sql | 97 ++++++++++++-------- src/lib/orderman/perf_analysis/perf_log.sh | 34 +++++-- 2 files changed, 88 insertions(+), 43 deletions(-) diff --git a/src/data_files/files/perf_trace/perf_log.sql b/src/data_files/files/perf_trace/perf_log.sql index df7393430..5b496274b 100644 --- a/src/data_files/files/perf_trace/perf_log.sql +++ b/src/data_files/files/perf_trace/perf_log.sql @@ -36,7 +36,27 @@ from trace window by_session_ts as (order by session_start,ts); - + +create table if not exists +log_archive( + session_start TIMESTAMP, + ts INTEGER, + hts timestamp, + channel TEXT, + entry_kind TEXT, + txt_1 TEXT, + uint64_1 INTEGER, + thread TEXT, + cor_event INTEGER, + sn INTEGER, + uint32_1 INTEGER, + entry_id INTEGER, + delta float, + scope_delta float, + scoped_entry TEXT +); +create index log_archive_idx on log_archive(session_start,ts); + drop view if exists events; create view events as select @@ -74,49 +94,37 @@ where md_reads.session_start = fix_writes.session_start and md_reads.channel = fix_writes.channel and md_reads.sn = fix_writes.sn; - + +create table if not exists +events_archive ( + session_start TIMESTAMP, + event_type TEXT, + hts_start TIMESTAMP, + event_id INTEGER, + start INTEGER, + stop INTEGER, + duration float, + channel TEXT, + sn INTEGER +); +create index events_archive_idx on events_archive(session_start,start,stop); + drop view if exists event_log; create view event_log as select - log.*, + log_archive.*, event_type, event_id, - events.duration event_duration, - events.hts_start hts_start, - events.start event_start, - events.stop event_stop + events_archive.duration event_duration, + events_archive.hts_start hts_start, + events_archive.start event_start, + events_archive.stop event_stop from - log, - events + log_archive, + events_archive where - log.session_start = events.session_start and - log.ts >= events.start and log.ts <= events.stop; - -create table if not exists -event_log_archive ( - session_start TIMESTAMP, - ts INTEGER, - hts timestamp, - channel TEXT, - entry_kind TEXT, - txt_1 TEXT, - uint64_1 INTEGER, - thread TEXT, - cor_event INTEGER, - sn INTEGER, - uint32_1 INTEGER, - entry_id INTEGER, - delta float, - scope_delta float, - scoped_entry text, - event_type text, - event_id integer, - event_duration float, - hts_start TIMESTAMP, - event_start integer, - event_stop integer -); -create index if not exists event_log_archive_idx on event_log_archive(session_start,ts); + log_archive.session_start = events_archive.session_start and + log_archive.ts >= events_archive.start and log_archive.ts <= events_archive.stop; drop view if exists pretty_log; create view pretty_log as @@ -253,3 +261,18 @@ delete from requote_trace_archive where rowid in (select rowid from requote_trace_archive order by rowid desc limit -1 offset 10000123); commit; +create view event_log_archive_view as +select + log_archive.*, + event_type, + event_id, + events_archive.duration event_duration, + events_archive.hts_start hts_start, + events_archive.start event_start, + events_archive.stop event_stop +from + log_archive, + events_archive +where + log_archive.session_start = events_archive.session_start and + log_archive.ts >= events_archive.start and log_archive.ts <= events_archive.stop; diff --git a/src/lib/orderman/perf_analysis/perf_log.sh b/src/lib/orderman/perf_analysis/perf_log.sh index 0334f2458..4fa4a11b7 100755 --- a/src/lib/orderman/perf_analysis/perf_log.sh +++ b/src/lib/orderman/perf_analysis/perf_log.sh @@ -19,7 +19,7 @@ fi SQLLITE=../../../../externals/linux/bin/sqlite3 SQLITE_EXT=../../../../externals/linux/bin/libsqlitefunctions -DB=file:$HOME/sparkdata/data/databases/perf_log/perf_log.sqlite?mode=ro +DB=file:$HOME/sparkdata/data/databases/perf_log/perf_log.sqlite if [ $# -eq 1 ] then @@ -28,6 +28,17 @@ else SESSION=\'$2\' fi +echo Generating stats... +$SQLLITE $DB< Date: Fri, 4 Jan 2019 11:31:36 -0500 Subject: [PATCH 031/103] More performance improvements on perf_log --- src/data_files/files/perf_trace/perf_log.sql | 355 +++++++++++-------- src/lib/orderman/perf_analysis/perf_log.sh | 31 +- src/web/CMakeDeps.cmake | 2 +- 3 files changed, 216 insertions(+), 172 deletions(-) diff --git a/src/data_files/files/perf_trace/perf_log.sql b/src/data_files/files/perf_trace/perf_log.sql index 5b496274b..882ab5d22 100644 --- a/src/data_files/files/perf_trace/perf_log.sql +++ b/src/data_files/files/perf_trace/perf_log.sql @@ -1,3 +1,6 @@ +/* -------------------------------------------------------------------------------- */ +/* Main tables */ +/* -------------------------------------------------------------------------------- */ create table if not exists session ( version TEXT, @@ -5,6 +8,7 @@ session ( build_type TEXT, session_start TIMESTAMP PRIMARY KEY ); +create index if not exists session_idx on session(session_start); create table if not exists trace ( @@ -20,12 +24,18 @@ trace ( sn INTEGER, uint32_1 INTEGER ); - create index if not exists trace_idx on trace(session_start,channel,sn,ts); create index if not exists trace_t_idx on trace(session_start,ts); -drop view if exists log; -create view log as +/* -------------------------------------------------------------------------------- */ +/* Main Views */ +/* -------------------------------------------------------------------------------- */ + +/* An ordered view of the traces, with extra columns for the delta +betwen consecutive traces as well as the delta between related +(scoped) traces */ +drop view if exists log_view; +create view log_view as select trace.*, trace.rowid entry_id, @@ -37,28 +47,10 @@ from window by_session_ts as (order by session_start,ts); -create table if not exists -log_archive( - session_start TIMESTAMP, - ts INTEGER, - hts timestamp, - channel TEXT, - entry_kind TEXT, - txt_1 TEXT, - uint64_1 INTEGER, - thread TEXT, - cor_event INTEGER, - sn INTEGER, - uint32_1 INTEGER, - entry_id INTEGER, - delta float, - scope_delta float, - scoped_entry TEXT -); -create index log_archive_idx on log_archive(session_start,ts); - -drop view if exists events; -create view events as +/* A view identifying each high level event (requote or hedge) and +annotating it with its latency */ +drop view if exists event_view; +create view event_view as select fix_reads.session_start, "hedge" event_type, @@ -95,8 +87,63 @@ where md_reads.channel = fix_writes.channel and md_reads.sn = fix_writes.sn; +/* A view on hedge events, identifying each order sent as part of the event*/ +drop view if exists hedge_trace_view; +create view hedge_trace_view as +select + session.version, + session.host, + session.build_type, + session.session_start, + trace.hts trace_time, + uint64_1 order_key, + duration total, + event_id +from + events, + trace, + session +where + session.session_start = trace.session_start and + session.session_start = events.session_start and + events.channel=trace.channel and events.sn=trace.sn and + event_type='hedge' and + entry_kind='NativeOrder::on_activate' and + cor_event=0; + +/* A view on requote events, identifying each order sent as part of the event*/ +drop view if exists requote_trace_view; +create view requote_trace_view as +select + session.version, + session.host, + session.build_type, + session.session_start, + trace.hts trace_time, + uint64_1 order_key, + duration total, + event_id +from + events, + trace, + session +where + session.session_start = trace.session_start and + session.session_start = events.session_start and + events.channel=trace.channel and events.sn=trace.sn and + event_type='requote' and + entry_kind='NativeOrder::on_update' and + cor_event=0; + +/* -------------------------------------------------------------------------------- */ +/* Archive tables/view */ +/* -------------------------------------------------------------------------------- */ + +/* Auxiliary tables and views, used to archive the results of the main +views to speed up analysis as data accumulates */ + create table if not exists -events_archive ( +event_archive ( session_start TIMESTAMP, event_type TEXT, hts_start TIMESTAMP, @@ -107,94 +154,27 @@ events_archive ( channel TEXT, sn INTEGER ); -create index events_archive_idx on events_archive(session_start,start,stop); +create index if not exists event_archive_idx on event_archive(session_start,start,stop); -drop view if exists event_log; -create view event_log as -select - log_archive.*, - event_type, - event_id, - events_archive.duration event_duration, - events_archive.hts_start hts_start, - events_archive.start event_start, - events_archive.stop event_stop -from - log_archive, - events_archive -where - log_archive.session_start = events_archive.session_start and - log_archive.ts >= events_archive.start and log_archive.ts <= events_archive.stop; - -drop view if exists pretty_log; -create view pretty_log as -select - scoped_entry entry_kind, - delta, - scope_delta , - event_duration, - event_type, - event_rank, - hts, - ts, - session_start, - entry_rank -from - event_log_archive; - -drop view if exists last_pretty_log; -create view last_pretty_log as -select * from pretty_log where session_start=(select max(session_start) from session); - -drop view if exists event_summary; -create view event_summary as -select - max(session_start) session_start, - max(event_type) event_type, - max(event_duration) duration, - min(event_start) start, - min(event_stop) stop, - max(hts_start) hts_start -from - event_log_archive -group by - event_id; - --- drop view if exists event_stats; --- create view event_stats as --- select --- session_start, --- event_type, --- count(*) count, --- avg(duration) avg, --- max(duration) max, --- min(duration) min, --- median(duration) median, --- stdev(duration) stdev --- from --- event_summary --- group by --- session_start, --- event_type; - -drop view if exists hedge_trace_view; -create view hedge_trace_view as -select - session.version, - session.host, - session.build_type, - session.session_start, - event_log.hts trace_time, - event_log.uint64_1 order_key, - event_log.event_duration total, - event_log.event_id event_id -from - event_log,session -where - event_log.session_start=session.session_start and - event_type='hedge' and - entry_kind='NativeOrder::on_activate' and - cor_event=0; +create table if not exists +log_archive( + session_start TIMESTAMP, + ts INTEGER, + hts timestamp, + channel TEXT, + entry_kind TEXT, + txt_1 TEXT, + uint64_1 INTEGER, + thread TEXT, + cor_event INTEGER, + sn INTEGER, + uint32_1 INTEGER, + entry_id INTEGER, + delta float, + scope_delta float, + scoped_entry TEXT +); +create index if not exists log_archive_idx on log_archive(session_start,ts); create table if not exists hedge_trace_archive ( @@ -207,31 +187,10 @@ hedge_trace_archive ( total float, event_id integer ); - drop view if exists hedge_trace; create view hedge_trace as select * from hedge_trace_view union select * from hedge_trace_archive; - -drop view if exists requote_trace_view; -create view requote_trace_view as -select - session.version, - session.host, - session.build_type, - session.session_start, - event_log.hts trace_time, - event_log.uint64_1 order_key, - event_log.event_duration total, - event_log.event_id event_id -from - event_log, session -where - event_log.session_start=session.session_start and - event_type='requote' and - entry_kind='NativeOrder::on_update' and - event_log.cor_event = 0; - create table if not exists requote_trace_archive ( version TEXT, @@ -243,36 +202,122 @@ requote_trace_archive ( total float, event_id integer ); - drop view if exists requote_trace; create view requote_trace as select * from requote_trace_view union select * from requote_trace_archive; -begin transaction; -insert into event_log_archive select * from event_log; -insert into hedge_trace_archive select * from hedge_trace_view; -insert into requote_trace_archive select * from requote_trace_view; -delete from trace; -delete from event_log_archive where -rowid in (select rowid from event_log_archive order by rowid desc limit -1 offset 10000123); -delete from hedge_trace_archive where -rowid in (select rowid from hedge_trace_archive order by rowid desc limit -1 offset 10000123); -delete from requote_trace_archive where -rowid in (select rowid from requote_trace_archive order by rowid desc limit -1 offset 10000123); -commit; -create view event_log_archive_view as +/* a synthetis of the log and events, focusing only on traces that are +part of hedge/requote events */ +create table if not exists +event_log_archive ( + session_start TIMESTAMP, + ts INTEGER, + hts timestamp, + channel TEXT, + entry_kind TEXT, + txt_1 TEXT, + uint64_1 INTEGER, + thread TEXT, + cor_event INTEGER, + sn INTEGER, + uint32_1 INTEGER, + entry_id INTEGER, + delta float, + scope_delta float, + scoped_entry TEXT, + event_type TEXT, + event_id INTEGER, + event_duration float, + hts_start TIMESTAMP, + event_start INTEGER, + event_stop INTEGER +); +create index if not exists event_log_archive_idx on event_log_archive(session_start); + +drop view if exists pretty_log; +create view pretty_log as +select + scoped_entry entry_kind, + delta, + scope_delta , + event_duration, + event_type, + event_id, + hts, + ts, + session_start, + entry_id +from + event_log_archive; + +drop view if exists last_pretty_log; +create view last_pretty_log as +select + * +from + pretty_log +where + session_start=(select max(session_start) from session); + +/* +drop view if exists event_stats; +create view event_stats as +select + session_start, + event_type, + count(*) count, + avg(duration) avg, + max(duration) max, + min(duration) min, + median(duration) median, + stdev(duration) stdev +from + event_archive +group by + session_start, + event_type; +*/ + +drop view if exists event_log_aux; +create view event_log_aux as select log_archive.*, event_type, event_id, - events_archive.duration event_duration, - events_archive.hts_start hts_start, - events_archive.start event_start, - events_archive.stop event_stop + event_archive.duration event_duration, + event_archive.hts_start hts_start, + event_archive.start event_start, + event_archive.stop event_stop from log_archive, - events_archive + event_archive where - log_archive.session_start = events_archive.session_start and - log_archive.ts >= events_archive.start and log_archive.ts <= events_archive.stop; + log_archive.session_start = event_archive.session_start and + log_archive.ts >= event_archive.start and log_archive.ts <= event_archive.stop; + +begin transaction; +insert into hedge_trace_archive select * from hedge_trace_view; +insert into requote_trace_archive select * from requote_trace_view; +insert into event_archive select * from event_view; +insert into log_archive select * from log_view; +insert into event_log_archive select * from event_log_aux; + +delete from trace; + +delete from event_log_archive where +rowid in (select rowid from event_log_archive order by rowid desc limit -1 offset 10000123); + +delete from hedge_trace_archive where +rowid in (select rowid from hedge_trace_archive order by rowid desc limit -1 offset 10000123); + +delete from requote_trace_archive where +rowid in (select rowid from requote_trace_archive order by rowid desc limit -1 offset 10000123); + +delete from log_archive where +rowid in (select rowid from log_archive order by rowid desc limit -1 offset 10000123); + +delete from event_log_archive where +rowid in (select rowid from event_log_archive order by rowid desc limit -1 offset 10000123); +commit; + diff --git a/src/lib/orderman/perf_analysis/perf_log.sh b/src/lib/orderman/perf_analysis/perf_log.sh index 4fa4a11b7..67b3d4f29 100755 --- a/src/lib/orderman/perf_analysis/perf_log.sh +++ b/src/lib/orderman/perf_analysis/perf_log.sh @@ -31,9 +31,11 @@ fi echo Generating stats... $SQLLITE $DB< Date: Fri, 4 Jan 2019 12:04:10 -0500 Subject: [PATCH 032/103] Fixed perf_log.sql --- src/data_files/files/perf_trace/perf_log.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/data_files/files/perf_trace/perf_log.sql b/src/data_files/files/perf_trace/perf_log.sql index 882ab5d22..309aa5944 100644 --- a/src/data_files/files/perf_trace/perf_log.sql +++ b/src/data_files/files/perf_trace/perf_log.sql @@ -100,13 +100,13 @@ select duration total, event_id from - events, + event_view, trace, session where session.session_start = trace.session_start and - session.session_start = events.session_start and - events.channel=trace.channel and events.sn=trace.sn and + session.session_start = event_view.session_start and + event_view.channel=trace.channel and event_view.sn=trace.sn and event_type='hedge' and entry_kind='NativeOrder::on_activate' and cor_event=0; @@ -124,13 +124,13 @@ select duration total, event_id from - events, + event_view, trace, session where session.session_start = trace.session_start and - session.session_start = events.session_start and - events.channel=trace.channel and events.sn=trace.sn and + session.session_start = event_view.session_start and + event_view.channel=trace.channel and event_view.sn=trace.sn and event_type='requote' and entry_kind='NativeOrder::on_update' and cor_event=0; From 64b94c58e717185de135baee64e40cc5add12c47 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 4 Jan 2019 11:20:21 -0600 Subject: [PATCH 033/103] locking _resources ResourceDictionary prior to indexer access --- src/client/spark/Images/Icons.cs | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index f9fee789c..54c88a41b 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -31,7 +31,9 @@ namespace mbts.ui { } private static ImageSource load_resource_and_freeze(string resource_name) { - return ((DrawingImage)_resources[resource_name]).frozen(); + lock (_resources) { + return ((DrawingImage)_resources[resource_name]).frozen(); + } } #pragma warning disable CS0618 // Type or member is obsolete @@ -152,16 +154,18 @@ namespace mbts.ui { } static IEnumerable _get_geometric_path(string geometric_path_key) { - object obj = _resources[geometric_path_key]; - if (obj is string path) { - if (string.IsNullOrEmpty(path)) { - Log.Api.error($"Resource lookup of '{geometric_path_key}' did not return a valid string.", nameof(geometric_path_key)); - path = string.Empty; - } - return new[] { path }; - } else if (obj is string[] paths) { - return paths.Where(p => !string.IsNullOrEmpty(p)).ToArray(); - } else return null; + lock (_resources) { + object obj = _resources[geometric_path_key]; + if (obj is string path) { + if (string.IsNullOrEmpty(path)) { + Log.Api.error($"Resource lookup of '{geometric_path_key}' did not return a valid string.", nameof(geometric_path_key)); + path = string.Empty; + } + return new[] { path }; + } else if (obj is string[] paths) { + return paths.Where(p => !string.IsNullOrEmpty(p)).ToArray(); + } else return null; + } } } } \ No newline at end of file From ae200b374b9ac2d44fbcb17317ccafa595ff8ad5 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 4 Jan 2019 12:38:56 -0600 Subject: [PATCH 034/103] PR suggestion --- src/client/spark/Images/Icons.cs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index 54c88a41b..7dc2068aa 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -154,18 +154,19 @@ namespace mbts.ui { } static IEnumerable _get_geometric_path(string geometric_path_key) { + object obj; lock (_resources) { - object obj = _resources[geometric_path_key]; - if (obj is string path) { - if (string.IsNullOrEmpty(path)) { - Log.Api.error($"Resource lookup of '{geometric_path_key}' did not return a valid string.", nameof(geometric_path_key)); - path = string.Empty; - } - return new[] { path }; - } else if (obj is string[] paths) { - return paths.Where(p => !string.IsNullOrEmpty(p)).ToArray(); - } else return null; + obj = _resources[geometric_path_key]; } + if (obj is string path) { + if (string.IsNullOrEmpty(path)) { + Log.Api.error($"Resource lookup of '{geometric_path_key}' did not return a valid string.", nameof(geometric_path_key)); + path = string.Empty; + } + return new[] { path }; + } else if (obj is string[] paths) { + return paths.Where(p => !string.IsNullOrEmpty(p)).ToArray(); + } else return null; } } } \ No newline at end of file From 060b88e4c9124cae47feeb34c26aea488b69c398 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 8 Jan 2019 10:03:22 -0500 Subject: [PATCH 035/103] SPARK-1959 largechunk done --- .../orderman/events/OrderStateUpdateEvent.h | 4 +- .../orders/spreader_orders/SpreaderOrder.cpp | 61 +++-------- .../orders/spreader_orders/SpreaderOrder.h | 103 ++++++++++++++++-- .../spreader/SpreaderChildOrderState.h | 67 +++++------- .../SpreaderWorkingStateWorker.cpp | 91 ++++++++-------- .../spreader_orders/tests/spreader_tests.cpp | 32 +++++- .../spreader_orders/tests/tests_common.h | 9 ++ 7 files changed, 228 insertions(+), 139 deletions(-) diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 2c38a8a78..678b5f9c9 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -16,8 +16,7 @@ class OrderStateUpdateEvent : public mercury::Event { api::orderman::OrderDefinition const &def, api::orderman::OrderState const &state, trace::CorID const &trace = trace::CorID()) - : key(key), parent_key(parent_key), trace(trace), definition(&def), - fake_fill_qty(0) { + : key(key), parent_key(parent_key), trace(trace), definition(&def) { status = state.status(); price = state.price(); @@ -65,7 +64,6 @@ class OrderStateUpdateEvent : public mercury::Event { mercury::TimeStampStr last_transact_time; api::orderman::OrderDefinition const *definition; - uint32_t fake_fill_qty; api::orderman::OrderState rebuild_state() const { api::orderman::OrderState result; diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 760d21a96..c5e293afb 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -16,6 +16,7 @@ namespace orderman { SpreaderOrder::SpreaderOrder() : _cancelled (false), +_cw_helper(), _cancel_timeout (5000),// TODO:get it from config _check_termination_period (250), // should also be a setting/config like above _active(true), @@ -24,6 +25,7 @@ _bookkeeping_data_ptr(), _order_services(nullptr), _curr_timestamp(), _last_check_termination_timestamp(), +_cache_warm_fill_ts(), _perf_ts(utils::TimeStamp::now()), _state_worker(nullptr), _start_state_worker(this), @@ -103,6 +105,10 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ _send_check_termination(false); if (_any_quoter_in_irrecoverable_error()) _state_worker->on_quoter_irrecoverable_error(); + if(ms_diff(_curr_timestamp,_cache_warm_fill_ts) >= 5){ + _cache_warm_fill_ts = _curr_timestamp; + _keep_hedging_path_hot_2(); + } } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; @@ -121,8 +127,9 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& _state_worker->on_settlement_price(settlement_event); } void SpreaderOrder::_keep_hedging_path_hot_2(){ + _cw_helper.set_forced_flag(); // for each quoting leg - if(_inited() && _active) + if(_inited() && _active){ for(size_t i=0;i<_bookkeeping_data().n_legs();i++){ SpreaderLegData& leg=_bookkeeping_data().get_leg_data(i); if(leg.leg_property_data().is_active_quoting() && @@ -137,10 +144,11 @@ void SpreaderOrder::_keep_hedging_path_hot_2(){ state); ord_ev.status=q_ord.status(); ord_ev.price=q_ord.last_reported_order_price().value(); - ord_ev.fake_fill_qty = 77; _on_child_order_update(ord_ev); } } + } + _cw_helper.unset_forced_flag(); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ @@ -155,59 +163,22 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ //q=quoter non fill, f=quoter fill, h=hedger char cb_type='q'; SpreaderLegData* leg_data_ptr = - _bookkeeping_data().find_leg_from_quoter_orderkey(ord_ev.key); - auto scoped_log = _order_services->log_scope(ord_ev.trace, - "SpreaderOrder::_on_child_order_update", - key().value()); + _bookkeeping_data().find_leg_from_quoter_orderkey(ord_ev.key); if (leg_data_ptr == nullptr){ cb_type = 'h'; _on_non_quoter_order(ord_ev); } else _on_quoter_order(ord_ev,*leg_data_ptr,cb_type); - LOG(OrderMan,Info,"h_p cb done {} {}",cb_type, _diff_ns()); + LOG(OrderMan,_cw_helper.llevel,"h_p cb done {} {}",cb_type, _diff_ns()); _send_check_termination(true); _report_state(); - LOG(OrderMan, Info,"h_p end {} {}",cb_type, _diff_ns()); - LOG(OrderMan, Info,"_on_child_order_update {} {}", + LOG(OrderMan, _cw_helper.llevel,"h_p end {} {}",cb_type, _diff_ns()); + LOG(OrderMan, _cw_helper.llevel,"_on_child_order_update {} {}", cb_type, (utils::TimeStamp::now()-start).nanoseconds()); } } -void SpreaderOrder::_on_quoter_order(const OrderStateUpdateEvent& ord_ev, - SpreaderLegData& leg_data, - char& ord_indicator){ - ChildOrderError order_error = _get_order_error (ord_ev, - leg_data.quoter().expecting_cancel_update()); - LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " - "key:{} sec_key:{} state:{} order_key:{} status:{} " - "filled_qty:{} price:{} last_price:{} " - "msg:{} child_order_error:{}", - key(), - ord_ev.definition->security_key(), - static_cast(_state_worker->state()), - ord_ev.key, - ord_ev.status, - ord_ev.filled_quantity, - ord_ev.price, - ord_ev.last_price, - ord_ev.last_msg, - static_cast(order_error)); - leg_data.order_update_message().on_order_update(ord_ev); - if (order_error != ChildOrderError::NONE) - _state_worker->on_quoter_order_error (leg_data); - else{ - if (leg_data.order_update_message().last_update_filled_quantity().value() == 0){ - LOG(OrderMan,Info,"h_p q child update {0}",_diff_ns()); - _state_worker->on_quoter_order_status_update (leg_data); - } - else{ - ord_indicator = 'f'; - LOG(OrderMan,Info,"h_p f child update {0}",_diff_ns()); - _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); - } - } -} void SpreaderOrder::_on_non_quoter_order(const OrderStateUpdateEvent& ord_ev){ SingleFillHedger* hedger_ptr = @@ -368,15 +339,11 @@ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, const trace::CorID trace){ - // auto scoped_log = - // _order_services->order_services().log_scope(trace,"SpreaderOrder::_send_hedge"); _bookkeeping_data().add_new_hedger (hedge_leg_index, hedge_price, hedge_qty, _order_services, trace); - //_order_services->order_services().log(trace,"SpreaderOrder::_send_hedge:2"); - //hedger.init (); } void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, Price fill_price, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 03553a0dc..4e6d4ec0b 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -34,6 +34,47 @@ friend class SpreaderWaitingForInitialDataStateWorker; friend class SpreaderWorkingStateWorker; friend class SpreaderWaitingForCancelAllStateWorker; friend class SpreaderEndStateWorker; +public: + class CacheWarmingHelper{ + public: + bool is_forced; + char fill_indicator; + log::Level llevel; + Quantity forced_fill_qty; + double fill_mult=1; + CacheWarmingHelper() + : + is_forced(false), + fill_indicator('f'), + llevel(Info), + forced_fill_qty(Quantity(0)), + fill_mult(1) + {} + void set_forced_flag(){ + is_forced=true; + fill_indicator='k'; + llevel = Diag; + forced_fill_qty=Quantity(100); + fill_mult=0.0; + } + void unset_forced_flag(){ + is_forced=false; + fill_indicator='f'; + llevel = Info; + forced_fill_qty=Quantity(0); + fill_mult=1.0; + } + Quantity comp_fill_qty(const SpreaderChildOrderState& o) const{ + //if is_forced == true, o.last_update_filled_quantity()=0 + //so it will return forced_fill_qty; + //else forced_fill_qty == 0, it will return last_update_filled_quantity + return Quantity(o.last_update_filled_quantity().value() + + forced_fill_qty.value()); + } + bool is_fill(const SpreaderChildOrderState& o) const{ + return comp_fill_qty(o).value()>0; + } + }; private: enum class ChildOrderError { @@ -48,9 +89,15 @@ private: UNEXPECTED_CANCEL_ERROR, // no error condition NONE - }; + }; + // when a fill update, this is populated with + // the indices of the other legs + std::array _non_filled_indices; // if the order is _cancelled, this is set to true bool _cancelled; + // helps with forced calls, and all the artificiality of these + // calls are trapped here + CacheWarmingHelper _cw_helper; // timeout before cancel waiting goes to end const int64_t _cancel_timeout; // period on which check termination calls are @@ -66,9 +113,11 @@ private: // timestamp of last the on_time call bts::TimeStamp _curr_timestamp; // spreader fires a periodic check - bts::TimeStamp _last_check_termination_timestamp; + bts::TimeStamp _last_check_termination_timestamp; + bts::TimeStamp _cache_warm_fill_ts; // current state utils::TimeStamp _perf_ts; + ISpreaderStateWorker* _state_worker; SpreaderStartStateWorker _start_state_worker; SpreaderWaitingForInitialDataStateWorker _waiting_for_initial_data_state_worker; @@ -134,9 +183,43 @@ private: void _on_settlement_update(const SettlementUpdateEvent&); void _on_child_order_update(const OrderStateUpdateEvent&); // order handling - void _on_quoter_order (const OrderStateUpdateEvent& ord_ev, - SpreaderLegData& leg, - char& ord_indicator); + inline void _on_quoter_order (const OrderStateUpdateEvent& ord_ev, + SpreaderLegData& leg_data, + char& ord_indicator){ + _populate_non_filled_indices(leg_data.leg_property_data().leg_index()); + ord_indicator='q'; + ChildOrderError order_error = _get_order_error (ord_ev, + leg_data.quoter().expecting_cancel_update()); + LOG(OrderMan, _cw_helper.llevel, + "SpreaderOrder::_on_child_order_update quoter order " + "key:{} sec_key:{} state:{} order_key:{} status:{} " + "filled_qty:{} price:{} last_price:{} " + "msg:{} child_order_error:{}", + key(), + ord_ev.definition->security_key(), + static_cast(_state_worker->state()), + ord_ev.key, + ord_ev.status, + ord_ev.filled_quantity, + ord_ev.price, + ord_ev.last_price, + ord_ev.last_msg, + static_cast(order_error)); + leg_data.order_update_message().on_order_update(ord_ev); + if (order_error != ChildOrderError::NONE) + _state_worker->on_quoter_order_error (leg_data); + else{ + if (!_cw_helper.is_fill(leg_data.order_update_message())){ + LOG(OrderMan,Info,"h_p q child update {}",_diff_ns()); + _state_worker->on_quoter_order_status_update (leg_data); + } + else{ + ord_indicator = _cw_helper.fill_indicator; + LOG(OrderMan,Info,"h_p {} child update {}",ord_indicator,_diff_ns()); + _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); + } + } + } void _on_non_quoter_order (const OrderStateUpdateEvent& ord_ev); // State Transformations //////////////////// ///////////////////////////////////////////// @@ -260,9 +343,15 @@ private: t_stop = utils::TimeStamp::now(); return rv; } + inline void _populate_non_filled_indices (size_t filled_idx){ + int i=0; + for(uint8_t l=0;l<_bookkeeping_data().n_legs();l++) + if(l!=filled_idx) + _non_filled_indices[i++]=l; + } + // hot path related public:void _keep_hedging_path_hot(); - void _keep_hedging_path_hot_2(); - // + void _keep_hedging_path_hot_2(); void _touch_hedging_data (); // testing only ////////////////// // this provides direct way to inject diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index dfd216c8f..09efa5294 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -48,8 +48,6 @@ private: Price _out_price; Quantity _out_quantity; bts::TimeStamp _order_place_time; -public: - Quantity fake_fill_qty; public: // constructors /////////////////// /////////////////////////////////// @@ -87,8 +85,7 @@ public: // if the last fill was a status change // this will be zero Quantity last_update_filled_quantity () const { - return Quantity(_last_filled_quantity.value() + - fake_fill_qty.value()); + return _last_filled_quantity; } bool terminal_status() const { return SpreaderUtils::order_in_terminal_state(_status); @@ -139,26 +136,19 @@ public: // OrderStateUpdateEvent gives total filled qty and // last filled price void on_order_update(const OrderStateUpdateEvent& e){ - fake_fill_qty = Quantity(e.fake_fill_qty); - if (e.fake_fill_qty != 0){ - LOG(OrderMan, Info, "SpreaderChildOrderState::on_order_update " - "fake update"); - } - else{ - bts_assert(!_is_live || e.key == order_key()); - bts_assert(e.filled_quantity >= _filled_quantity.value()); - _status = e.status; - _last_filled_quantity = Quantity(e.filled_quantity - - _filled_quantity.value()); - _last_filled_price = Price(e.last_price); - _last_reported_order_price=Price(e.price); - SpreaderUtils::compute_average_price(_filled_price, - _filled_quantity, - _last_filled_price, - _last_filled_quantity, - _filled_price, - _filled_quantity); - } + bts_assert(!_is_live || e.key == order_key()); + bts_assert(e.filled_quantity >= _filled_quantity.value()); + _status = e.status; + _last_filled_quantity = Quantity(e.filled_quantity + - _filled_quantity.value()); + _last_filled_price = Price(e.last_price); + _last_reported_order_price=Price(e.price); + SpreaderUtils::compute_average_price(_filled_price, + _filled_quantity, + _last_filled_price, + _last_filled_quantity, + _filled_price, + _filled_quantity); } // order actions //////////////////// ///////////////////////////////////// @@ -166,18 +156,20 @@ public: Quantity quantity, bts::TimeStamp curr_time, const trace::CorID& trace){ + auto start = utils::TimeStamp::now(); _out_price = price; _out_quantity = quantity; _order_place_time=curr_time; bts_assert(_n_place_orders == 0); _n_place_orders++; - LOG(OrderMan, Info, "SpreaderChildOrderState::place_order " - "key:{} is_quoting:{} sec_key:{} live:{} " - "price:{} qty:{} cid:{}", - order_key(), _is_quoting, _sec_key, - _is_live, price, quantity, trace.sn); if (_is_live) _child_order.activate(price, quantity, trace); + LOG(OrderMan, Info, "SpreaderChildOrderState::place_order " + "is_quoting:{} key:{} sec_key:{} live:{} " + "price:{} qty:{} cid:{} t:{}", + _is_quoting, order_key(), _sec_key, + _is_live, price, quantity, trace.sn, + (utils::TimeStamp::now()-start).nanoseconds()); } void modify_order(Price price){ trace::CorID dont_care; @@ -188,17 +180,18 @@ public: modify_order(price,quantity,dont_care); } void modify_order(Price price, Quantity quantity, trace::CorID &trace){ + auto start = utils::TimeStamp::now(); _out_price = price; _out_quantity = quantity; - _n_modify_orders++; - LOG(OrderMan, Info, "SpreaderChildOrderState::modify_order " - "key:{} is_quoting:{} sec_key:{} live:{} " - "price:{} quantity:{} mod_no:{}", - order_key(), _is_quoting, _sec_key, - _is_live, price, quantity, _n_modify_orders); - if (_is_live) { + _n_modify_orders++; + if (_is_live) _child_order.update(price, quantity, trace); - } + LOG(OrderMan, Info, "SpreaderChildOrderState::modify_order " + "is_quoting:{} key:{} sec_key:{} live:{} " + "price:{} quantity:{} mod_no:{} t:{}", + _is_quoting, order_key(), _sec_key, + _is_live, price, quantity, _n_modify_orders, + (utils::TimeStamp::now()-start).nanoseconds()); } void cancel_order(){ bts_assert(_n_cancel_orders == 0); 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 266f34d37..8a88b4881 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -77,7 +77,9 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, trace::CorID trace){ - LOG(OrderMan, Info,"h_p w start {0}",_spreader->_diff_ns()); + SpreaderOrder::CacheWarmingHelper& cw=_spreader->_cw_helper; + LOG(OrderMan, Info,"h_p w start {} {}", + cw.fill_indicator, _spreader->_diff_ns()); //_spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); // 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) @@ -95,57 +97,60 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // ii. not send a hedge on leg_2 since its already filled // however doing the above would mess up the leg ratio's so we are preffering // getting overfilled - SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); - double mult = 1.0; - if (order_update_message.fake_fill_qty.value()>0) - mult = 0.0; - bts_assert (order_update_message.last_update_filled_quantity().value() > 0); - for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ - if (q_idx != leg_data.leg_property_data().leg_index()){ - SpreaderLegData& other_leg_data = _spreader->_bookkeeping_data().get_leg_data (q_idx); - Price hedge_price; - double hedge_qty; - _spreader->_compute_hedge_price_quantity(leg_data.leg_property_data().leg_index(), - order_update_message.last_update_filled_price(), - order_update_message.last_update_filled_quantity().value(), - order_update_message.last_reported_order_price(), - q_idx, - hedge_price, - hedge_qty); - hedge_qty = hedge_qty * mult; // 0's it out for fake fills - LOG(OrderMan, Info,"h_p comp {0} {1}", q_idx, _spreader->_diff_ns()); - UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); - leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); - uint32_t total_unhedged_qty=leg_unhedged_delta.subtract_hedge_if_available(mult); - total_unhedged_qty = total_unhedged_qty * mult; - LOG(OrderMan, Info,"h_p delta {0} {1}", q_idx, _spreader->_diff_ns()); - if (total_unhedged_qty + order_update_message.fake_fill_qty.value() != 0 ){ + SpreaderChildOrderState& updated_order = leg_data.order_update_message(); + double mult = cw.fill_mult; + Quantity filled_qty=cw.comp_fill_qty(updated_order); + bts_assert (filled_qty.value() > 0); + for (size_t i = 0; i < _spreader->_bookkeeping_data().n_legs()-1; i++){ + uint8_t q_idx=_spreader->_non_filled_indices[i]; + SpreaderLegData& other_leg_data = + _spreader->_bookkeeping_data().get_leg_data (q_idx); + Price hedge_price; + double hedge_qty; + _spreader->_compute_hedge_price_quantity( + leg_data.leg_property_data().leg_index(), + updated_order.last_update_filled_price(), + filled_qty.value(), + updated_order.last_reported_order_price(), + q_idx, + hedge_price, + hedge_qty); + hedge_qty = hedge_qty * mult; + LOG(OrderMan,cw.llevel,"h_p comp {} {} {}", + cw.fill_indicator, q_idx, _spreader->_diff_ns()); + UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); + leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); + uint32_t total_unhedged_qty= + leg_unhedged_delta.subtract_hedge_if_available(mult); + total_unhedged_qty = total_unhedged_qty * mult; + LOG(OrderMan,cw.llevel,"h_p delta {} {} {}", + cw.fill_indicator, q_idx, _spreader->_diff_ns()); // if it is an actively quoting leg, inform the quoter about it // so it can decrease the proportional size - if (other_leg_data.leg_property_data().is_active_quoting()){ - other_leg_data.quoter().update_other_leg_fills(leg_data.leg_property_data().leg_index(), - Quantity(total_unhedged_qty)); - LOG(OrderMan, Info,"h_p q minus {0} {1}", - q_idx, _spreader->_diff_ns()); - } - // a hedge is sent regardless - _spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(), - hedge_price, - Quantity(total_unhedged_qty), - trace); - LOG(OrderMan, Info,"h_p send hedge {0} {1}", - q_idx, _spreader->_diff_ns()); - } + if (other_leg_data.leg_property_data().is_active_quoting()){ + other_leg_data.quoter().update_other_leg_fills( + leg_data.leg_property_data().leg_index(), + Quantity(total_unhedged_qty)); + LOG(OrderMan,cw.llevel,"h_p q minus {} {} {}", + cw.fill_indicator, q_idx, _spreader->_diff_ns()); } + // a hedge is sent regardless + _spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(), + hedge_price, + Quantity(total_unhedged_qty), + trace); + LOG(OrderMan,cw.llevel,"h_p send hedge {} {} {}", + cw.fill_indicator, q_idx, _spreader->_diff_ns()); } // this is done at the end (i dont like ordering though) because // if the order is fully filled but there is more to quote, the quoter - // will generate a new order, which will modify order_update_message + // will generate a new order, which will modify updated_order // (we could have cached the last fill price and qty and called it // earlier too) // todo:this needs to be addressed, its confusing - leg_data.quoter().update_order_status (order_update_message); - LOG(OrderMan, Info,"h_p update q {0}", _spreader->_diff_ns()); + leg_data.quoter().update_order_status (updated_order); + LOG(OrderMan, Info,"h_p update q {} {}", + cw.fill_indicator, _spreader->_diff_ns()); } void SpreaderWorkingStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ bts_assert (leg_data.order_update_message().last_update_filled_quantity().value() == 0); 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 2019a615b..23c02b00d 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -12,7 +12,7 @@ namespace orderman { // reduced quantity due to other legs // output price, qty TEST_CASE ("quoter price quantity state", "[spreader]") -{ +{ // construction ContractLeg leg_1; fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25); @@ -135,6 +135,35 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (0.75)); REQUIRE (s.out_quantity() == Quantity (50)); } + SECTION("lets_see"){ + const uint32_t n_elems = 100000; + int arr[n_elems]; + for(uint32_t i=0; i(gen_rand(0,255)); + double sum=0; + utils::TimeStamp t0=utils::TimeStamp::now(); + for(uint32_t i=0; i128) + sum+=arr[i]; + std::cout << "br pred (rnd) " << (utils::TimeStamp::now()-t0).nanoseconds() << " ns" << std::endl; + // sort it now + std::sort(arr,arr+n_elems); + t0=utils::TimeStamp::now(); + for(uint32_t i=0; i128) + sum+=arr[i]; + std::cout << "br pred (sorted) " << (utils::TimeStamp::now()-t0).nanoseconds() << " ns" << std::endl; + // for(uint32_t i=0; i 0); + // } + } } // tests spread_qty -> leg_qty and leg_2_qty -> leg_1_qty TEST_CASE ("test_leg_quantity_normalization", "[spreader]") @@ -3789,7 +3818,6 @@ TEST_CASE ("scratch_pad_2", "[spreader]"){ time (&rawtime); struct tm* ptm = gmtime (&rawtime); LOG(OrderMan, Info, "hrs:{} mins:{} sec:{}", ptm->tm_hour, ptm->tm_min, ptm->tm_sec); - } }} \ No newline at end of file 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 1c02c8f62..a7764b1b2 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -15,6 +15,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" #include #include "lib/os/os.h" +#include namespace bts { namespace orderman { @@ -654,6 +655,14 @@ void spin_ms (int64_t ms) ; } } +void spin_us (int64_t us) +{ + if (us > 0) { + auto now = Timer::now(); + while (ns_diff(Timer::now(),now) < us * 1000) + ; + } +} void test_sleep (int64_t ms, bool is_spin){ if (is_spin) spin_ms(ms); From a7250b4734dc276aa6ac730b76193c0a238da7ef Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 8 Jan 2019 11:55:59 -0500 Subject: [PATCH 036/103] SPARK-1959 _cache_warm_fill_ts is static now --- .../orders/spreader_orders/SpreaderOrder.cpp | 5 +- .../orders/spreader_orders/SpreaderOrder.h | 18 ++--- .../SpreaderWorkingStateWorker.cpp | 77 ++++++++++--------- .../spreader_orders/tests/spreader_tests.cpp | 4 +- 4 files changed, 53 insertions(+), 51 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index c5e293afb..81d105041 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -12,6 +12,8 @@ namespace bts { namespace orderman { + +bts::TimeStamp SpreaderOrder::_cache_warm_fill_ts = bts::TimeStamp(); /**************************Cons/Dest*******************************/ SpreaderOrder::SpreaderOrder() : @@ -25,7 +27,6 @@ _bookkeeping_data_ptr(), _order_services(nullptr), _curr_timestamp(), _last_check_termination_timestamp(), -_cache_warm_fill_ts(), _perf_ts(utils::TimeStamp::now()), _state_worker(nullptr), _start_state_worker(this), @@ -105,7 +106,7 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ _send_check_termination(false); if (_any_quoter_in_irrecoverable_error()) _state_worker->on_quoter_irrecoverable_error(); - if(ms_diff(_curr_timestamp,_cache_warm_fill_ts) >= 5){ + if(ms_diff(_curr_timestamp,_cache_warm_fill_ts) >= 100){ _cache_warm_fill_ts = _curr_timestamp; _keep_hedging_path_hot_2(); } diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 4e6d4ec0b..7446c48e8 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -92,7 +92,7 @@ private: }; // when a fill update, this is populated with // the indices of the other legs - std::array _non_filled_indices; + //std::array _non_filled_indices; // if the order is _cancelled, this is set to true bool _cancelled; // helps with forced calls, and all the artificiality of these @@ -114,7 +114,7 @@ private: bts::TimeStamp _curr_timestamp; // spreader fires a periodic check bts::TimeStamp _last_check_termination_timestamp; - bts::TimeStamp _cache_warm_fill_ts; + static bts::TimeStamp _cache_warm_fill_ts; // current state utils::TimeStamp _perf_ts; @@ -186,7 +186,7 @@ private: inline void _on_quoter_order (const OrderStateUpdateEvent& ord_ev, SpreaderLegData& leg_data, char& ord_indicator){ - _populate_non_filled_indices(leg_data.leg_property_data().leg_index()); + //_populate_non_filled_indices(leg_data.leg_property_data().leg_index()); ord_indicator='q'; ChildOrderError order_error = _get_order_error (ord_ev, leg_data.quoter().expecting_cancel_update()); @@ -343,12 +343,12 @@ private: t_stop = utils::TimeStamp::now(); return rv; } - inline void _populate_non_filled_indices (size_t filled_idx){ - int i=0; - for(uint8_t l=0;l<_bookkeeping_data().n_legs();l++) - if(l!=filled_idx) - _non_filled_indices[i++]=l; - } + // inline void _populate_non_filled_indices (size_t filled_idx){ + // int i=0; + // for(uint8_t l=0;l<_bookkeeping_data().n_legs();l++) + // if(l!=filled_idx) + // _non_filled_indices[i++]=l; + // } // hot path related public:void _keep_hedging_path_hot(); void _keep_hedging_path_hot_2(); 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 8a88b4881..b0f0c9df5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -101,46 +101,47 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, double mult = cw.fill_mult; Quantity filled_qty=cw.comp_fill_qty(updated_order); bts_assert (filled_qty.value() > 0); - for (size_t i = 0; i < _spreader->_bookkeeping_data().n_legs()-1; i++){ - uint8_t q_idx=_spreader->_non_filled_indices[i]; - SpreaderLegData& other_leg_data = - _spreader->_bookkeeping_data().get_leg_data (q_idx); - Price hedge_price; - double hedge_qty; - _spreader->_compute_hedge_price_quantity( + for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ + if (q_idx!=leg_data.leg_property_data().leg_index()){ + SpreaderLegData& other_leg_data = + _spreader->_bookkeeping_data().get_leg_data (q_idx); + Price hedge_price; + double hedge_qty; + _spreader->_compute_hedge_price_quantity( + leg_data.leg_property_data().leg_index(), + updated_order.last_update_filled_price(), + filled_qty.value(), + updated_order.last_reported_order_price(), + q_idx, + hedge_price, + hedge_qty); + hedge_qty = hedge_qty * mult; + LOG(OrderMan,cw.llevel,"h_p comp {} {} {}", + cw.fill_indicator, q_idx, _spreader->_diff_ns()); + UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); + leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); + uint32_t total_unhedged_qty= + leg_unhedged_delta.subtract_hedge_if_available(mult); + total_unhedged_qty = total_unhedged_qty * mult; + LOG(OrderMan,cw.llevel,"h_p delta {} {} {}", + cw.fill_indicator, q_idx, _spreader->_diff_ns()); + // if it is an actively quoting leg, inform the quoter about it + // so it can decrease the proportional size + if (other_leg_data.leg_property_data().is_active_quoting()){ + other_leg_data.quoter().update_other_leg_fills( leg_data.leg_property_data().leg_index(), - updated_order.last_update_filled_price(), - filled_qty.value(), - updated_order.last_reported_order_price(), - q_idx, - hedge_price, - hedge_qty); - hedge_qty = hedge_qty * mult; - LOG(OrderMan,cw.llevel,"h_p comp {} {} {}", - cw.fill_indicator, q_idx, _spreader->_diff_ns()); - UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); - leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); - uint32_t total_unhedged_qty= - leg_unhedged_delta.subtract_hedge_if_available(mult); - total_unhedged_qty = total_unhedged_qty * mult; - LOG(OrderMan,cw.llevel,"h_p delta {} {} {}", - cw.fill_indicator, q_idx, _spreader->_diff_ns()); - // if it is an actively quoting leg, inform the quoter about it - // so it can decrease the proportional size - if (other_leg_data.leg_property_data().is_active_quoting()){ - other_leg_data.quoter().update_other_leg_fills( - leg_data.leg_property_data().leg_index(), - Quantity(total_unhedged_qty)); - LOG(OrderMan,cw.llevel,"h_p q minus {} {} {}", - cw.fill_indicator, q_idx, _spreader->_diff_ns()); + Quantity(total_unhedged_qty)); + LOG(OrderMan,cw.llevel,"h_p q minus {} {} {}", + cw.fill_indicator, q_idx, _spreader->_diff_ns()); + } + // a hedge is sent regardless + _spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(), + hedge_price, + Quantity(total_unhedged_qty), + trace); + LOG(OrderMan,cw.llevel,"h_p send hedge {} {} {}", + cw.fill_indicator, q_idx, _spreader->_diff_ns()); } - // a hedge is sent regardless - _spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(), - hedge_price, - Quantity(total_unhedged_qty), - trace); - LOG(OrderMan,cw.llevel,"h_p send hedge {} {} {}", - cw.fill_indicator, q_idx, _spreader->_diff_ns()); } // this is done at the end (i dont like ordering though) because // if the order is fully filled but there is more to quote, the quoter 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 23c02b00d..c0db830ca 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3666,7 +3666,7 @@ TEST_CASE ("4legs_hedging", "[spreader_perf]") // in a tight loop in the "hedges" test ?) uint32_t n_runs=1, n_book_updates=200, - n_hedges = 20; + n_hedges = 10; // since its the same quoting order we are filling // and the code downstream expects accumulated filled qty uint32_t total_filled_qty = 0, hi = 0; @@ -3730,7 +3730,7 @@ TEST_CASE ("4legs_hedging", "[spreader_perf]") auto t1=utils::TimeStamp::now(); hedge_perfs.push_back((t1-t0).nanoseconds()); fill_all_working_hedgers(spreader); - test_sleep(5,true); + test_sleep(100,true); } double min, max, mean, median; stats(hedge_perfs,min,max,mean,median); From f413938943e4fafdd3c8a0f30a2fb9a03e064645 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 9 Jan 2019 10:17:12 -0500 Subject: [PATCH 037/103] broke h_p end log into ch_term and rep --- src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 81d105041..195e3e44e 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -173,8 +173,9 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ _on_quoter_order(ord_ev,*leg_data_ptr,cb_type); LOG(OrderMan,_cw_helper.llevel,"h_p cb done {} {}",cb_type, _diff_ns()); _send_check_termination(true); + LOG(OrderMan,_cw_helper.llevel,"h_p ch_term {} {}",cb_type, _diff_ns()); _report_state(); - LOG(OrderMan, _cw_helper.llevel,"h_p end {} {}",cb_type, _diff_ns()); + LOG(OrderMan,_cw_helper.llevel,"h_p rep {} {}",cb_type, _diff_ns()); LOG(OrderMan, _cw_helper.llevel,"_on_child_order_update {} {}", cb_type, (utils::TimeStamp::now()-start).nanoseconds()); From 70e962000f7991643a7296b4aa90451ef93f330f Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 9 Jan 2019 11:18:06 -0500 Subject: [PATCH 038/103] changed the ordering of member variables from lower mem to higher --- .../orders/spreader_orders/SpreaderOrder.cpp | 4 ++-- .../orders/spreader_orders/SpreaderOrder.h | 10 +++++----- .../spreader/SingleFillHedger.cpp | 4 ++-- .../spreader/SingleFillHedger.h | 4 ++-- .../spreader/SingleLegQuoter.cpp | 19 +++++++++---------- .../spreader/SingleLegQuoter.h | 18 +++++++++--------- .../spreader/SpreaderBookkeepingData.cpp | 2 +- .../spreader/SpreaderBookkeepingData.h | 4 ++-- 8 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 195e3e44e..960dbebc8 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -18,11 +18,11 @@ bts::TimeStamp SpreaderOrder::_cache_warm_fill_ts = bts::TimeStamp(); SpreaderOrder::SpreaderOrder() : _cancelled (false), +_active(true), +_cancel_hedges_on_cancel(false), _cw_helper(), _cancel_timeout (5000),// TODO:get it from config _check_termination_period (250), // should also be a setting/config like above -_active(true), -_cancel_hedges_on_cancel(false), _bookkeeping_data_ptr(), _order_services(nullptr), _curr_timestamp(), diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 7446c48e8..a048bc3c1 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -95,6 +95,10 @@ private: //std::array _non_filled_indices; // if the order is _cancelled, this is set to true bool _cancelled; + // is false if created from disk + const bool _active; + // this is the main data + bool _cancel_hedges_on_cancel; // helps with forced calls, and all the artificiality of these // calls are trapped here CacheWarmingHelper _cw_helper; @@ -102,11 +106,7 @@ private: const int64_t _cancel_timeout; // period on which check termination calls are // sent to the state worker - const int64_t _check_termination_period; - // is false if created from disk - const bool _active; - // this is the main data - bool _cancel_hedges_on_cancel; + const int64_t _check_termination_period; std::unique_ptr _bookkeeping_data_ptr; // pointer kept to send reports SpreaderOrderServices* _order_services; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 3f916c4fd..9b41136ac 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -15,6 +15,7 @@ SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, trace::CorID const &fill_trace, bool is_live) : +_is_permenantly_cancelled(false), _spreader(spreader_manager), _leg_property_data (leg_property_data), _child_order_state (leg_property_data.leg_security_key(), @@ -22,7 +23,6 @@ _child_order_state (leg_property_data.leg_security_key(), false), _price_quantity_state(Price(0), Quantity(0)), -_is_permenantly_cancelled(false), _fill_trace(fill_trace), _worker (nullptr), _start_state_worker (this), @@ -40,11 +40,11 @@ _end_state_worker (this){ SingleFillHedger::SingleFillHedger (SingleFillHedger&& other) : +_is_permenantly_cancelled(other._is_permenantly_cancelled), _spreader (other._spreader), _leg_property_data (other._leg_property_data), _child_order_state (std::move(other._child_order_state)), _price_quantity_state (other._price_quantity_state), -_is_permenantly_cancelled(other._is_permenantly_cancelled), _fill_trace(other._fill_trace), _worker(nullptr), _start_state_worker (this, other._start_state_worker), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 62b7baecb..17670a20b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -26,11 +26,11 @@ friend HedgerWorkingStateWorker; friend HedgerWaitingForCancelAckStateWorker; friend HedgerEndStateWorker; private: + bool _is_permenantly_cancelled; ISpreaderManager& _spreader; const LegPropertyData& _leg_property_data; SpreaderChildOrderState _child_order_state; - HedgePriceQuantityState _price_quantity_state; - bool _is_permenantly_cancelled; + HedgePriceQuantityState _price_quantity_state; trace::CorID _fill_trace; IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 4e199a647..be4e52002 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -20,17 +20,16 @@ _two_legged (n_spreader_legs == 2), _active_quoting(this_leg_property.is_active_quoting()), _hidden_order(this_leg_property.leg_params().has_quote_params() && this_leg_property.leg_params().quote_params().has_quote_hidden()), -//_max_failed_iocs(config::get().n_failed_iocs), +_is_permenantly_cancelled (false), +_irrecoverable_error(false), +_n_spreader_legs (n_spreader_legs), _max_failed_iocs(20), +_n_failed_iocs(0), _spreader(spreader), _this_leg_data (this_leg_property), -_n_spreader_legs (n_spreader_legs), _child_order_state (child_order_state), _driver_cache(n_spreader_legs,n_spreader_legs>2?10:0,this_leg_property.tick_size()), _price_quantity_state(Price(0), Quantity(0), child_order_state), -_is_permenantly_cancelled (false), -_irrecoverable_error(false), -_n_failed_iocs(0), _worker(nullptr), _start_state_worker(this), _waiting_for_size_state_worker(this), @@ -54,19 +53,19 @@ SingleLegQuoter::SingleLegQuoter(SingleLegQuoter&& other) _two_legged (other._two_legged), _active_quoting(other._active_quoting), _hidden_order(other._hidden_order), +_is_permenantly_cancelled (other._is_permenantly_cancelled), +_irrecoverable_error(other._irrecoverable_error), +_n_spreader_legs (other._n_spreader_legs), _max_failed_iocs(other._max_failed_iocs), +_n_failed_iocs(other._n_failed_iocs), _spreader(other._spreader), _this_leg_data (other._this_leg_data), -_n_spreader_legs (other._n_spreader_legs), _child_order_state (other._child_order_state), _drivers_temp_usage(other._drivers_temp_usage), _driver_cache(other._driver_cache), _price_quantity_state(other._price_quantity_state.target_spread_price(), other._price_quantity_state.target_leg_quantity(), - other._price_quantity_state.order_state()), -_is_permenantly_cancelled (other._is_permenantly_cancelled), -_irrecoverable_error(other._irrecoverable_error), -_n_failed_iocs(other._n_failed_iocs), + other._price_quantity_state.order_state()), _worker(nullptr), _start_state_worker(this), _waiting_for_size_state_worker(this), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index e6966ca3d..8c8118935 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -40,15 +40,18 @@ private: const bool _two_legged; const bool _active_quoting; const bool _hidden_order; + bool _is_permenantly_cancelled; + bool _irrecoverable_error; // this is a config constant. if the quoter // is in a hidden mode, this is the max // number of cxl'ed IOCs with no fills, // before the quoter goes to an irrecoverable // eror state - const uint32_t _max_failed_iocs; - ISpreaderManager& _spreader; - const LegPropertyData& _this_leg_data; const size_t _n_spreader_legs; + const uint32_t _max_failed_iocs; + uint32_t _n_failed_iocs; + ISpreaderManager& _spreader; + const LegPropertyData& _this_leg_data; SpreaderChildOrderState& _child_order_state; // computing the quoting price/quantity for multiple // legs requires auxiliary storage for drivers, which @@ -56,13 +59,10 @@ private: // to send the orders, the drivers are committed to std::vector _drivers_temp_usage; QuoteDriverSetHistory _driver_cache; - QuoteLegPriceQuantityState _price_quantity_state; - bool _is_permenantly_cancelled; - // also implies a terminal state (this is not clear) - bool _irrecoverable_error; + QuoteLegPriceQuantityState _price_quantity_state; + // also implies a terminal state (this is not clear) // in hidden mode, every failed ioc increments - // this counter - uint32_t _n_failed_iocs; + // this counter // state workers IQuoterStateWorker* _worker; QuoterStartStateWorker _start_state_worker; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 839d41c83..efa89c423 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -11,9 +11,9 @@ SpreaderBookkeepingData::SpreaderBookkeepingData (ISpreaderManager& spreader_man bool inited_new) : _is_live(spreader_pao_services.is_live()), +_inited_new (inited_new), _n_legs(legs.size()), _n_quoting_legs(_calc_n_quoting_legs(legs)), -_inited_new (inited_new), _order_def(order_def), _reported_state(){ LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started key: {} n_legs: {}", spreader_order_key.value(), _n_legs); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index b3f64959c..8f20b80c6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -22,11 +22,11 @@ class SpreaderBookkeepingData { private: const bool _is_live; + const bool _inited_new; const size_t _n_legs; const size_t _n_quoting_legs; // when the order is not created from the disk - // (ie created live) this is set to true - const bool _inited_new; + // (ie created live) this is set to true std::vector _leg_prop_data; std::vector _books; const api::orderman::OrderDefinition _order_def; From a71953b871da99f9caee3d34f07d6048e5e2db95 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 9 Jan 2019 12:56:29 -0500 Subject: [PATCH 039/103] SPARK-1967 foundational work --- .../spreader/SpreaderBookkeepingData.cpp | 49 ++++++++++++++----- .../spreader/SpreaderLegData.cpp | 6 +-- .../spreader/SpreaderLegData.h | 32 ++++++------ 3 files changed, 59 insertions(+), 28 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index efa89c423..507e6cb37 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -16,7 +16,9 @@ _n_legs(legs.size()), _n_quoting_legs(_calc_n_quoting_legs(legs)), _order_def(order_def), _reported_state(){ - LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started key: {} n_legs: {}", spreader_order_key.value(), _n_legs); + LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started " + "key: {} n_legs: {}", + spreader_order_key.value(), _n_legs); _leg_prop_data.reserve(_n_legs), _books.reserve(_n_legs), _quoter_order_builders.reserve(_n_legs); @@ -29,23 +31,48 @@ _reported_state(){ for (const auto& lpd_iter : legs){ _leg_prop_data.push_back(lpd_iter); const LegPropertyData& leg_property_data = _leg_prop_data.back(); - _books.emplace_back(lpd_iter.leg_security_key()); - _quoter_order_builders.emplace_back(spreader_order_key, leg_property_data.quoter_order_definition(), spreader_pao_services, 10); - _hedger_order_builders.emplace_back(spreader_order_key, leg_property_data.hedger_order_definition(), spreader_pao_services, 10); - ChildOrder empty_order; - _quoter_child_order_states.emplace_back (empty_order,leg_property_data.leg_security_key(),_is_live,true); - _quoters.emplace_back(spreader_manager, leg_property_data, _n_legs, _quoter_child_order_states.back()); + _books.emplace_back(lpd_iter.leg_security_key()); + _hedger_order_builders.emplace_back( + spreader_order_key, + leg_property_data.hedger_order_definition(), + spreader_pao_services, + 10); + ChildOrder empty_order; _h_managers.emplace_back(spreader_manager,leg_property_data,_is_live), _unhedged_deltas.emplace_back(); + SpreaderChildOrderState* q_child_order=nullptr; + SpreaderOrderBuilder* q_order_builder=nullptr; + SingleLegQuoter* quoter=nullptr; + //if(leg_property_data.is_active_quoting()) + { + _quoter_child_order_states.emplace_back ( + empty_order, + leg_property_data.leg_security_key(), + _is_live, + true); + q_child_order=&(_quoter_child_order_states.back()); + _quoter_order_builders.emplace_back( + spreader_order_key, + leg_property_data.quoter_order_definition(), + spreader_pao_services, + 10); + q_order_builder=&(_quoter_order_builders.back()); + _quoters.emplace_back(spreader_manager, + leg_property_data, + _n_legs, + _quoter_child_order_states.back()); + quoter=&(_quoters.back()); + } _leg_data.emplace_back(leg_property_data, - _quoters.back(), - _quoter_order_builders.back(), + quoter, + q_order_builder, _hedger_order_builders.back(), _h_managers.back(), - _quoter_child_order_states.back(), + q_child_order, _books.back(), _unhedged_deltas.back()); - bts_assert (_sec_key_to_index.find(leg_property_data.security_key()) == _sec_key_to_index.end()); + bts_assert (_sec_key_to_index.find(leg_property_data.security_key()) + == _sec_key_to_index.end()); _sec_key_to_index.insert(std::pair(leg_property_data.security_key(), leg_property_data.leg_index())); } LOG(OrderMan, Info, "SpreaderBookkeepingData.cons completed key: {} n_legs: {}", spreader_order_key.value(), _n_legs); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp index 872409ba6..18ada7bf9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp @@ -4,11 +4,11 @@ namespace bts{ namespace orderman{ SpreaderLegData::SpreaderLegData (const LegPropertyData& leg_property_data, - SingleLegQuoter& quoter, - SpreaderOrderBuilder& quoter_order_builder, + SingleLegQuoter* quoter, + SpreaderOrderBuilder* quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, HedgerManager& hedger_manager, - SpreaderChildOrderState& quoter_child_order_state, + SpreaderChildOrderState* quoter_child_order_state, Book& book, UnhedgedDelta& unhedged_delta) : diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 243c59c61..9de3325c3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -26,21 +26,21 @@ class SpreaderLegData { private: const LegPropertyData& _leg_property_data; - SingleLegQuoter& _quoter; - SpreaderOrderBuilder& _quoter_order_builder; + SingleLegQuoter* const _quoter; + SpreaderOrderBuilder* const _quoter_order_builder; SpreaderOrderBuilder& _hedger_order_builder; - SpreaderChildOrderState& _quoter_child_order_state; + SpreaderChildOrderState* const _quoter_child_order_state; HedgerManager& _hedger_manager; Book& _book; UnhedgedDelta& _unhedged_delta; md::IntPrice _settlement_price; public: SpreaderLegData (const LegPropertyData& leg_property_data, - SingleLegQuoter& quoter, - SpreaderOrderBuilder& quoter_order_builder, + SingleLegQuoter* quoter, + SpreaderOrderBuilder* quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, HedgerManager& hedger_manager, - SpreaderChildOrderState& quoter_child_order_state, + SpreaderChildOrderState* quoter_child_order_state, Book& book, UnhedgedDelta& unhedged_delta); SpreaderLegData() = delete; @@ -60,10 +60,10 @@ public: return _leg_property_data; } SingleLegQuoter& quoter() { - return _quoter; + return *_quoter; } const SingleLegQuoter& quoter() const { - return _quoter; + return *_quoter; } const bts::orderman::Book& book () const { return _book; @@ -75,16 +75,19 @@ public: return !os::is_nan(_settlement_price.price()); } SpreaderChildOrderState& order_update_message () { - return _quoter_child_order_state; + return *_quoter_child_order_state; + } + const SpreaderChildOrderState& order_update_message () const { + return *_quoter_child_order_state; } bts::orderman::OrderKey key() { - return _quoter_child_order_state.order_key(); + return order_update_message().order_key(); } bts::orderman::OrderKey order_key() { - return _quoter_child_order_state.order_key(); + return order_update_message().order_key(); } SpreaderOrderBuilder& quoter_order_builder() { - return _quoter_order_builder; + return *_quoter_order_builder; } SpreaderOrderBuilder& hedger_order_builder() { return _hedger_order_builder; @@ -107,8 +110,9 @@ public: void total_fills (Quantity& out_quantity, Price& out_price) const{ Price qp, hp; - Quantity qq, hq; - _quoter_child_order_state.total_fills(qq, qp); + Quantity qq, hq; + const auto& quoting_order = order_update_message(); + quoting_order.total_fills(qq, qp); _hedger_manager.total_fills(hq,hp); SpreaderUtils::compute_average_price(qp,qq,hp,hq,out_price,out_quantity); } From d2aec0c7f2869d0eb11ae043fb0f0f12bb069a1c Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 9 Jan 2019 15:39:00 -0500 Subject: [PATCH 040/103] quoters are only created for quoting legs --- .../orders/spreader_orders/SpreaderOrder.cpp | 3 ++- .../spreader/SpreaderBookkeepingData.cpp | 27 ++++++++++--------- .../spreader/SpreaderLegData.cpp | 2 ++ .../spreader/SpreaderLegData.h | 3 +++ ...SpreaderWaitingForCancelAllStateWorker.cpp | 16 ++++++----- .../SpreaderWorkingStateWorker.cpp | 6 +++-- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 960dbebc8..b93adcbc7 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -319,7 +319,8 @@ bool SpreaderOrder::_any_quoter_in_irrecoverable_error() const{ void SpreaderOrder::_terminate_quoters (){ for (size_t q_idx = 0; q_idx < _bookkeeping_data().n_legs(); q_idx++){ SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(q_idx); - leg_data.quoter().terminate(); + if (leg_data.leg_property_data().is_active_quoting()) + leg_data.quoter().terminate(); } } void SpreaderOrder::_terminate_hedgers (){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 507e6cb37..d0abe97b9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -43,20 +43,21 @@ _reported_state(){ SpreaderChildOrderState* q_child_order=nullptr; SpreaderOrderBuilder* q_order_builder=nullptr; SingleLegQuoter* quoter=nullptr; - //if(leg_property_data.is_active_quoting()) { - _quoter_child_order_states.emplace_back ( - empty_order, - leg_property_data.leg_security_key(), - _is_live, - true); - q_child_order=&(_quoter_child_order_states.back()); - _quoter_order_builders.emplace_back( - spreader_order_key, - leg_property_data.quoter_order_definition(), - spreader_pao_services, - 10); - q_order_builder=&(_quoter_order_builders.back()); + _quoter_child_order_states.emplace_back ( + empty_order, + leg_property_data.leg_security_key(), + _is_live, + true); + q_child_order=&(_quoter_child_order_states.back()); + _quoter_order_builders.emplace_back( + spreader_order_key, + leg_property_data.quoter_order_definition(), + spreader_pao_services, + 10); + q_order_builder=&(_quoter_order_builders.back()); + } + if(leg_property_data.is_active_quoting()){ _quoters.emplace_back(spreader_manager, leg_property_data, _n_legs, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp index 18ada7bf9..84eb207bd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp @@ -12,6 +12,7 @@ SpreaderLegData::SpreaderLegData (const LegPropertyData& leg_property_data, Book& book, UnhedgedDelta& unhedged_delta) : +_is_quoting(leg_property_data.is_active_quoting()), _leg_property_data (leg_property_data), _quoter(quoter), _quoter_order_builder (quoter_order_builder), @@ -25,6 +26,7 @@ _settlement_price(md::INT_NAN) SpreaderLegData::SpreaderLegData(SpreaderLegData&& other) : +_is_quoting(other._is_quoting), _leg_property_data (other._leg_property_data), _quoter (other._quoter), _quoter_order_builder(other._quoter_order_builder), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 9de3325c3..6b6af7252 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -25,6 +25,7 @@ namespace orderman{ class SpreaderLegData { private: + const bool _is_quoting; const LegPropertyData& _leg_property_data; SingleLegQuoter* const _quoter; SpreaderOrderBuilder* const _quoter_order_builder; @@ -60,9 +61,11 @@ public: return _leg_property_data; } SingleLegQuoter& quoter() { + bts_assert(_is_quoting); return *_quoter; } const SingleLegQuoter& quoter() const { + bts_assert(_is_quoting); return *_quoter; } const bts::orderman::Book& book () const { 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..935e54e74 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -42,16 +42,20 @@ void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ _spreader->_transform_to_END (); } } -void SpreaderWaitingForCancelAllStateWorker::on_settlement_price(const SettlementUpdateEvent&){ +void SpreaderWaitingForCancelAllStateWorker::on_settlement_price( + const SettlementUpdateEvent&){ } -void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegData& leg_data){ +void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error( + SpreaderLegData& leg_data){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } -void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ){ +void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill( + SpreaderLegData& leg_data, + trace::CorID ){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } -void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ +void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update( + SpreaderLegData& leg_data){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_hedger_order_error(SingleFillHedger& hedger){ @@ -68,4 +72,4 @@ void SpreaderWaitingForCancelAllStateWorker::on_check_termination(){ void SpreaderWaitingForCancelAllStateWorker::on_quoter_irrecoverable_error (){ // everything has already been cancelled } -}} +}} \ 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 b0f0c9df5..c6b65abe2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -153,8 +153,10 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, LOG(OrderMan, Info,"h_p update q {} {}", cw.fill_indicator, _spreader->_diff_ns()); } -void SpreaderWorkingStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ - bts_assert (leg_data.order_update_message().last_update_filled_quantity().value() == 0); +void SpreaderWorkingStateWorker::on_quoter_order_status_update( + SpreaderLegData& leg_data){ + bts_assert ( + leg_data.order_update_message().last_update_filled_quantity().value() == 0); leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWorkingStateWorker::on_hedger_order_error(SingleFillHedger& hedger){ From cc07e28aca7dbca8394ed1679b736eb66710bcef Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 9 Jan 2019 16:42:45 -0500 Subject: [PATCH 041/103] quoters, child orders and order builders are only created for quoting legs --- .../orders/spreader_orders/SpreaderOrder.cpp | 1 + .../spreader/SpreaderBookkeepingData.cpp | 28 +++++++++---------- .../spreader/SpreaderLegData.h | 20 +++++++++---- .../SpreaderStartStateWorker.cpp | 11 +++++--- .../spreader_orders/tests/tests_common.h | 6 ++-- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index b93adcbc7..2a8cf7664 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -89,6 +89,7 @@ void SpreaderOrder::setup_new_quoter_order(size_t leg_index){ LOG(OrderMan, Info, "SpreaderOrder.setup_new_quoter_order key:{} leg:{}", key().value(), leg_index); SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(leg_index); + bts_assert(leg_data.leg_property_data().is_active_quoting()); bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); leg_data.order_update_message().re_init(child_order); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index d0abe97b9..b7f584fa2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -43,26 +43,24 @@ _reported_state(){ SpreaderChildOrderState* q_child_order=nullptr; SpreaderOrderBuilder* q_order_builder=nullptr; SingleLegQuoter* quoter=nullptr; - { - _quoter_child_order_states.emplace_back ( - empty_order, - leg_property_data.leg_security_key(), - _is_live, - true); - q_child_order=&(_quoter_child_order_states.back()); - _quoter_order_builders.emplace_back( - spreader_order_key, - leg_property_data.quoter_order_definition(), - spreader_pao_services, - 10); - q_order_builder=&(_quoter_order_builders.back()); - } if(leg_property_data.is_active_quoting()){ + _quoter_order_builders.emplace_back( + spreader_order_key, + leg_property_data.quoter_order_definition(), + spreader_pao_services, + 10); + q_order_builder=&(_quoter_order_builders.back()); + _quoter_child_order_states.emplace_back ( + empty_order, + leg_property_data.leg_security_key(), + _is_live, + true); + q_child_order=&(_quoter_child_order_states.back()); _quoters.emplace_back(spreader_manager, leg_property_data, _n_legs, _quoter_child_order_states.back()); - quoter=&(_quoters.back()); + quoter=&(_quoters.back()); } _leg_data.emplace_back(leg_property_data, quoter, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 6b6af7252..08fc10bfe 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -78,15 +78,21 @@ public: return !os::is_nan(_settlement_price.price()); } SpreaderChildOrderState& order_update_message () { + //bts_assert(_is_quoting); + if(!_is_quoting) + bts_assert(false); return *_quoter_child_order_state; } const SpreaderChildOrderState& order_update_message () const { + //bts_assert(_is_quoting); + if(!_is_quoting) + bts_assert(false); return *_quoter_child_order_state; } - bts::orderman::OrderKey key() { + bts::orderman::OrderKey key() const { return order_update_message().order_key(); } - bts::orderman::OrderKey order_key() { + bts::orderman::OrderKey order_key() const { return order_update_message().order_key(); } SpreaderOrderBuilder& quoter_order_builder() { @@ -112,10 +118,12 @@ public: // the fills - across the quoter and all the hedgers void total_fills (Quantity& out_quantity, Price& out_price) const{ - Price qp, hp; - Quantity qq, hq; - const auto& quoting_order = order_update_message(); - quoting_order.total_fills(qq, qp); + Price qp=Price(0), hp; + Quantity qq=Quantity(0), hq; + if(_is_quoting){ + const auto& quoting_order = order_update_message(); + quoting_order.total_fills(qq, qp); + } _hedger_manager.total_fills(hq,hp); SpreaderUtils::compute_average_price(qp,qq,hp,hq,out_price,out_quantity); } 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..cf36e031f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -74,16 +74,19 @@ void SpreaderStartStateWorker::on_activate(Price price, // 2. activate order builders for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++) { - SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx); - leg_data.quoter_order_builder().activate(order_services); + SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx); leg_data.hedger_order_builder().activate(order_services); + if(leg_data.leg_property_data().is_active_quoting()) + leg_data.quoter_order_builder().activate(order_services); } // 3. create orders for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data_ptr->n_legs(); l_idx++) { SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx); - bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); - leg_data.order_update_message().re_init(child_order); + if(leg_data.leg_property_data().is_active_quoting()){ + bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); + leg_data.order_update_message().re_init(child_order); + } } if(order_services.is_live()) { 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 a7764b1b2..c49eaa767 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -559,8 +559,10 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin 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_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)); + if(leg_data_1.leg_property_data().is_active_quoting()) + 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)); + if(leg_data_2.leg_property_data().is_active_quoting()) + 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)); } /**********************************************************************/ /******************************misc************************************/ From 040fc3af967a9f40c16daf1ad057cb787e9ef212 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 10 Jan 2019 09:47:45 -0500 Subject: [PATCH 042/103] removed the if _active_quoting check because that will always be the case --- .../spreader/SingleLegQuoter.cpp | 73 +++++++++---------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index be4e52002..256206188 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -39,13 +39,10 @@ _waiting_for_first_ack_cancelled_state_worker(this), _waiting_for_cancel_ack_state_worker(this), _working_state_worker(this), _end_state_worker(this){ - if (_active_quoting){ - if (!_two_legged){ - for (size_t q_idx = 0; q_idx < _n_spreader_legs; q_idx++){ - _drivers_temp_usage.push_back (QuoteLegDriver()); - } - } - } + bts_assert(_active_quoting); + if (!_two_legged) + for (size_t q_idx = 0; q_idx < _n_spreader_legs; q_idx++) + _drivers_temp_usage.push_back (QuoteLegDriver()); _transform_to_START (); } SingleLegQuoter::SingleLegQuoter(SingleLegQuoter&& other) @@ -87,50 +84,46 @@ _end_state_worker(this){ /*********************************************************************************/ void SingleLegQuoter::one_time_activate(Price price, Quantity quantity){ - if (_active_quoting){ - Quantity this_leg_quantity = SpreaderUtils::get_leg_quantity_from_spreader_quantity (_this_leg_data, quantity); - LOG(OrderMan, Info, "SingleLegQuoter::one_time_activate " - "spread_key:{} leg_idx:{}" - "price:{} leg_quantity:{}", - _spreader.spreader_order_key(),_this_leg_data.leg_index(), - price, this_leg_quantity); - _worker->one_time_activate (price, this_leg_quantity); - } + bts_assert(_active_quoting); + Quantity this_leg_quantity = SpreaderUtils::get_leg_quantity_from_spreader_quantity (_this_leg_data, quantity); + LOG(OrderMan, Info, "SingleLegQuoter::one_time_activate " + "spread_key:{} leg_idx:{}" + "price:{} leg_quantity:{}", + _spreader.spreader_order_key(),_this_leg_data.leg_index(), + price, this_leg_quantity); + _worker->one_time_activate (price, this_leg_quantity); } void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ - if (_active_quoting){ - LOG(OrderMan, Info, "SingleLegQuoter::update_order_status " - "spread_key:{} leg_idx:{} status:{}", - _spreader.spreader_order_key(),_this_leg_data.leg_index(), - static_cast(u.status())); - _worker->on_order_update (u); - } + bts_assert(_active_quoting); + LOG(OrderMan, Info, "SingleLegQuoter::update_order_status " + "spread_key:{} leg_idx:{} status:{}", + _spreader.spreader_order_key(),_this_leg_data.leg_index(), + static_cast(u.status())); + _worker->on_order_update (u); } void SingleLegQuoter::on_book(size_t leg_index, const bts::orderman::Book& book,trace::CorID trace){ - if (_active_quoting) - _worker->on_book (leg_index, book,trace); + bts_assert(_active_quoting); + _worker->on_book (leg_index, book,trace); } void SingleLegQuoter::update_other_leg_fills(size_t leg_index, Quantity filled_quantity){ - if (_active_quoting){ - LOG(OrderMan, Info, "SingleLegQuoter::update_other_leg_fills " - "spread_key:{} leg_idx:{} fill_idx:{} filled_quantity:{}", - _spreader.spreader_order_key(), _this_leg_data.leg_index(), - leg_index, filled_quantity); - _worker->on_other_leg_quoter_fill (leg_index, filled_quantity); - } + bts_assert(_active_quoting); + LOG(OrderMan, Info, "SingleLegQuoter::update_other_leg_fills " + "spread_key:{} leg_idx:{} fill_idx:{} filled_quantity:{}", + _spreader.spreader_order_key(), _this_leg_data.leg_index(), + leg_index, filled_quantity); + _worker->on_other_leg_quoter_fill (leg_index, filled_quantity); } void SingleLegQuoter::update_order_price_quantity(Price price, Quantity quantity){ - if (_active_quoting){ - Quantity this_leg_quantity = SpreaderUtils::get_leg_quantity_from_spreader_quantity (_this_leg_data, quantity); - LOG(OrderMan, Info, "SingleLegQuoter::update_order_price_quantity " - "spread_key:{} leg_idx:{} price:{} this_leg_quantity:{}", - _spreader.spreader_order_key(),_this_leg_data.leg_index(), - price, this_leg_quantity); - _worker->update_spreader_order (price, this_leg_quantity); - } + bts_assert(_active_quoting); + Quantity this_leg_quantity = SpreaderUtils::get_leg_quantity_from_spreader_quantity (_this_leg_data, quantity); + LOG(OrderMan, Info, "SingleLegQuoter::update_order_price_quantity " + "spread_key:{} leg_idx:{} price:{} this_leg_quantity:{}", + _spreader.spreader_order_key(),_this_leg_data.leg_index(), + price, this_leg_quantity); + _worker->update_spreader_order (price, this_leg_quantity); } void SingleLegQuoter::cancel_order(){ _is_permenantly_cancelled = true; From 9d5b80c9900827956264282a26963d474b1d0b84 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 10 Jan 2019 14:12:27 -0500 Subject: [PATCH 043/103] Forced manual order indicator to false on algos. --- .../orderman/order_factory/OrderFactory.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index a5eb59f90..3740d9630 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -72,8 +72,22 @@ Order &OrderFactory::create(OrderKey parent, auto k = gen_order_id(); auto pk = parent; auto &order = allocate(k, pk, def); - order.on_init_new(def, - PreActivationOrderServices{me->sec_db, *this, me->router}); + + // For non native orders we force the ManalOrderIndicator to be 'N' + // since all non native order are algos and we would rather not + // rely on the order creator (be it shell or another algo) to set + // this correctly for every single algo. + if (dynamic_cast(&order) == nullptr && + def.manual_order_indicator() == + api::orderman::MANUAL_ORDER_INDICATOR_YES) { + auto corrected_def = def; + corrected_def.set_manual_order_indicator( + api::orderman::MANUAL_ORDER_INDICATOR_NO); + order.on_init_new(corrected_def, PreActivationOrderServices{ + me->sec_db, *this, me->router}); + } else + order.on_init_new( + def, PreActivationOrderServices{me->sec_db, *this, me->router}); return order; } From 9838d123c702f0c74fa581745dba58a9be29d891 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 10 Jan 2019 14:15:04 -0500 Subject: [PATCH 044/103] Updated release notes. --- doc/user/docs/release_notes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index 10120db8c..af13528d9 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -1,4 +1,8 @@ # Release Notes +## 1.4.7 +### Bug Fixes + - Corrected FIX tag 1028, ManualOrderIndicator, when orders are triggered by algos + ## 1.4.6 ### Ladder Usability Improvements - The ladder can now be zoomed in/out according to a user's preference From 184a900eea144ef7341c0f00c658899a6b0b2d46 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 10 Jan 2019 14:51:06 -0500 Subject: [PATCH 045/103] SPARK-1877: Add Limits Test; Limits Test sets and restores limits --- src/client/spark_test/System/LimitsTests.cs | 169 ++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 src/client/spark_test/System/LimitsTests.cs diff --git a/src/client/spark_test/System/LimitsTests.cs b/src/client/spark_test/System/LimitsTests.cs new file mode 100644 index 000000000..0754eca64 --- /dev/null +++ b/src/client/spark_test/System/LimitsTests.cs @@ -0,0 +1,169 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.api.test; +using bts.test; +using mbts; + +namespace bts.tests +{ + [TestGroup(TestType = TestType.System)] + public class LimitsTests : IDisposable { + ServiceContext _context; + ApiTestService _ntest, _mtest; + + mbts.api.Test.ApiTestServiceServer _test_server; + + public LimitsTests (){ + mbts.config.Configuration.initialize(); + _context = new ServiceContext(); + + _test_server = new mbts.api.Test.ApiTestServiceServer(_context); + + _ntest = _context.locate("cpp"); + _mtest = _context.locate("c#"); + + } + + public void Dispose() { + //ApiTestsNativeMethods.apitest_stop_apitest_service(_native_server); + Disposable.dispose(ref _test_server); + Disposable.dispose(ref _context); + } +/* + private class admin_data_observer : IObserver> { + private IDisposable _unsubscriber; + + public admin_data_observer (IObservable> source){ + if(source != null) { + _unsubscriber = source.Subscribe(this); + } + } + + public void OnCompleted() + { + _unsubscriber.Dispose(); + } + + public void OnError(Exception error) + { + throw new NotImplementedException(); + } + + public void OnNext(Update value) + { + Console.Write(value.ToString()); + + } + } +*/ + + [Test] + public async Task test_clip_limits() { + //Get and set limit values from the admin service + + uint test_position_limit_value = 10u; + + var admin_service_context = _context.locate(); + Assert.IsNotNull(admin_service_context); + + /* + IObservable> sub1 = admin_service_context.subscribe_admin_data(); + var sub_obs = new admin_data_observer(sub1); + */ + + //Console.Write(position_limit_row.LongPositionLimit); + + //AccountUpdateAPIArgument update_arg = new AccountUpdateAPIArgument(); + + //BTSAccount a = admin_data.Accounts.First(); + //BTSAccountImmutable? x = a; + //BTSAccountImmutable x3 = new BTSAccountImmutable(a); + + //if (position_limit_row.HasValue) { + //BTSAccountImmutable x2 = account_data.Value.with(name: "Bob"); + //} + + Update update = await admin_service_context.subscribei_admin_data().FirstAsync(); + BTSAccountImmutable? account_data = update.all.First().Accounts.First(); // the first account is currently ACC A + + if(account_data.HasValue) { + List product_position_limits_list = account_data.Value.ProductPositionLimits.ToList(); + + IEnumerable position_limit_rows = account_data.Value.ProductPositionLimits.Where( + r => r.Product.SecuritySymbol == "CL" + && r.Product.Exchange == Venue.Sim + && r.Product.SecurityType == SecurityType.Future); + + AccountProductPositionLimitUnitImmutable? origin_position_limit_row = position_limit_rows.Any() ? position_limit_rows.First() : (AccountProductPositionLimitUnitImmutable?) null; + + AccountProductPositionLimitUnitImmutable new_position_limit_row; + + if(origin_position_limit_row.HasValue) { + product_position_limits_list.Remove(origin_position_limit_row.Value); + new_position_limit_row = origin_position_limit_row.Value.with(long_position_limit: test_position_limit_value, short_position_limit: test_position_limit_value); + } + else { + // create a mutable row and implicitly convert + ProductScope p = new ProductScope(){ SecuritySymbol = "CL", Exchange = Venue.Sim, SecurityType = SecurityType.Future }; + new_position_limit_row = (AccountProductPositionLimitUnitImmutable) new AccountProductPositionLimitUnit {Product = p, LongPositionLimit = test_position_limit_value, ShortPositionLimit = test_position_limit_value}; + } + + /* + replace the row in ProductPositionLimits + */ + + product_position_limits_list.Add(new_position_limit_row); + + var new_account_data = account_data.Value.with(product_position_limits: product_position_limits_list.Select(x => x.CloneToMutable())); + + var async_ret = await admin_service_context.update_account_async(new AccountUpdateAPIArgument { + CompleteData = new_account_data.CloneToMutable() + }); + + Assert.IsTrue(async_ret.success); + + //create Orders Here + + + + +#if DEBUG + Console.WriteLine("\n\nPress Enter to restore limits"); + Console.ReadLine(); +#endif + + // Restore the Limits to the original values + product_position_limits_list.Remove(new_position_limit_row); + if(origin_position_limit_row.HasValue) product_position_limits_list.Add(origin_position_limit_row.Value); + + new_account_data = account_data.Value.with(product_position_limits: product_position_limits_list.Select(x => x.CloneToMutable())); + + async_ret = await admin_service_context.update_account_async(new AccountUpdateAPIArgument { + CompleteData = new_account_data.CloneToMutable() + }); + + Assert.IsTrue(async_ret.success); + + } + +#if DEBUG + Console.WriteLine("\n\nPress the Any Key"); + Console.ReadLine(); + //System.Threading.Thread.Sleep(10000); +#endif + } + + [Test] + public Task async_test(){ + + return Task.Delay(100); + } + } +} From 2e883808b6b03a8269517384750a6a61422a8cc0 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 10 Jan 2019 21:34:45 -0500 Subject: [PATCH 046/103] LegPropertyData does not hold leg orderDefinitions any more --- .../orders/spreader_orders/SpreaderOrder.cpp | 3 +- .../spreader/LegPropertyData.cpp | 14 ++--- .../spreader/LegPropertyData.h | 8 +-- .../spreader/SpreaderBookkeepingData.cpp | 44 ++++++++++----- .../spreader/SpreaderBookkeepingData.h | 8 ++- .../spreader/SpreaderUtils.cpp | 6 ++- .../spreader_orders/spreader/SpreaderUtils.h | 16 ++++++ .../SpreaderStartStateWorker.cpp | 16 ++++-- .../spreader_orders/tests/spreader_tests.cpp | 54 ++++++++++++------- .../spreader_orders/tests/tests_common.h | 25 ++++++--- 10 files changed, 133 insertions(+), 61 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 2a8cf7664..1193d8a71 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -140,9 +140,10 @@ void SpreaderOrder::_keep_hedging_path_hot_2(){ bts::api::orderman::OrderState state; state.set_filled_quantity(q_ord.current_fills().value()); state.set_last_price(q_ord.last_update_filled_price().value()); + bts::api::orderman::OrderDefinition ord_def; OrderStateUpdateEvent ord_ev (q_ord.order_key(), key(), - leg.leg_property_data().quoter_order_definition(), + ord_def, state); ord_ev.status=q_ord.status(); ord_ev.price=q_ord.last_reported_order_price().value(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp index 1b8622e4d..0945f6c86 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp @@ -8,16 +8,16 @@ namespace orderman { LegPropertyData::LegPropertyData(size_t leg_index, const bts::api::ContractLeg& leg_contract, const bts::spark::LegSpreaderParams& leg_params, - api::Side trading_side, - const bts::api::orderman::OrderDefinition& quoter_order_definition, - const bts::api::orderman::OrderDefinition& hedger_order_definition) + api::Side trading_side) : _leg_index(leg_index), _leg_contract(leg_contract), _leg_params(leg_params), -_trading_side(trading_side), -_quoter_order_definition (quoter_order_definition), -_hedger_order_definition (hedger_order_definition){ - LOG(OrderMan, Info, "LegPropertyData.cons leg_idx: {} sec_key: {} side: {}", leg_index, leg_contract.security().id(), trading_side); +_trading_side(trading_side){ + LOG(OrderMan, Info, "LegPropertyData.cons leg_idx: " + "{} sec_key: {} side: {}", + leg_index, + leg_contract.security().id(), + trading_side); } }} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h b/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h index 31d6457b5..f054f9eeb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h @@ -18,15 +18,11 @@ private: const bts::api::ContractLeg _leg_contract; const bts::spark::LegSpreaderParams _leg_params; const api::Side _trading_side; - const bts::api::orderman::OrderDefinition _quoter_order_definition; - const bts::api::orderman::OrderDefinition _hedger_order_definition; public: LegPropertyData(size_t leg_index, const bts::api::ContractLeg& leg_contract, const bts::spark::LegSpreaderParams& leg_params, - api::Side trading_side, - const bts::api::orderman::OrderDefinition& quoter_order_definition, - const bts::api::orderman::OrderDefinition& hedger_order_definition); + api::Side trading_side); size_t leg_index() const {return _leg_index;} const bts::api::ContractLeg& leg_contract() const {return _leg_contract;} const bts::spark::LegSpreaderParams& leg_params () const {return _leg_params;} @@ -38,8 +34,6 @@ public: double size_multiplier() const { return _leg_contract.quantity(); } double tick_size() const { return _leg_contract.security().contract_spec().low_tick(); } bool is_active_quoting() const {return _leg_params.is_active_quoting();} - const bts::api::orderman::OrderDefinition& quoter_order_definition() const {return _quoter_order_definition;} - const bts::api::orderman::OrderDefinition& hedger_order_definition() const {return _hedger_order_definition;} bts::spark::LegSpreaderParams::LegMarketDataCalculation leg_md_calc() const { return _leg_params.leg_md_calc(); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index b7f584fa2..9eab9008b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -3,12 +3,15 @@ namespace bts{ namespace orderman{ -SpreaderBookkeepingData::SpreaderBookkeepingData (ISpreaderManager& spreader_manager, - bts::orderman::OrderKey spreader_order_key, - const api::orderman::OrderDefinition& order_def, - const SpreaderPreActivationOrderServices& spreader_pao_services, - const std::vector& legs, - bool inited_new) +SpreaderBookkeepingData::SpreaderBookkeepingData ( + ISpreaderManager& spreader_manager, + bts::orderman::OrderKey spreader_order_key, + const api::orderman::OrderDefinition& order_def, + const SpreaderPreActivationOrderServices& spreader_pao_services, + const std::vector& legs, + const std::vector& quoter_ord_defs, + const std::vector& hedger_ord_defs, + bool inited_new) : _is_live(spreader_pao_services.is_live()), _inited_new (inited_new), @@ -17,6 +20,10 @@ _n_quoting_legs(_calc_n_quoting_legs(legs)), _order_def(order_def), _reported_state(){ LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started " +_order_def(order_def), +_reported_state(){ +_order_def(order_def), +_reported_state(){ "key: {} n_legs: {}", spreader_order_key.value(), _n_legs); _leg_prop_data.reserve(_n_legs), @@ -28,13 +35,17 @@ _reported_state(){ _h_managers.reserve(_n_legs); _unhedged_deltas.reserve(_n_legs); _leg_data.reserve(_n_legs); - for (const auto& lpd_iter : legs){ + size_t i=0; + for (const auto& lpd_iter : legs){ _leg_prop_data.push_back(lpd_iter); + auto& quoter_ord_def=quoter_ord_defs[i]; + auto& hedger_ord_def=hedger_ord_defs[i]; + i++; const LegPropertyData& leg_property_data = _leg_prop_data.back(); _books.emplace_back(lpd_iter.leg_security_key()); _hedger_order_builders.emplace_back( spreader_order_key, - leg_property_data.hedger_order_definition(), + hedger_ord_def, spreader_pao_services, 10); ChildOrder empty_order; @@ -42,11 +53,11 @@ _reported_state(){ _unhedged_deltas.emplace_back(); SpreaderChildOrderState* q_child_order=nullptr; SpreaderOrderBuilder* q_order_builder=nullptr; - SingleLegQuoter* quoter=nullptr; + SingleLegQuoter* quoter=nullptr; if(leg_property_data.is_active_quoting()){ _quoter_order_builders.emplace_back( spreader_order_key, - leg_property_data.quoter_order_definition(), + quoter_ord_def, spreader_pao_services, 10); q_order_builder=&(_quoter_order_builders.back()); @@ -76,16 +87,21 @@ _reported_state(){ } LOG(OrderMan, Info, "SpreaderBookkeepingData.cons completed key: {} n_legs: {}", spreader_order_key.value(), _n_legs); } -SpreaderBookkeepingData::SpreaderBookkeepingData (ISpreaderManager& spreader_manager, - const bts::api::orderman::OrderRecord& order_record, - const SpreaderPreActivationOrderServices& spreader_pao_services, - const std::vector& legs) +SpreaderBookkeepingData::SpreaderBookkeepingData ( + ISpreaderManager& spreader_manager, + const bts::api::orderman::OrderRecord& order_record, + const SpreaderPreActivationOrderServices& spreader_pao_services, + const std::vector& legs, + const std::vector& quoter_ord_defs, + const std::vector& hedger_ord_defs) : SpreaderBookkeepingData(spreader_manager, OrderKey(order_record.key()), order_record.def(), spreader_pao_services, legs, + quoter_ord_defs, + hedger_ord_defs, false){ _reported_state=order_record.state(); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 8f20b80c6..dbb6e22f9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -51,11 +51,15 @@ public: const api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& spreader_pao_services, const std::vector& legs, + const std::vector& quoter_ord_defs, + const std::vector& hedger_ord_defs, bool inited_new=true); SpreaderBookkeepingData (ISpreaderManager& spreader_manager, const bts::api::orderman::OrderRecord& order_record, - const SpreaderPreActivationOrderServices& spreader_pao_services, - const std::vector& legs); + const SpreaderPreActivationOrderServices& spreader_pao_services, + const std::vector& legs, + const std::vector& quoter_ord_defs, + const std::vector& hedger_ord_defs); SpreaderBookkeepingData()=delete; SpreaderBookkeepingData (const SpreaderBookkeepingData&) = delete; SpreaderBookkeepingData (SpreaderBookkeepingData&&) = delete; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index 5e8d7b570..65f7ed95a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -17,6 +17,8 @@ api::Side SpreaderUtils::get_leg_side(api::Side spreader_order_side, bool SpreaderUtils::resolve_synthetic_spread (const SpreaderPreActivationOrderServices& spreader_pao_services, const api::orderman::OrderDefinition& order_def, std::vector& out_resolved, + std::vector& out_quoter_defs, + std::vector& out_hedger_defs, bool resolve_synthetic){ bts_assert(order_def.has_custom_def() && order_def.custom_def().has_spreader()); const bts::api::Security* sec_ptr = resolve_synthetic ? spreader_pao_services.resolve (SecurityKey(order_def.security_key())) : @@ -51,8 +53,10 @@ bool SpreaderUtils::resolve_synthetic_spread (const SpreaderPreActivationOrderSe api::orderman::OrderDefinition hedger_order_def = quoter_order_def; hedger_order_def.set_time_in_force(bts::api::orderman::TimeInForce::TIME_IN_FORCE_DAY); hedger_order_def.set_sub_type(bts::api::orderman::OrderSubType::ORDER_SUB_TYPE_HEDGING_LEG); - LegPropertyData leg_property_data(leg_idx, leg, leg_params, leg_order_side, quoter_order_def, hedger_order_def); + LegPropertyData leg_property_data(leg_idx, leg, leg_params, leg_order_side); out_resolved.push_back(leg_property_data); + out_quoter_defs.push_back(quoter_order_def); + out_hedger_defs.push_back(hedger_order_def); leg_idx++; } else{ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 337d23c00..27af16434 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -50,6 +50,20 @@ public: bts_assert (false); return Quantity(0); } + static bool resolve_synthetic_spread ( + const SpreaderPreActivationOrderServices& spreader_pao_services, + const api::orderman::OrderDefinition& order_def, + std::vector& out_resolved, + bool resolve_synthetic = true){ + std::vector out_quoter_defs; + std::vector out_hedger_defs; + return resolve_synthetic_spread(spreader_pao_services, + order_def, + out_resolved, + out_quoter_defs, + out_hedger_defs, + resolve_synthetic); + } // Resolves the securities and returns LegPropertyData for eacg // Returns false if // i. can not resolve the spreader security @@ -59,6 +73,8 @@ public: static bool resolve_synthetic_spread (const SpreaderPreActivationOrderServices& spreader_pao_services, const api::orderman::OrderDefinition& order_def, std::vector& out_resolved, + std::vector& out_quoter_defs, + std::vector& out_hedger_defs, bool resolve_synthetic = true); //////////////////////////////////////////////////// // orders ////////////////////////////////////////// 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 cf36e031f..f4b9c3c2b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -21,16 +21,22 @@ void SpreaderStartStateWorker::on_init_new(const api::orderman::OrderDefinition& { bts_assert(!_spreader->_inited()); std::vector spreader_legs; + std::vector quoter_ord_defs, + hedger_ord_defs; if (SpreaderUtils::resolve_synthetic_spread (spreader_pao_services, order_def, spreader_legs, + quoter_ord_defs, + hedger_ord_defs, false)){ _spreader->_bookkeeping_data_ptr = std::make_unique(*_spreader, _spreader->key(), order_def, spreader_pao_services, - spreader_legs); + spreader_legs, + quoter_ord_defs, + hedger_ord_defs); _spreader->_cancel_hedges_on_cancel= order_def.custom_def().spreader().execution_strategy().cancel_hedges_on_cancel(); } @@ -40,7 +46,9 @@ void SpreaderStartStateWorker::on_init_new(const api::orderman::OrderDefinition& _spreader->key(), order_def, spreader_pao_services, - std::vector()); + std::vector(), + std::vector(), + std::vector()); // if securities can not be resolved, the order is terminated LOG(OrderMan, Error, "SpreaderStartStateWorker.on_init_new key: {} , could not resolve securities", _spreader->key().value()); std::string msg = "Could not resolve securities"; @@ -61,7 +69,9 @@ void SpreaderStartStateWorker::on_init_recovered(const bts::api::orderman::Order _spreader->_bookkeeping_data_ptr = std::make_unique(*_spreader, order_record_copy, spreader_pao_services, - std::vector()); + std::vector(), + std::vector(), + std::vector()); LOG(OrderMan, Warn, "SpreaderStartStateWorker.on_init_recovered key: {} , going to END", _spreader->key().value()); std::string msg = "Recovered spreader orders (from last session) are cancelled"; _spreader->_transform_to_END (&msg); 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 c0db830ca..9bf5c5a3c 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -181,7 +181,7 @@ TEST_CASE ("test_leg_quantity_normalization", "[spreader]") LegSpreaderParams lsp; fill_leg_spreader_params (lsp, 1.0, true, qp); bts::api::orderman::OrderDefinition order_def; - LegPropertyData leg_prop_data (0, leg, lsp, api::Side::SIDE_BUY, order_def, order_def); + LegPropertyData leg_prop_data (0, leg, lsp, api::Side::SIDE_BUY); Quantity calc_value = SpreaderUtils::get_leg_quantity_from_spreader_quantity (leg_prop_data, Quantity (spr_qty)), expected_value = Quantity(static_cast (std::round(std::abs(leg_mult * spr_qty)))); REQUIRE (calc_value == expected_value); @@ -202,8 +202,8 @@ TEST_CASE ("test_leg_quantity_normalization", "[spreader]") fill_leg_spreader_params (lsp_1, 1.0, true, qp_1); fill_leg_spreader_params (lsp_2, 1.0, true, qp_2); bts::api::orderman::OrderDefinition order_def; - LegPropertyData leg_prop_data_1 (0, leg_1, lsp_1, api::Side::SIDE_BUY,order_def,order_def); - LegPropertyData leg_prop_data_2 (1, leg_2, lsp_2, api::Side::SIDE_BUY,order_def,order_def); + LegPropertyData leg_prop_data_1 (0, leg_1, lsp_1, api::Side::SIDE_BUY); + LegPropertyData leg_prop_data_2 (1, leg_2, lsp_2, api::Side::SIDE_BUY); Quantity calc_value = SpreaderUtils::get_leg_quantity_from_another_leg_quantity (leg_prop_data_1, Quantity(leg_qty), leg_prop_data_2), expected_value = Quantity(static_cast (std::round(std::abs(leg_qty * leg_mult_2 / leg_mult_1)))); REQUIRE (calc_value == expected_value); @@ -309,8 +309,10 @@ TEST_CASE ("spreader bookkeeping data", "[spreader]") SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs); SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); SECTION("verify security key access") { @@ -1749,8 +1751,10 @@ TEST_CASE ("spreader_START", "[spreader]") SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs); SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); SpreaderOrder spreader; REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); @@ -1805,8 +1809,10 @@ TEST_CASE ("spreader_WORKING", "[spreader]") SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs); SpreaderOrder spreader; REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); // on_init_new and activate @@ -2136,8 +2142,10 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs); SpreaderOrder spreader; REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); // on_init_new and activate @@ -2528,8 +2536,10 @@ TEST_CASE ("nlegs_compute_driver", "[spreader]"){ testonly_spreader_pao_services = _create_spreader_pao_services(sec); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs); SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); SECTION("compute_1"){ Quantity quoting_leg_target (300); @@ -2728,8 +2738,10 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs); SpreaderOrder spreader; REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); // on_init_new and activate @@ -2879,8 +2891,10 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs); SpreaderOrder spreader; REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); // on_init_new and activate @@ -3561,8 +3575,10 @@ TEST_CASE ("4legs_hedging", "[spreader_perf]") testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs); + SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs); SpreaderOrder spreader; REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); // on_init_new and activate 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 c49eaa767..3ded533d8 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -35,10 +35,13 @@ public: SpreaderManagerForTest (bts::orderman::OrderKey spreader_order_key, const api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& spreader_pao_services, - const std::vector& legs) + const std::vector& legs, + const std::vector& quoter_ord_defs, + const std::vector& hedger_ord_defs) : _spreader_order_key (spreader_order_key), - _bookkeeping_data (*this, spreader_order_key, order_def, spreader_pao_services, legs) + _bookkeeping_data (*this, spreader_order_key, order_def, spreader_pao_services, legs, + quoter_ord_defs,hedger_ord_defs) {} SpreaderBookkeepingData& bookkeeping_data() {return _bookkeeping_data;} @@ -238,7 +241,7 @@ LegPropertyData create_leg_property_data (const ContractLeg& leg, PostHedgeParams post_hp; fill_leg_spreader_params (lsp, price_multiplier, is_active_quoting, qp, pre_hp, post_hp); bts::api::orderman::OrderDefinition order_def; - return LegPropertyData (leg_index, leg, lsp, leg.side(),order_def,order_def); + return LegPropertyData (leg_index, leg, lsp, leg.side()); } SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices _create_spreader_pao_services(const Security& synthetic_security) { @@ -368,8 +371,12 @@ SpreaderManagerForTest* create_spreader_manager_2_legs (bts::orderman::OrderKey SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - return new SpreaderManagerForTest (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props, + quoter_ord_defs,hedger_ord_defs); + return new SpreaderManagerForTest (order_key, order_def, pao_services, leg_props, + quoter_ord_defs,hedger_ord_defs); } SpreaderManagerForTest* create_spreader_manager_n_legs (bts::orderman::OrderKey order_key, @@ -385,8 +392,12 @@ SpreaderManagerForTest* create_spreader_manager_n_legs (bts::orderman::OrderKey SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - return new SpreaderManagerForTest (order_key, order_def, pao_services, leg_props); + std::vector quoter_ord_defs, + hedger_ord_defs; + SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props, + quoter_ord_defs,hedger_ord_defs); + return new SpreaderManagerForTest (order_key, order_def, pao_services, leg_props, + quoter_ord_defs,hedger_ord_defs); } void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t leg_index, From dc264e1063ce33f21b02aec9e707c7014158da48 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 11 Jan 2019 08:37:49 -0500 Subject: [PATCH 047/103] fixing buid --- .../spreader_orders/spreader/SpreaderBookkeepingData.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 9eab9008b..f1fd393d4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -20,10 +20,6 @@ _n_quoting_legs(_calc_n_quoting_legs(legs)), _order_def(order_def), _reported_state(){ LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started " -_order_def(order_def), -_reported_state(){ -_order_def(order_def), -_reported_state(){ "key: {} n_legs: {}", spreader_order_key.value(), _n_legs); _leg_prop_data.reserve(_n_legs), From 14012a16da2cafb0b1ac5eee0b31006d23a5c009 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 11 Jan 2019 17:29:51 -0500 Subject: [PATCH 048/103] Add "all" option to sparkd md tail for emumba testing --- src/lib/CMakeDeps.cmake | 2 +- src/lib/md/Diag/MDPeriodicDumper.cpp | 6 ++++-- src/lib/md/Diag/MDPeriodicDumper.h | 3 ++- src/server/sparkd/md/run_md.cpp | 7 +++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index ec7dd860c..afd768425 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/md/Diag/MDPeriodicDumper.cpp b/src/lib/md/Diag/MDPeriodicDumper.cpp index 9fbfdc56c..e44d6bb66 100644 --- a/src/lib/md/Diag/MDPeriodicDumper.cpp +++ b/src/lib/md/Diag/MDPeriodicDumper.cpp @@ -150,7 +150,7 @@ void write_header(PrintFormat format, long seq_mod, const std::vector& en } } -void run_periodic_dumper(const std::set& symbols, uint32_t seq_mod, PrintFormat format) { +void run_periodic_dumper(const std::set& symbols, uint32_t seq_mod, PrintFormat format, bool monitor_all) { MDConsumer consumer(symbols, nullptr); @@ -160,7 +160,9 @@ void run_periodic_dumper(const std::set& symbols, uint32_t seq_mod, entries.push_back({ 0, handle, std::make_unique(sec) }); }); - entries = filter_entries(entries); + if (!monitor_all) { + entries = filter_entries(entries); + } write_header(format, seq_mod, entries); diff --git a/src/lib/md/Diag/MDPeriodicDumper.h b/src/lib/md/Diag/MDPeriodicDumper.h index e59a201f0..483901cd0 100644 --- a/src/lib/md/Diag/MDPeriodicDumper.h +++ b/src/lib/md/Diag/MDPeriodicDumper.h @@ -10,7 +10,8 @@ enum class PrintFormat { CSV }; -void run_periodic_dumper(const std::set&, uint32_t seq_mod, PrintFormat format); + +void run_periodic_dumper(const std::set&, uint32_t seq_mod, PrintFormat format, bool monitor_all); }}//ns \ No newline at end of file diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index c3a9e04d4..75cc6192d 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -252,14 +252,17 @@ void dump_db(const vector& args) { void run_tail(const vector& args) { std::set products; auto conf = parse_md_args(args); + bool monitor_all = false; + for (const auto& b : args) { if (b=="all") monitor_all = true; } + PlatformConfig config; - config.set_type(api::SecurityType_Name(api::SECURITYTYPE_FUTURE)); + if (!monitor_all) config.set_type(api::SecurityType_Name(api::SECURITYTYPE_FUTURE)); config.set_platform(co2::Platform_Name(conf.platform)); get_system_md_symbols(config, products); auto mod = conf.number > 0 ? conf.number : 1000; PrintFormat fmt = PrintFormat::CSV; for (const auto& a : args) { if (a == "longform") fmt = PrintFormat::Human; } - md::run_periodic_dumper(products, mod, fmt); + md::run_periodic_dumper(products, mod, fmt, monitor_all); } void run_channels() { From 207c93c97206934c1f62c9d99e23e4db0b7f3acb Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 11 Jan 2019 17:49:23 -0500 Subject: [PATCH 049/103] All the leg data is in one place now inside the SpreaderLegData (as opposed to ref's to SpreaderBookkeepingData) --- .../spreader/SpreaderBookkeepingData.cpp | 92 ++++++------------- .../spreader/SpreaderBookkeepingData.h | 14 +-- .../spreader/SpreaderLegData.cpp | 44 ++++----- .../spreader/SpreaderLegData.h | 60 ++++++++---- .../SpreaderOrderBuilder.h | 6 +- .../spreader/hedger/HedgerManager.cpp | 24 +++-- .../spreader/hedger/HedgerManager.h | 24 ++++- 7 files changed, 131 insertions(+), 133 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index f1fd393d4..d735539c1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -3,17 +3,18 @@ namespace bts{ namespace orderman{ +using namespace bts::api::orderman; + SpreaderBookkeepingData::SpreaderBookkeepingData ( ISpreaderManager& spreader_manager, bts::orderman::OrderKey spreader_order_key, - const api::orderman::OrderDefinition& order_def, + const OrderDefinition& order_def, const SpreaderPreActivationOrderServices& spreader_pao_services, const std::vector& legs, - const std::vector& quoter_ord_defs, - const std::vector& hedger_ord_defs, + const std::vector& quoter_ord_defs, + const std::vector& hedger_ord_defs, bool inited_new) : -_is_live(spreader_pao_services.is_live()), _inited_new (inited_new), _n_legs(legs.size()), _n_quoting_legs(_calc_n_quoting_legs(legs)), @@ -22,74 +23,34 @@ _reported_state(){ LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started " "key: {} n_legs: {}", spreader_order_key.value(), _n_legs); - _leg_prop_data.reserve(_n_legs), - _books.reserve(_n_legs), - _quoter_order_builders.reserve(_n_legs); - _hedger_order_builders.reserve(_n_legs); - _quoter_child_order_states.reserve(_n_legs); - _quoters.reserve(_n_legs); - _h_managers.reserve(_n_legs); - _unhedged_deltas.reserve(_n_legs); _leg_data.reserve(_n_legs); size_t i=0; - for (const auto& lpd_iter : legs){ - _leg_prop_data.push_back(lpd_iter); - auto& quoter_ord_def=quoter_ord_defs[i]; - auto& hedger_ord_def=hedger_ord_defs[i]; - i++; - const LegPropertyData& leg_property_data = _leg_prop_data.back(); - _books.emplace_back(lpd_iter.leg_security_key()); - _hedger_order_builders.emplace_back( - spreader_order_key, - hedger_ord_def, - spreader_pao_services, - 10); - ChildOrder empty_order; - _h_managers.emplace_back(spreader_manager,leg_property_data,_is_live), - _unhedged_deltas.emplace_back(); - SpreaderChildOrderState* q_child_order=nullptr; - SpreaderOrderBuilder* q_order_builder=nullptr; - SingleLegQuoter* quoter=nullptr; - if(leg_property_data.is_active_quoting()){ - _quoter_order_builders.emplace_back( - spreader_order_key, - quoter_ord_def, - spreader_pao_services, - 10); - q_order_builder=&(_quoter_order_builders.back()); - _quoter_child_order_states.emplace_back ( - empty_order, - leg_property_data.leg_security_key(), - _is_live, - true); - q_child_order=&(_quoter_child_order_states.back()); - _quoters.emplace_back(spreader_manager, - leg_property_data, - _n_legs, - _quoter_child_order_states.back()); - quoter=&(_quoters.back()); - } - _leg_data.emplace_back(leg_property_data, - quoter, - q_order_builder, - _hedger_order_builders.back(), - _h_managers.back(), - q_child_order, - _books.back(), - _unhedged_deltas.back()); + for (const auto& leg_property_data : legs){ + _leg_data.emplace_back(spreader_pao_services, + spreader_order_key, + _n_legs, + spreader_manager, + quoter_ord_defs[i], + hedger_ord_defs[i], + leg_property_data); bts_assert (_sec_key_to_index.find(leg_property_data.security_key()) == _sec_key_to_index.end()); - _sec_key_to_index.insert(std::pair(leg_property_data.security_key(), leg_property_data.leg_index())); + _sec_key_to_index.insert(std::pair( + leg_property_data.security_key(), + leg_property_data.leg_index())); + i++; } - LOG(OrderMan, Info, "SpreaderBookkeepingData.cons completed key: {} n_legs: {}", spreader_order_key.value(), _n_legs); + LOG(OrderMan, Info, "SpreaderBookkeepingData.cons completed " + "key: {} n_legs: {}", spreader_order_key.value(), + _n_legs); } SpreaderBookkeepingData::SpreaderBookkeepingData ( ISpreaderManager& spreader_manager, - const bts::api::orderman::OrderRecord& order_record, + const OrderRecord& order_record, const SpreaderPreActivationOrderServices& spreader_pao_services, const std::vector& legs, - const std::vector& quoter_ord_defs, - const std::vector& hedger_ord_defs) + const std::vector& quoter_ord_defs, + const std::vector& hedger_ord_defs) : SpreaderBookkeepingData(spreader_manager, OrderKey(order_record.key()), @@ -132,9 +93,8 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(size_t leg_index, bts::Quantity hedge_quantity, SpreaderOrderServices*, const trace::CorID&){ - HedgerManager& l_hm = _h_managers[leg_index]; - SingleFillHedger& rv = l_hm.get_hedger(); - rv.init (hedge_price,hedge_quantity); - return rv; + bts_assert(leg_index < _leg_data.size()); + SpreaderLegData& leg_data=_leg_data[leg_index]; + return leg_data.add_new_hedger(hedge_price,hedge_quantity); } }} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index dbb6e22f9..be51f287f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -21,22 +21,13 @@ class SingleFillHedger; class SpreaderBookkeepingData { private: - const bool _is_live; const bool _inited_new; const size_t _n_legs; const size_t _n_quoting_legs; // when the order is not created from the disk - // (ie created live) this is set to true - std::vector _leg_prop_data; - std::vector _books; + // (ie created live) this is set to true const api::orderman::OrderDefinition _order_def; - std::vector _quoter_order_builders; - std::vector _hedger_order_builders; - std::vector _quoter_child_order_states; - std::vector _quoters; - std::vector _h_managers; - std::vector _unhedged_deltas; - std::vector _leg_data; + std::vector _leg_data; boost::container::flat_map _sec_key_to_index; // state thats sent out in report (its kept here amd modified // vs creating a new one everytime) @@ -44,6 +35,7 @@ private: Price _input_price; Price _effective_price; Quantity _quantity; +private: size_t _calc_n_quoting_legs(const std::vector& legs); public: SpreaderBookkeepingData (ISpreaderManager& spreader_manager, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp index 84eb207bd..12895a23c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp @@ -3,36 +3,36 @@ namespace bts{ namespace orderman{ -SpreaderLegData::SpreaderLegData (const LegPropertyData& leg_property_data, - SingleLegQuoter* quoter, - SpreaderOrderBuilder* quoter_order_builder, - SpreaderOrderBuilder& hedger_order_builder, - HedgerManager& hedger_manager, - SpreaderChildOrderState* quoter_child_order_state, - Book& book, - UnhedgedDelta& unhedged_delta) -: -_is_quoting(leg_property_data.is_active_quoting()), -_leg_property_data (leg_property_data), -_quoter(quoter), -_quoter_order_builder (quoter_order_builder), -_hedger_order_builder (hedger_order_builder), -_quoter_child_order_state (quoter_child_order_state), -_hedger_manager(hedger_manager), -_book(book), -_unhedged_delta(unhedged_delta), -_settlement_price(md::INT_NAN) -{} +// SpreaderLegData::SpreaderLegData (const LegPropertyData& leg_property_data, +// SingleLegQuoter* quoter, +// SpreaderOrderBuilder* quoter_order_builder, +// SpreaderOrderBuilder& hedger_order_builder, +// HedgerManager& hedger_manager, +// SpreaderChildOrderState* quoter_child_order_state, +// Book& book, +// UnhedgedDelta& unhedged_delta) +// : +// _is_quoting(leg_property_data.is_active_quoting()), +// _leg_property_data (leg_property_data), +// _quoter(quoter), +// _quoter_order_builder (quoter_order_builder), +// _hedger_order_builder (hedger_order_builder), +// _quoter_child_order_state (quoter_child_order_state), +// _hedger_manager(hedger_manager), +// _book(book), +// _unhedged_delta(unhedged_delta), +// _settlement_price(md::INT_NAN) +// {} SpreaderLegData::SpreaderLegData(SpreaderLegData&& other) : _is_quoting(other._is_quoting), _leg_property_data (other._leg_property_data), -_quoter (other._quoter), _quoter_order_builder(other._quoter_order_builder), _hedger_order_builder(other._hedger_order_builder), _quoter_child_order_state (other._quoter_child_order_state), -_hedger_manager(other._hedger_manager), +_quoter (other._quoter), +_hedger_manager(std::move(other._hedger_manager)), _book(other._book), _unhedged_delta(other._unhedged_delta){ bts_assert (false); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 08fc10bfe..444d2e1bf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -22,28 +22,50 @@ namespace orderman{ // SpreaderBookkeeping. all the data except // for the Book and LegPropertyData // are references to SpreaderBookkeeping -class SpreaderLegData -{ +class SpreaderLegData{ private: const bool _is_quoting; - const LegPropertyData& _leg_property_data; - SingleLegQuoter* const _quoter; + const LegPropertyData _leg_property_data; SpreaderOrderBuilder* const _quoter_order_builder; - SpreaderOrderBuilder& _hedger_order_builder; + SpreaderOrderBuilder _hedger_order_builder; SpreaderChildOrderState* const _quoter_child_order_state; - HedgerManager& _hedger_manager; - Book& _book; - UnhedgedDelta& _unhedged_delta; + SingleLegQuoter* const _quoter; + HedgerManager _hedger_manager; + Book _book; + UnhedgedDelta _unhedged_delta; md::IntPrice _settlement_price; public: - SpreaderLegData (const LegPropertyData& leg_property_data, - SingleLegQuoter* quoter, - SpreaderOrderBuilder* quoter_order_builder, - SpreaderOrderBuilder& hedger_order_builder, - HedgerManager& hedger_manager, - SpreaderChildOrderState* quoter_child_order_state, - Book& book, - UnhedgedDelta& unhedged_delta); + SpreaderLegData (const SpreaderPreActivationOrderServices& services, + OrderKey spreader_order_key, + size_t n_legs, + ISpreaderManager& spreader_manager, + const bts::api::orderman::OrderDefinition& quoter_ord_def, + const bts::api::orderman::OrderDefinition& hedger_ord_def, + const LegPropertyData& leg_property_data) + : + _is_quoting(leg_property_data.is_active_quoting()), + _leg_property_data (leg_property_data), + _quoter_order_builder (_is_quoting ? new SpreaderOrderBuilder( + spreader_order_key, + quoter_ord_def, + services,10) + : nullptr), + _hedger_order_builder (spreader_order_key,hedger_ord_def,services,10), + _quoter_child_order_state (_is_quoting ? new SpreaderChildOrderState( + _leg_property_data.leg_security_key(), + services.is_live(), + true) + : nullptr), + _quoter(_is_quoting ? new SingleLegQuoter(spreader_manager, + _leg_property_data, + n_legs, + *_quoter_child_order_state) + : nullptr), + _hedger_manager(spreader_manager,_leg_property_data,services.is_live()), + _book(), + _unhedged_delta(), + _settlement_price(md::INT_NAN) + {} SpreaderLegData() = delete; SpreaderLegData(const SpreaderLegData&) = delete; // this cons is not deleted since for each leg, @@ -156,5 +178,11 @@ public: SingleFillHedger& get_hedger_test_only(size_t index) { return _hedger_manager.get_hedger_at(index); } + SingleFillHedger& add_new_hedger(bts::Price hedge_price, + bts::Quantity hedge_quantity){ + SingleFillHedger& rv = _hedger_manager.get_hedger(); + rv.init (hedge_price,hedge_quantity); + return rv; +} }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h index 37556dac7..a80fd728c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h @@ -81,7 +81,11 @@ public: const SpreaderPreActivationOrderServices& spreader_pao_services, size_t reserve_sz); SpreaderOrderBuilder() = delete; - SpreaderOrderBuilder(const SpreaderOrderBuilder&) = delete; + SpreaderOrderBuilder(const SpreaderOrderBuilder&) + : + _is_live(true){ + bts_assert(false); + } SpreaderOrderBuilder(SpreaderOrderBuilder&& other); SpreaderOrderBuilder& operator=(const SpreaderOrderBuilder) = delete; SpreaderOrderBuilder& operator=(SpreaderOrderBuilder&& other) = delete; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp index 03b99f1d8..fe4c3e0d7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -18,23 +18,21 @@ _is_live(is_live) is_live); } -SingleFillHedger& HedgerManager::get_hedger(){ - for (auto& h : _hedgers) - if(h.is_free()) - return h; - LOG(OrderMan, Error, "HedgerManager::get_hedger allocating new hedger {} ", - _hedgers.size()); - _hedgers.emplace_back(_spreader_manager, - _leg_property_data, - _trace, - _is_live); - return _hedgers.back(); +HedgerManager::HedgerManager (HedgerManager&& other) +: +_spreader_manager(other._spreader_manager), +_leg_property_data(other._leg_property_data), +_trace(other._trace), +_is_live(other._is_live), +_hedgers(std::move(other._hedgers)){ + bts_assert(false); } + void HedgerManager::total_fills(Quantity& out_qty, - Price& out_price){ + Price& out_price) const{ double sum = 0.0; uint32_t tot_qty = 0; - for (SingleFillHedger& hedger : _hedgers){ + for (const SingleFillHedger& hedger : _hedgers){ Quantity hq; Price hp; hedger.order_state().total_fills(hq, hp); sum += hq.value() * hp.value(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index 32b5494a6..9891108ea 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -21,8 +21,24 @@ public: const LegPropertyData& leg_property_data, bool is_live); HedgerManager() = delete; + HedgerManager (const HedgerManager&) = delete; + // to support HedgerManager being indirectly part of a vector + HedgerManager (HedgerManager&& other); + HedgerManager& operator=(const HedgerManager&) = delete; + HedgerManager& operator=(HedgerManager&&) = delete; // finds a free hedger - SingleFillHedger& get_hedger(); + inline SingleFillHedger& get_hedger(){ + for (auto& h : _hedgers) + if(h.is_free()) + return h; + LOG(OrderMan, Error, "HedgerManager::get_hedger allocating new hedger {} ", + _hedgers.size()); + _hedgers.emplace_back(_spreader_manager, + _leg_property_data, + _trace, + _is_live); + return _hedgers.back(); + } // finds a hedger that is working on // an order with the specified key SingleFillHedger* find_hedger_from_orderkey(OrderKey order_key){ @@ -54,9 +70,9 @@ public: } // returns the number of hedgers that // have an active working order - size_t n_active_hedgers() { + size_t n_active_hedgers() const { size_t rv=0; - for (SingleFillHedger& hedger : _hedgers) + for (const SingleFillHedger& hedger : _hedgers) if(hedger.is_active_order()) rv++; return rv; @@ -64,7 +80,7 @@ public: // computes the total fills and average // fill price across all the hedgers void total_fills(Quantity& out_qty, - Price& out_price); + Price& out_price) const; SingleFillHedger& get_hedger_at(size_t index) { bts_assert(index<_hedgers.size()); return _hedgers[index]; From 02ee5cc6d30d8d5372c01bf4f17063d3083207cc Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 11 Jan 2019 18:45:24 -0500 Subject: [PATCH 050/103] moved orderbuilders (not used) in the hot path away from the hot memory --- .../spreader/SpreaderLegData.cpp | 6 +++--- .../spreader/SpreaderLegData.h | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp index 12895a23c..7e811a80c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp @@ -28,13 +28,13 @@ SpreaderLegData::SpreaderLegData(SpreaderLegData&& other) : _is_quoting(other._is_quoting), _leg_property_data (other._leg_property_data), -_quoter_order_builder(other._quoter_order_builder), -_hedger_order_builder(other._hedger_order_builder), _quoter_child_order_state (other._quoter_child_order_state), _quoter (other._quoter), _hedger_manager(std::move(other._hedger_manager)), _book(other._book), -_unhedged_delta(other._unhedged_delta){ +_unhedged_delta(other._unhedged_delta), +_quoter_order_builder(other._quoter_order_builder), +_hedger_order_builder(other._hedger_order_builder){ bts_assert (false); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 444d2e1bf..73d6a4940 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -25,15 +25,15 @@ namespace orderman{ class SpreaderLegData{ private: const bool _is_quoting; - const LegPropertyData _leg_property_data; - SpreaderOrderBuilder* const _quoter_order_builder; - SpreaderOrderBuilder _hedger_order_builder; + const LegPropertyData _leg_property_data; SpreaderChildOrderState* const _quoter_child_order_state; SingleLegQuoter* const _quoter; HedgerManager _hedger_manager; Book _book; UnhedgedDelta _unhedged_delta; md::IntPrice _settlement_price; + SpreaderOrderBuilder* const _quoter_order_builder; + SpreaderOrderBuilder _hedger_order_builder; public: SpreaderLegData (const SpreaderPreActivationOrderServices& services, OrderKey spreader_order_key, @@ -45,12 +45,6 @@ public: : _is_quoting(leg_property_data.is_active_quoting()), _leg_property_data (leg_property_data), - _quoter_order_builder (_is_quoting ? new SpreaderOrderBuilder( - spreader_order_key, - quoter_ord_def, - services,10) - : nullptr), - _hedger_order_builder (spreader_order_key,hedger_ord_def,services,10), _quoter_child_order_state (_is_quoting ? new SpreaderChildOrderState( _leg_property_data.leg_security_key(), services.is_live(), @@ -64,7 +58,13 @@ public: _hedger_manager(spreader_manager,_leg_property_data,services.is_live()), _book(), _unhedged_delta(), - _settlement_price(md::INT_NAN) + _settlement_price(md::INT_NAN), + _quoter_order_builder (_is_quoting ? new SpreaderOrderBuilder( + spreader_order_key, + quoter_ord_def, + services,10) + : nullptr), + _hedger_order_builder (spreader_order_key,hedger_ord_def,services,10) {} SpreaderLegData() = delete; SpreaderLegData(const SpreaderLegData&) = delete; From 8b9df305b4c33d04d2c1f24376f1270df5d9be92 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 13 Jan 2019 21:57:13 -0500 Subject: [PATCH 051/103] took the ChildOrder initilization out of the critical hedging path --- .../spreader/SpreaderChildOrderState.cpp | 39 ++++++------------- .../spreader/SpreaderChildOrderState.h | 9 ----- .../spreader/hedger/HedgerManager.cpp | 20 ++++++---- .../spreader/hedger/HedgerManager.h | 6 ++- .../hedger_states/HedgerStartStateWorker.cpp | 16 +++----- ...readerWaitingForInitialDataStateWorker.cpp | 1 + .../spreader_orders/tests/spreader_tests.cpp | 8 ++-- 7 files changed, 40 insertions(+), 59 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp index 7bac526e5..97aae369d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp @@ -26,33 +26,28 @@ _out_price(src._out_price), _out_quantity(src._out_quantity), _order_place_time(src._order_place_time) { } -SpreaderChildOrderState::SpreaderChildOrderState(SecurityKey sec_key, - bool is_live, - bool is_quoting) -: -SpreaderChildOrderState (_empty_order(),sec_key,is_live,is_quoting){ -} -SpreaderChildOrderState::SpreaderChildOrderState (ChildOrder& child_order, - SecurityKey sec_key, +SpreaderChildOrderState::SpreaderChildOrderState (SecurityKey sec_key, bool is_live, bool is_quoting) : _is_live (is_live), _sec_key (sec_key), _is_quoting (is_quoting), -_test_only_order_key((uint32_t)bts::Timer::now().time_since_epoch().count()){ - _init_base_values(); - re_init(child_order); +_test_only_order_key((uint32_t)bts::Timer::now().time_since_epoch().count()), +_base_price(0), +_base_quantity(0){ + ChildOrder& empty_order=_empty_order(); + re_init(empty_order); } -void SpreaderChildOrderState::_init_base_values(){ - _base_quantity = Quantity(0); - _base_price = Price(0); -} -void SpreaderChildOrderState::_init_running_values(){ - _n_cancel_orders = _n_modify_orders = 0; +void SpreaderChildOrderState::re_init (ChildOrder& child_order){ + SpreaderUtils::compute_average_price(_base_price, _base_quantity, + _filled_price, _filled_quantity, + _base_price, _base_quantity); _n_place_orders = 0; + _n_cancel_orders = _n_modify_orders = 0; _child_order = ChildOrder(); + _child_order = std::move(child_order); _status = bts::api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; _filled_price = Price(0); _filled_quantity = Quantity (0); @@ -63,14 +58,4 @@ void SpreaderChildOrderState::_init_running_values(){ _out_quantity = Quantity(0); _order_place_time=bts::TimeStamp(); } -void SpreaderChildOrderState::re_init(){ - SpreaderUtils::compute_average_price(_base_price, _base_quantity, - _filled_price, _filled_quantity, - _base_price, _base_quantity); - _init_running_values(); -} -void SpreaderChildOrderState::re_init (ChildOrder& child_order){ - re_init(); - _child_order = std::move(child_order); -} }} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 09efa5294..ef29f1afc 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -56,10 +56,6 @@ public: SpreaderChildOrderState(SecurityKey sec_key, bool is_live, bool is_quoting); - SpreaderChildOrderState(ChildOrder& child_order, - SecurityKey sec_key, - bool is_live, - bool is_quoting); SpreaderChildOrderState (SpreaderChildOrderState&& src); SpreaderChildOrderState& operator=(const SpreaderChildOrderState&) = delete; SpreaderChildOrderState& operator=(SpreaderChildOrderState&&) = delete; @@ -119,11 +115,6 @@ public: } // init /////////////////// /////////////////////////// - // zero's out base values - void _init_base_values(); - // zero's out session last price/qty - void _init_running_values (); - void re_init(); // this assignes a new order, and subsumes the earlier order's // fills and filled price into the base quantity and // base filled price diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp index fe4c3e0d7..a222429fb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -7,23 +7,29 @@ HedgerManager::HedgerManager(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, bool is_live) : +_is_live(is_live), +_inited(false), _spreader_manager(spreader_manager), _leg_property_data(leg_property_data), -_is_live(is_live) -{ +_trace() +{} +void HedgerManager::init_once(){ + bts_assert(!_inited); + _inited=true; + bts_assert(_hedgers.size()==0); for(size_t i=0; i<4; i++) - _hedgers.emplace_back(spreader_manager, - leg_property_data, + _hedgers.emplace_back(_spreader_manager, + _leg_property_data, _trace, - is_live); + _is_live); } - HedgerManager::HedgerManager (HedgerManager&& other) : +_is_live(other._is_live), +_inited(other._inited), _spreader_manager(other._spreader_manager), _leg_property_data(other._leg_property_data), _trace(other._trace), -_is_live(other._is_live), _hedgers(std::move(other._hedgers)){ bts_assert(false); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index 9891108ea..8f89c8fc3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -8,10 +8,11 @@ namespace orderman{ class HedgerManager{ private: + bool _is_live; + bool _inited; ISpreaderManager& _spreader_manager; const LegPropertyData& _leg_property_data; - const trace::CorID _trace; - bool _is_live; + const trace::CorID _trace; std::vector _hedgers; //small_vector unf needs operator= which is deleted //for the Hedger @@ -20,6 +21,7 @@ public: HedgerManager(ISpreaderManager& spreader_manager, const LegPropertyData& leg_property_data, bool is_live); + void init_once(); HedgerManager() = delete; HedgerManager (const HedgerManager&) = delete; // to support HedgerManager being indirectly part of a vector 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 ce2e9bf44..d6a2cf14b 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 @@ -7,21 +7,17 @@ namespace bts{ namespace orderman{ void HedgerStartStateWorker::on_transition (){ - _hedger->_price_quantity_state.re_init(Price(0),Quantity(0)); - _hedger->_child_order_state.re_init(); + _hedger->_price_quantity_state.re_init(Price(0),Quantity(0)); + size_t leg_idx = _hedger->_leg_property_data.leg_index(); + ChildOrder new_order = _hedger->_spreader.get_new_hedge_order(leg_idx); + _hedger->_child_order_state.re_init(new_order); } void HedgerStartStateWorker::init (Price price, Quantity quantity){ _hedger->_price_quantity_state.re_init(price,quantity); - _hedger->_child_order_state.re_init(); - size_t leg_idx = _hedger->_leg_property_data.leg_index(); - if(quantity.value() > 0){ - ChildOrder new_order = _hedger->_spreader.get_new_hedge_order(leg_idx); - _hedger->_child_order_state.re_init(new_order); - // this is the only place an order is enterred - _hedger->_place_order (price, - quantity); + if(quantity.value() > 0){ + _hedger->_place_order (price, quantity); _hedger->transform_to_WAITING_FOR_FIRST_ACK (); } } 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..978639db8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -98,6 +98,7 @@ void SpreaderWaitingForInitialDataStateWorker::_init_quoters(){ Quantity quantity = _spreader->_bookkeeping_data().quantity(); for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++){ SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx); + leg_data.hedger_manager().init_once(); if (leg_data.leg_property_data().is_active_quoting()) leg_data.quoter().one_time_activate(effective_price, quantity); } 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 9bf5c5a3c..1f4343d0d 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -17,8 +17,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") ContractLeg leg_1; fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25); LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 2.0); - ChildOrder empty_order; - SpreaderChildOrderState order(empty_order, leg_prop_data_1.leg_security_key(),false,true); + SpreaderChildOrderState order(leg_prop_data_1.leg_security_key(),false,true); QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200), order); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); @@ -88,7 +87,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_quantity() == Quantity (123)); SECTION("test cycle_back") { - SpreaderChildOrderState order_2(empty_order, leg_prop_data_1.leg_security_key(),false,true); + SpreaderChildOrderState order_2(leg_prop_data_1.leg_security_key(),false,true); QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200),order_2); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); @@ -114,7 +113,8 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (1.0)); REQUIRE (s.out_quantity() == Quantity (50)); // // now cycle it back - order_2.re_init(); + ChildOrder child_order; + order_2.re_init(child_order); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); REQUIRE (s.aggregated_filled_quantity() == Quantity (0)); From 8d0d678c019bbbcd69e572b0de39a09ad70cd33d Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 14 Jan 2019 09:58:13 -0500 Subject: [PATCH 052/103] unused parameters rmeoved form add_new_hedger --- .../orders/spreader_orders/SpreaderOrder.cpp | 6 ++--- .../spreader/SpreaderBookkeepingData.cpp | 9 ++++--- .../spreader/SpreaderBookkeepingData.h | 6 ++--- .../spreader_orders/tests/spreader_tests.cpp | 24 +++++-------------- 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 1193d8a71..8b64a7e95 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -343,12 +343,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 trace::CorID){ _bookkeeping_data().add_new_hedger (hedge_leg_index, hedge_price, - hedge_qty, - _order_services, - trace); + hedge_qty); } void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, Price fill_price, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index d735539c1..519b71a13 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -88,11 +88,10 @@ void SpreaderBookkeepingData::total_fills (Quantity& out_quantity, out_quantity = Quantity(fills); out_price = Price(avg_price); } -SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(size_t leg_index, - bts::Price hedge_price, - bts::Quantity hedge_quantity, - SpreaderOrderServices*, - const trace::CorID&){ +SingleFillHedger& SpreaderBookkeepingData::add_new_hedger( + size_t leg_index, + Price hedge_price, + Quantity hedge_quantity){ bts_assert(leg_index < _leg_data.size()); SpreaderLegData& leg_data=_leg_data[leg_index]; return leg_data.add_new_hedger(hedge_price,hedge_quantity); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index be51f287f..8a72ebaf8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -104,10 +104,8 @@ public: // (dont keep pointers to hedgers since the vector // can resize) SingleFillHedger& add_new_hedger(size_t leg_index, - bts::Price hedge_price, - bts::Quantity hedge_quantity, - SpreaderOrderServices *services, - const trace::CorID&); + Price hedge_price, + Quantity hedge_quantity); // 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/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 1f4343d0d..cb35affa0 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1280,9 +1280,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") ChildOrder co; SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, - hedger_quantity, - nullptr, - trace::CorID()); + hedger_quantity); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, @@ -1364,9 +1362,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") //SingleFillHedger hedger (sm, sm.get_leg_data (1), co, hedger_price, hedger_quantity,false); SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, - hedger_quantity, - nullptr, - trace::CorID()); + hedger_quantity); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); SECTION("1. init") { @@ -1427,9 +1423,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") ChildOrder co; SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, - hedger_quantity, - nullptr, - trace::CorID()); + hedger_quantity); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, @@ -1506,9 +1500,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") ChildOrder co; SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, - hedger_quantity, - nullptr, - trace::CorID()); + hedger_quantity); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, @@ -1588,9 +1580,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") ChildOrder co; SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, - hedger_quantity, - nullptr, - trace::CorID()); + hedger_quantity); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, @@ -1651,9 +1641,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") ChildOrder co; SingleFillHedger& hedger = bookeeping_data.add_new_hedger(1, hedger_price, - hedger_quantity, - nullptr, - trace::CorID()); + hedger_quantity); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, From a64d428a89506b26046aae281fb9110ff6052b58 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 14 Jan 2019 14:34:49 -0500 Subject: [PATCH 053/103] added comments and inlined some smaller functions --- .../spreader/SingleFillHedger.cpp | 18 ++---------- .../spreader/SingleFillHedger.h | 29 +++++++++++++++---- .../spreader/SpreaderLegData.h | 4 +-- .../spreader/hedger/HedgerManager.cpp | 23 ++++----------- .../spreader/hedger/HedgerManager.h | 25 ++++++++++++---- .../spreader_orders/tests/spreader_tests.cpp | 16 +++++----- .../spreader_orders/tests/tests_common.h | 4 +-- 7 files changed, 64 insertions(+), 55 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 9b41136ac..d1a501de2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -82,30 +82,18 @@ _end_state_worker (this, other._end_state_worker){ } bts_assert(_worker!=nullptr); } -OrderKey SingleFillHedger::_hedge_order_key(){ - // this function is only called for logging - // purposes. - if(is_active_order()) - return _child_order_state.order_key(); - else - // when the hedger does not have an active order - // (ie when in START or END states). since this - // function is only called for logging purposes - // it is safe to return 0 - return OrderKey(0); -} /********************************************************************/ /****************************External Calls**************************/ /********************************************************************/ -void SingleFillHedger::init (Price price, - Quantity quantity){ +void SingleFillHedger::init_hedger (Price price, + Quantity quantity){ _worker->init(price, quantity); } void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ //bts_assert (u.order_key() == _order.order_key()); LOG(OrderMan, Info, "SingleFillHedger::update_order_status " "key:{} state:{} order status:{} fills:{}", - _hedge_order_key(), _worker->state_text(),! + _hedge_order_key(), _worker->state_text(), static_cast(u.status()), u.last_update_filled_quantity()); _worker->on_order_update (u); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 17670a20b..dcd3a3050 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -63,7 +63,18 @@ private: void _cancel_order () { _child_order_state.cancel_order(); } - bts::orderman::OrderKey _hedge_order_key(); + // this function is only called for logging + // purposes. + inline bts::orderman::OrderKey _hedge_order_key() const{ + if(is_active_order()) + return _child_order_state.order_key(); + else + // when the hedger does not have an active order + // (ie when in START or END states). since this + // function is only called for logging purposes + // it is safe to return 0 + return OrderKey(0); + } TimeStamp _current_time () const { return _spreader.current_time(); } @@ -79,7 +90,13 @@ public: SingleFillHedger& operator=(const SingleFillHedger&) = delete; SingleFillHedger& operator=(SingleFillHedger&&) = delete; //a. leave the start state and submit the order - void init (Price price, Quantity quantity); + //the hedging machinery is constructed as follows : + //i.HedgerManger is created + //ii.HedgerManager.init_once constructs the hedgers + //that live in the START state until... + //iii.until init_hedger is called which sets the price + //qty and causes the order to be submitted + void init_hedger (Price price, Quantity quantity); //b. called by the spreader when there is an order update // reported by the exchange void on_order_update(const SpreaderChildOrderState& order_update_message); @@ -105,16 +122,16 @@ public: bool expecting_cancel_update() const { return _worker->state() == HedgerState::WAITING_FOR_CANCEL_ACK; } - HedgerState state() const{ + inline HedgerState state() const{ return _worker->state(); } - bool is_free() const{ + inline bool is_free() const{ return state()==HedgerState::START; } - SpreaderChildOrderState& order_state() { + inline SpreaderChildOrderState& order_state() { return _child_order_state; } - const SpreaderChildOrderState& order_state() const { + inline const SpreaderChildOrderState& order_state() const { return _child_order_state; } public: diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 73d6a4940..575a759b9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -176,12 +176,12 @@ public: } // returns the hedger at a given index SingleFillHedger& get_hedger_test_only(size_t index) { - return _hedger_manager.get_hedger_at(index); + return _hedger_manager.test_only_get_hedger_at(index); } SingleFillHedger& add_new_hedger(bts::Price hedge_price, bts::Quantity hedge_quantity){ SingleFillHedger& rv = _hedger_manager.get_hedger(); - rv.init (hedge_price,hedge_quantity); + rv.init_hedger (hedge_price,hedge_quantity); return rv; } }; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp index a222429fb..933b7c4e3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp @@ -9,15 +9,17 @@ HedgerManager::HedgerManager(ISpreaderManager& spreader_manager, : _is_live(is_live), _inited(false), +_init_n_hedgers(2), _spreader_manager(spreader_manager), _leg_property_data(leg_property_data), -_trace() -{} +_trace(){ + _hedgers.reserve(_init_n_hedgers); +} void HedgerManager::init_once(){ bts_assert(!_inited); _inited=true; bts_assert(_hedgers.size()==0); - for(size_t i=0; i<4; i++) + for(uint8_t i=0; i<_init_n_hedgers; i++) _hedgers.emplace_back(_spreader_manager, _leg_property_data, _trace, @@ -27,6 +29,7 @@ HedgerManager::HedgerManager (HedgerManager&& other) : _is_live(other._is_live), _inited(other._inited), +_init_n_hedgers(other._init_n_hedgers), _spreader_manager(other._spreader_manager), _leg_property_data(other._leg_property_data), _trace(other._trace), @@ -34,18 +37,4 @@ _hedgers(std::move(other._hedgers)){ bts_assert(false); } -void HedgerManager::total_fills(Quantity& out_qty, - Price& out_price) const{ - double sum = 0.0; - uint32_t tot_qty = 0; - for (const SingleFillHedger& hedger : _hedgers){ - Quantity hq; Price hp; - hedger.order_state().total_fills(hq, hp); - sum += hq.value() * hp.value(); - tot_qty += hq.value(); - } - out_qty = Quantity(tot_qty); - out_price = tot_qty == 0 ? Price(0.0) : Price(sum / tot_qty); -} - }} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index 8f89c8fc3..9c39bb6d7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -8,8 +8,9 @@ namespace orderman{ class HedgerManager{ private: - bool _is_live; + const bool _is_live; bool _inited; + const uint8_t _init_n_hedgers; ISpreaderManager& _spreader_manager; const LegPropertyData& _leg_property_data; const trace::CorID _trace; @@ -81,13 +82,27 @@ public: } // computes the total fills and average // fill price across all the hedgers - void total_fills(Quantity& out_qty, - Price& out_price) const; - SingleFillHedger& get_hedger_at(size_t index) { + inline void total_fills(Quantity& out_qty, + Price& out_price) const{ + double sum = 0.0; + uint32_t tot_qty = 0; + for (const SingleFillHedger& hedger : _hedgers){ + Quantity hq; Price hp; + hedger.order_state().total_fills(hq, hp); + sum += hq.value() * hp.value(); + tot_qty += hq.value(); + } + out_qty = Quantity(tot_qty); + out_price = tot_qty == 0 ? Price(0.0) : Price(sum / tot_qty); + } +public: + /////////////////////////// + // test only ////////////// + SingleFillHedger& test_only_get_hedger_at(size_t index) { bts_assert(index<_hedgers.size()); return _hedgers[index]; } - size_t pool_size() const{ + size_t test_only_pool_size() const{ return _hedgers.size(); } }; 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 cb35affa0..c00297b8b 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3005,17 +3005,17 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") REQUIRE(hm_1.n_active_hedgers()==1); // legs 2 and 3 REQUIRE(securities::test_price_equality( - bookkeeping_data.get_leg_data (1).hedger_manager().get_hedger_at (0).order_state().out_price().value(), + bookkeeping_data.get_leg_data (1).hedger_manager().test_only_get_hedger_at (0).order_state().out_price().value(), 20.035, 0.005)); REQUIRE(securities::test_price_equality( - bookkeeping_data.get_leg_data (2).hedger_manager().get_hedger_at (0).order_state().out_price().value(), + bookkeeping_data.get_leg_data (2).hedger_manager().test_only_get_hedger_at (0).order_state().out_price().value(), 19.995, 0.005)); // back to leg1's hedger, this is what will // be mainly tested here on { - auto& hedger_1_1 = hm_1.get_hedger_at (0); + auto& hedger_1_1 = hm_1.test_only_get_hedger_at (0); REQUIRE(hedger_1_1.order_state().out_quantity().value() == 1); REQUIRE(securities::test_price_equality( hedger_1_1.order_state().out_price().value(), @@ -3050,7 +3050,7 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") REQUIRE(bookkeeping_data.get_leg_data (1).hedger_manager().n_active_hedgers()==2); REQUIRE(bookkeeping_data.get_leg_data (2).hedger_manager().n_active_hedgers()==2); { - auto& hedger_1_1 = hm_1.get_hedger_at (0); + auto& hedger_1_1 = hm_1.test_only_get_hedger_at (0); REQUIRE(hedger_1_1.order_state().out_quantity().value() == 1); REQUIRE(securities::test_price_equality( hedger_1_1.order_state().out_price().value(), @@ -3086,7 +3086,7 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") REQUIRE(bookkeeping_data.get_leg_data (2).hedger_manager().n_active_hedgers()==6); REQUIRE(bookkeeping_data.get_leg_data (3).hedger_manager().n_active_hedgers()==0); for (size_t i=0;i<4;i++){ - auto& h = hm_1.get_hedger_at(i); + auto& h = hm_1.test_only_get_hedger_at(i); REQUIRE(h.state()==HedgerState::WAITING_FOR_FIRST_ACK); REQUIRE(h.order_state().out_quantity().value()==2); REQUIRE(securities::test_price_equality( @@ -3097,7 +3097,7 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") // send order acks ////////// ///////////////////////////// for (size_t i=0;i<4;i++){ - auto& h = hm_1.get_hedger_at(i); + auto& h = hm_1.test_only_get_hedger_at(i); spreader.test_only_on_child_order_update (h.order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), @@ -3113,7 +3113,7 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") // fills 1 lot on each order // /////////////////////////////// for (size_t i=0;i<4;i++){ - auto& h = hm_1.get_hedger_at(i); + auto& h = hm_1.test_only_get_hedger_at(i); // previous hedger fills were 20.015, 20.025 spreader.test_only_on_child_order_update (h.order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, @@ -3135,7 +3135,7 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") // which should complete the orders ////// ////////////////////////////////////////// for (size_t i=0;i<4;i++){ - auto& h = hm_1.get_hedger_at(i); + auto& h = hm_1.test_only_get_hedger_at(i); // previous hedger fills were 20.015, 20.025 spreader.test_only_on_child_order_update (h.order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, 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 3ded533d8..369f919a6 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -483,8 +483,8 @@ void fill_all_working_hedgers(SpreaderOrder& s){ for (size_t i=0;i Date: Mon, 14 Jan 2019 14:37:51 -0500 Subject: [PATCH 054/103] SPARK-1966 Add CME ticker trade details --- src/lib/config/protos/MarketData.proto | 1 + .../sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp | 1 + .../sparkd/md/platforms/mdp3_onixs/MDP3Listener.h | 13 ++++++++++++- .../sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp | 5 ++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index 90b204f74..ddcebb619 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -110,6 +110,7 @@ message CMEOptions // Prevents parsing trades/rfqs/doing anything not required for quoting optional bool quoter_mode = 6; + optional bool verbose_ticker = 7 [default=false]; } message RecordOptions { diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index b788c6a2a..6049e982b 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -19,6 +19,7 @@ MDP3Listener::MDP3Listener( const std::vector channels) : _index(index), _producer(producer), + _verbose_ticker(config::get().verbose_ticker()), _packet_arrived(), _latest_sequence(0), // _settlement_recorder(settles), diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index c29a1d01c..1a9881faf 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -182,6 +182,7 @@ private: CMESecurityIndex& _index; MDProducer& _producer; + bool _verbose_ticker; utils::TimeStamp _packet_arrived; uint32_t _latest_sequence; // co2::SettlementRecorder& _settlement_recorder; @@ -416,7 +417,17 @@ void MDP3Listener::onTradeSummary(const onixs::Security& sec, const TradeSummary onixs::Decimal price = arg.entry().entryPx(); onixs::AggressorSide::Enum agside = onixs::AggressorSide::NoAggressor; arg.entry().aggressorSide(agside); - on_trade(data, price, size, agside, arg.message().transactTime()); + if (_verbose_ticker) { + const auto& details = arg.orderIds(); + auto sz = details.size(); + for (size_t x = 0; x < sz; ++x) { + const auto& d = details[x]; + on_trade(data, price, d.lastQty(), agside, arg.message().transactTime()); + } + } + else { + on_trade(data, price, size, agside, arg.message().transactTime()); + } } } diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index 425a3e8d3..82d6aa0de 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -269,7 +269,10 @@ unique_ptr MDP3Main::prepare_handler(const string& channel_id) { // Misc settings settings.bookManagement().updateNotification(onixs::BookUpdateNotification::OnEndOfEvent); - settings.tradeProcessing(onixs::TradeProcessing::SummaryLevel); + settings.tradeProcessing( + config::get().verbose_ticker() ? + onixs::TradeProcessing::OrderDetails : + onixs::TradeProcessing::SummaryLevel); // // Logging From 979c6e078ac86454867bd97a85bb9c294397bfb2 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 14 Jan 2019 14:39:05 -0500 Subject: [PATCH 055/103] Remove misleading comments --- .../md/platforms/mdp3_onixs/MDP3Listener.h | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index 1a9881faf..fc20add4c 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -453,7 +453,6 @@ void MDP3Listener::onSettlementPrice(const onixs::Security& sec, const Statistic onixs::Timestamp time; args.entry().entryPx(price); args.entry().tradingReferenceDate(time); - // args.entry(). auto display_factor = data->handle.security().display_factor; data->handle.update_settlement( utils::TimeStamp::now(), @@ -465,19 +464,16 @@ void MDP3Listener::onSettlementPrice(const onixs::Security& sec, const Statistic template void MDP3Listener::onSessionOpeningPrice(const onixs::Security& sec, const SessionArgs& args) { tracepoint (bts_trace,trace_order,(char*) "onOpeningPrice.session", _latest_sequence, (uint16_t) _latest_sequence, 0); - // auto type = args.entry().settlPriceType(); - // if (type.final() && type.actual()) { - auto* data = _index.get_security(sec.id()); - if (data != nullptr) { - onixs::Decimal price = args.entry().entryPx(); - onixs::Timestamp time = args.message().transactTime(); - auto display_factor = data->handle.security().display_factor; - data->handle.update_opening( - utils::TimeStamp::now(), - double_of_price(price, display_factor), - date_of_timestamp(time)); - } - // + auto* data = _index.get_security(sec.id()); + if (data != nullptr) { + onixs::Decimal price = args.entry().entryPx(); + onixs::Timestamp time = args.message().transactTime(); + auto display_factor = data->handle.security().display_factor; + data->handle.update_opening( + utils::TimeStamp::now(), + double_of_price(price, display_factor), + date_of_timestamp(time)); + } } template void MDP3Listener::onRecoveryOpeningPrice(const onixs::Security& sec, const RecoveryArgs& args) { From 5e3467e3b62bfcf4f67c1bde7885a74fea5b8afc Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 14 Jan 2019 14:41:47 -0500 Subject: [PATCH 056/103] Add release note --- doc/user/docs/release_notes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index af13528d9..2ee01defa 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -1,4 +1,8 @@ # Release Notes +## 1.4.8 +### Marketdata + - Additional trade details for CME ticker + ## 1.4.7 ### Bug Fixes - Corrected FIX tag 1028, ManualOrderIndicator, when orders are triggered by algos From bd8336e22bf4ac4ac69808fd88b02787c5d00bd8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 14 Jan 2019 16:58:07 -0500 Subject: [PATCH 057/103] inlined add_new_hedger --- .../spreader_orders/spreader/SpreaderBookkeepingData.cpp | 8 -------- .../spreader_orders/spreader/SpreaderBookkeepingData.h | 8 ++++++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 519b71a13..f3ed35e80 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -88,12 +88,4 @@ void SpreaderBookkeepingData::total_fills (Quantity& out_quantity, out_quantity = Quantity(fills); out_price = Price(avg_price); } -SingleFillHedger& SpreaderBookkeepingData::add_new_hedger( - size_t leg_index, - Price hedge_price, - Quantity hedge_quantity){ - bts_assert(leg_index < _leg_data.size()); - SpreaderLegData& leg_data=_leg_data[leg_index]; - return leg_data.add_new_hedger(hedge_price,hedge_quantity); -} }} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 8a72ebaf8..994b401d0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -103,9 +103,13 @@ public: // and returns a ref to it // (dont keep pointers to hedgers since the vector // can resize) - SingleFillHedger& add_new_hedger(size_t leg_index, + inline SingleFillHedger& add_new_hedger(size_t leg_index, Price hedge_price, - Quantity hedge_quantity); + Quantity hedge_quantity){ + bts_assert(leg_index < _leg_data.size()); + SpreaderLegData& leg_data=_leg_data[leg_index]; + return leg_data.add_new_hedger(hedge_price,hedge_quantity); + } // 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; From e45736a692df9d75cbaa73d6274641671919fa14 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 15 Jan 2019 09:25:06 -0500 Subject: [PATCH 058/103] putting the fake fill log messages o lower logging level --- .../orders/spreader_orders/SpreaderOrder.cpp | 24 ++++++++++--------- .../orders/spreader_orders/SpreaderOrder.h | 4 ++-- .../SpreaderWorkingStateWorker.cpp | 10 ++++---- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 8b64a7e95..022ac56ff 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -176,7 +176,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ LOG(OrderMan,_cw_helper.llevel,"h_p cb done {} {}",cb_type, _diff_ns()); _send_check_termination(true); LOG(OrderMan,_cw_helper.llevel,"h_p ch_term {} {}",cb_type, _diff_ns()); - _report_state(); + _report_state(!_cw_helper.is_forced); LOG(OrderMan,_cw_helper.llevel,"h_p rep {} {}",cb_type, _diff_ns()); LOG(OrderMan, _cw_helper.llevel,"_on_child_order_update {} {}", cb_type, @@ -385,7 +385,7 @@ void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, Price(computed_hedge_price), Quantity(hedge_quantity)); } -void SpreaderOrder::_report_state (){ +void SpreaderOrder::_report_state (bool report){ if (_activated()){ SpreaderBookkeepingData& bookkeeping_data = _bookkeeping_data(); auto& reported_state = bookkeeping_data.reported_state(); @@ -404,15 +404,17 @@ void SpreaderOrder::_report_state (){ reported_state.set_filled_quantity(filled_qty.value()); reported_state.set_avg_price(avg_filled_price.value()); } - // if order is cons'ed from disc, with inited_new==false, - // we just publish what was given to us - LOG(OrderMan, Info, "SpreaderOrder::_report_state key:{} status:{} " - "price:{} qty:{} filled:{} avg_price:{}", - key(), status, reported_state.price(), - reported_state.quantity(), - reported_state.filled_quantity(), - reported_state.avg_price()); - _order_services->report_state(reported_state); + if(report){ + // if order is cons'ed from disc, with inited_new==false, + // we just publish what was given to us + LOG(OrderMan, Info, "SpreaderOrder::_report_state key:{} status:{} " + "price:{} qty:{} filled:{} avg_price:{}", + key(), status, reported_state.price(), + reported_state.quantity(), + reported_state.filled_quantity(), + reported_state.avg_price()); + _order_services->report_state(reported_state); + } } } bts::api::orderman::OrderStatus SpreaderOrder::_get_order_status () const{ diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index a048bc3c1..996b2ca3a 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -215,7 +215,7 @@ private: } else{ ord_indicator = _cw_helper.fill_indicator; - LOG(OrderMan,Info,"h_p {} child update {}",ord_indicator,_diff_ns()); + LOG(OrderMan,_cw_helper.llevel,"h_p {} child update {}",ord_indicator,_diff_ns()); _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); } } @@ -277,7 +277,7 @@ private: Price& hedge_price, double& hedge_quantity); // sends the report out - void _report_state (); + void _report_state (bool report=true); SpreaderBookkeepingData& _bookkeeping_data(){ bts_assert (_bookkeeping_data_ptr != nullptr); return *_bookkeeping_data_ptr; 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 c6b65abe2..209bd0b6e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -78,7 +78,9 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, trace::CorID trace){ SpreaderOrder::CacheWarmingHelper& cw=_spreader->_cw_helper; - LOG(OrderMan, Info,"h_p w start {} {}", + SpreaderChildOrderState& updated_order = leg_data.order_update_message(); + double mult = cw.fill_mult; + LOG(OrderMan, cw.llevel,"h_p w start {} {}", cw.fill_indicator, _spreader->_diff_ns()); //_spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); // this is the most complex part of the spreader. the following needs to be done @@ -96,9 +98,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // - or more generally counting the total working hedges and reducing their qty) // ii. not send a hedge on leg_2 since its already filled // however doing the above would mess up the leg ratio's so we are preffering - // getting overfilled - SpreaderChildOrderState& updated_order = leg_data.order_update_message(); - double mult = cw.fill_mult; + // getting overfilled Quantity filled_qty=cw.comp_fill_qty(updated_order); bts_assert (filled_qty.value() > 0); for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ @@ -150,7 +150,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // earlier too) // todo:this needs to be addressed, its confusing leg_data.quoter().update_order_status (updated_order); - LOG(OrderMan, Info,"h_p update q {} {}", + LOG(OrderMan,cw.llevel,"h_p update q {} {}", cw.fill_indicator, _spreader->_diff_ns()); } void SpreaderWorkingStateWorker::on_quoter_order_status_update( From d4fd3900bea4723a1cf588022967e603bf842f2f Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 15 Jan 2019 14:39:38 -0500 Subject: [PATCH 059/103] added config key to enable cache warming --- src/lib/config/protos/spreader.proto | 9 +++++ .../orders/spreader_orders/SpreaderOrder.cpp | 14 +++++-- .../orders/spreader_orders/SpreaderOrder.h | 39 ++++++++++++------- .../spreader_orders/spreader/SpreaderUtils.h | 7 ++++ .../SpreaderStartStateWorker.cpp | 2 +- .../SpreaderWorkingStateWorker.cpp | 2 +- .../spreader_orders/tests/spreader_tests.cpp | 1 + 7 files changed, 54 insertions(+), 20 deletions(-) diff --git a/src/lib/config/protos/spreader.proto b/src/lib/config/protos/spreader.proto index 97f3860e5..2c6672c91 100644 --- a/src/lib/config/protos/spreader.proto +++ b/src/lib/config/protos/spreader.proto @@ -3,4 +3,13 @@ package bts.config; message Spreader{ optional uint32 n_failed_iocs = 10 [default=20]; + //if this is set to true, the spreader internally + //generates fake fills to keep the cache (data and + //instruction) warm + message CacheWarming{ + optional bool enable_fills = 10 [default=true]; + optional double fill_period_low = 20 [default=10]; + optional double fill_period_high = 30 [default=50]; + } + optional CacheWarming cache_warming = 20; } \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 022ac56ff..89269f756 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -13,7 +13,6 @@ namespace bts { namespace orderman { -bts::TimeStamp SpreaderOrder::_cache_warm_fill_ts = bts::TimeStamp(); /**************************Cons/Dest*******************************/ SpreaderOrder::SpreaderOrder() : @@ -34,6 +33,11 @@ _waiting_for_initial_data_state_worker(this), _working_state_worker(this), _waiting_for_cancel_all_state_worker(this), _end_state_worker(this){ + LOG(OrderMan, Info,"SpreaderOrder:SpreaderOrder key:{} " + "cw::enable_fills:{} cw::fill_fire_period:{}", + key(), + _cw_helper.enable_fills, + _cw_helper.fill_fire_period); _transform_to_START(); } SpreaderOrder::~SpreaderOrder () {} @@ -107,8 +111,10 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ _send_check_termination(false); if (_any_quoter_in_irrecoverable_error()) _state_worker->on_quoter_irrecoverable_error(); - if(ms_diff(_curr_timestamp,_cache_warm_fill_ts) >= 100){ - _cache_warm_fill_ts = _curr_timestamp; + if(_cw_helper.enable_fills && + ms_diff(_curr_timestamp,_cw_helper.last_cache_warm_fill_ts) >= + _cw_helper.fill_fire_period){ + _cw_helper.last_cache_warm_fill_ts = _curr_timestamp; _keep_hedging_path_hot_2(); } } @@ -176,7 +182,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ LOG(OrderMan,_cw_helper.llevel,"h_p cb done {} {}",cb_type, _diff_ns()); _send_check_termination(true); LOG(OrderMan,_cw_helper.llevel,"h_p ch_term {} {}",cb_type, _diff_ns()); - _report_state(!_cw_helper.is_forced); + _report_state(!_cw_helper.is_warm_state); LOG(OrderMan,_cw_helper.llevel,"h_p rep {} {}",cb_type, _diff_ns()); LOG(OrderMan, _cw_helper.llevel,"_on_child_order_update {} {}", cb_type, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 996b2ca3a..13e6f0de9 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -18,6 +18,8 @@ #include "lib/orderman/events/OrderStateUpdateEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/mercury/events/TimerEvent.h" +#include "lib/config/config.h" +#include "lib/config/protos/spreader.pb.h" //using namespace bts::orderman; @@ -35,37 +37,47 @@ friend class SpreaderWorkingStateWorker; friend class SpreaderWaitingForCancelAllStateWorker; friend class SpreaderEndStateWorker; public: - class CacheWarmingHelper{ - public: - bool is_forced; + class CacheWarmingState{ + public: + const bool enable_fills; + const uint32_t fill_fire_period; + bool is_warm_state; char fill_indicator; - log::Level llevel; + log::Level llevel; Quantity forced_fill_qty; double fill_mult=1; - CacheWarmingHelper() + bts::TimeStamp last_cache_warm_fill_ts; + CacheWarmingState() : - is_forced(false), + enable_fills(config::get().cache_warming().enable_fills()), + fill_fire_period( + SpreaderUtils::random_number( + config::get().cache_warming().fill_period_low(), + config::get().cache_warming().fill_period_high() + )), + is_warm_state(false), fill_indicator('f'), - llevel(Info), - forced_fill_qty(Quantity(0)), - fill_mult(1) + llevel(Info), + forced_fill_qty(0), + fill_mult(1), + last_cache_warm_fill_ts() {} void set_forced_flag(){ - is_forced=true; + is_warm_state=true; fill_indicator='k'; llevel = Diag; forced_fill_qty=Quantity(100); fill_mult=0.0; } void unset_forced_flag(){ - is_forced=false; + is_warm_state=false; fill_indicator='f'; llevel = Info; forced_fill_qty=Quantity(0); fill_mult=1.0; } Quantity comp_fill_qty(const SpreaderChildOrderState& o) const{ - //if is_forced == true, o.last_update_filled_quantity()=0 + //if is_warm_state == true, o.last_update_filled_quantity()=0 //so it will return forced_fill_qty; //else forced_fill_qty == 0, it will return last_update_filled_quantity return Quantity(o.last_update_filled_quantity().value() + @@ -101,7 +113,7 @@ private: bool _cancel_hedges_on_cancel; // helps with forced calls, and all the artificiality of these // calls are trapped here - CacheWarmingHelper _cw_helper; + CacheWarmingState _cw_helper; // timeout before cancel waiting goes to end const int64_t _cancel_timeout; // period on which check termination calls are @@ -114,7 +126,6 @@ private: bts::TimeStamp _curr_timestamp; // spreader fires a periodic check bts::TimeStamp _last_check_termination_timestamp; - static bts::TimeStamp _cache_warm_fill_ts; // current state utils::TimeStamp _perf_ts; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 27af16434..14814bd08 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -9,6 +9,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include namespace bts { namespace orderman { @@ -815,6 +816,12 @@ public: static uint32_t _round_leg_qty_computed_from_another_leg_qty (double qty){ return static_cast(std::round(qty)); } + static double random_number(double min, double max){ + std::random_device rd; + std::mt19937 gen(rd()); //Standard mersenne_twister_engine seeded with rd() + std::uniform_real_distribution<> dis(min, max); + return dis(gen); + } /**********************************************************************/ /**************************debugging helpers***************************/ /**********************************************************************/ 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 f4b9c3c2b..39dc6844f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -14,7 +14,7 @@ _spreader(spreader){ SpreaderState SpreaderStartStateWorker::state() const { return SpreaderState::START; } -void SpreaderStartStateWorker::on_transition (){ +void SpreaderStartStateWorker::on_transition (){ } void SpreaderStartStateWorker::on_init_new(const api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& spreader_pao_services) 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 209bd0b6e..3a47148f4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -77,7 +77,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, trace::CorID trace){ - SpreaderOrder::CacheWarmingHelper& cw=_spreader->_cw_helper; + SpreaderOrder::CacheWarmingState& cw=_spreader->_cw_helper; SpreaderChildOrderState& updated_order = leg_data.order_update_message(); double mult = cw.fill_mult; LOG(OrderMan, cw.llevel,"h_p w start {} {}", 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 c00297b8b..fcf0a1e27 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3509,6 +3509,7 @@ TEST_CASE ("memory layout", "[spreader]"){ std::cout << "HedgerManager = " << sizeof(HedgerManager) << std::endl; std::cout << "QuoteDriverSetHistory = " << sizeof(QuoteDriverSetHistory) << std::endl; std::cout << "QuoteDriverSet = " << sizeof(QuoteDriverSet) << std::endl; + std::cout << "SpreaderOrder::CacheWarmingState = " << sizeof(SpreaderOrder::CacheWarmingState) << std::endl; } TEST_CASE ("4legs_hedging", "[spreader_perf]") { From 409bbdc0f9404e9893a2cc5b8f14479a4cafb597 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 16 Jan 2019 11:37:58 -0500 Subject: [PATCH 060/103] when 'in_cache_warming_cycle' quoter order updates are surpressed (they should have been surpressed logically as well, but this is just an extra check since the outcome can be nasty) --- .../orders/spreader_orders/SpreaderOrder.cpp | 79 +++++++------------ .../orders/spreader_orders/SpreaderOrder.h | 73 +++-------------- .../spreader/ISpreaderManager.h | 6 ++ .../spreader/SingleLegQuoter.cpp | 12 +-- .../spreader/SpreaderCacheWarmingState.h | 65 +++++++++++++++ .../QuoterWorkingStateWorker.cpp | 2 + .../SpreaderWorkingStateWorker.cpp | 5 +- .../spreader_orders/tests/spreader_tests.cpp | 4 +- .../spreader_orders/tests/tests_common.h | 6 +- 9 files changed, 128 insertions(+), 124 deletions(-) create mode 100644 src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 89269f756..dc4248605 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -111,12 +111,7 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ _send_check_termination(false); if (_any_quoter_in_irrecoverable_error()) _state_worker->on_quoter_irrecoverable_error(); - if(_cw_helper.enable_fills && - ms_diff(_curr_timestamp,_cw_helper.last_cache_warm_fill_ts) >= - _cw_helper.fill_fire_period){ - _cw_helper.last_cache_warm_fill_ts = _curr_timestamp; - _keep_hedging_path_hot_2(); - } + _keep_hedging_path_hot(); } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; @@ -134,30 +129,37 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event.settlement_price.price()); _state_worker->on_settlement_price(settlement_event); } -void SpreaderOrder::_keep_hedging_path_hot_2(){ +void SpreaderOrder::_keep_hedging_path_hot(){ + bool fire=_inited() && + _active && + _cw_helper.enable_fills && + (ms_diff(_curr_timestamp,_cw_helper.last_cache_warm_fill_ts) >= + _cw_helper.fill_fire_period) && + _state_worker != nullptr && + _state_worker->state() == SpreaderState::WORKING; + if(!fire) + return; _cw_helper.set_forced_flag(); - // for each quoting leg - if(_inited() && _active){ - for(size_t i=0;i<_bookkeeping_data().n_legs();i++){ - SpreaderLegData& leg=_bookkeeping_data().get_leg_data(i); - if(leg.leg_property_data().is_active_quoting() && - leg.quoter().is_working_order()){ - auto& q_ord = leg.order_update_message(); - bts::api::orderman::OrderState state; - state.set_filled_quantity(q_ord.current_fills().value()); - state.set_last_price(q_ord.last_update_filled_price().value()); - bts::api::orderman::OrderDefinition ord_def; - OrderStateUpdateEvent ord_ev (q_ord.order_key(), + for(size_t i=0;i<_bookkeeping_data().n_legs();i++){ + SpreaderLegData& leg=_bookkeeping_data().get_leg_data(i); + //only for quoting legs with active orders out there + if(leg.leg_property_data().is_active_quoting() && + leg.quoter().is_working_order()){ + auto& q_ord = leg.order_update_message(); + bts::api::orderman::OrderState state; + state.set_filled_quantity(q_ord.current_fills().value()); + state.set_last_price(q_ord.last_update_filled_price().value()); + bts::api::orderman::OrderDefinition ord_def; + OrderStateUpdateEvent ord_ev (q_ord.order_key(), key(), ord_def, state); - ord_ev.status=q_ord.status(); - ord_ev.price=q_ord.last_reported_order_price().value(); - _on_child_order_update(ord_ev); - } + ord_ev.status=q_ord.status(); + ord_ev.price=q_ord.last_reported_order_price().value(); + _on_child_order_update(ord_ev); } } - _cw_helper.unset_forced_flag(); + _cw_helper.unset_forced_flag(); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ @@ -182,7 +184,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ LOG(OrderMan,_cw_helper.llevel,"h_p cb done {} {}",cb_type, _diff_ns()); _send_check_termination(true); LOG(OrderMan,_cw_helper.llevel,"h_p ch_term {} {}",cb_type, _diff_ns()); - _report_state(!_cw_helper.is_warm_state); + _report_state(!_cw_helper.in_cache_warming_cycle); LOG(OrderMan,_cw_helper.llevel,"h_p rep {} {}",cb_type, _diff_ns()); LOG(OrderMan, _cw_helper.llevel,"_on_child_order_update {} {}", cb_type, @@ -477,33 +479,6 @@ Price SpreaderOrder::_compute_effective_price (Price input_price){ else return input_price; } -void SpreaderOrder::_keep_hedging_path_hot(){ - if (_inited()){ - SpreaderBookkeepingData& d=_bookkeeping_data(); - for (size_t i=0; i 0){ - for(size_t j=0; j().cache_warming().enable_fills()), - fill_fire_period( - SpreaderUtils::random_number( - config::get().cache_warming().fill_period_low(), - config::get().cache_warming().fill_period_high() - )), - is_warm_state(false), - fill_indicator('f'), - llevel(Info), - forced_fill_qty(0), - fill_mult(1), - last_cache_warm_fill_ts() - {} - void set_forced_flag(){ - is_warm_state=true; - fill_indicator='k'; - llevel = Diag; - forced_fill_qty=Quantity(100); - fill_mult=0.0; - } - void unset_forced_flag(){ - is_warm_state=false; - fill_indicator='f'; - llevel = Info; - forced_fill_qty=Quantity(0); - fill_mult=1.0; - } - Quantity comp_fill_qty(const SpreaderChildOrderState& o) const{ - //if is_warm_state == true, o.last_update_filled_quantity()=0 - //so it will return forced_fill_qty; - //else forced_fill_qty == 0, it will return last_update_filled_quantity - return Quantity(o.last_update_filled_quantity().value() + - forced_fill_qty.value()); - } - bool is_fill(const SpreaderChildOrderState& o) const{ - return comp_fill_qty(o).value()>0; - } - }; +friend class SpreaderEndStateWorker; private: enum class ChildOrderError { @@ -186,6 +135,10 @@ public: } void setup_new_quoter_order (size_t leg_index) override; ChildOrder get_new_hedge_order (size_t leg_index) override; + inline bool in_cache_warming_cycle() const override{ + return _cw_helper.in_cache_warming_cycle; + } + private: // events from orders system //////////////////// ///////////////////////////////////////////////// @@ -354,15 +307,8 @@ private: t_stop = utils::TimeStamp::now(); return rv; } - // inline void _populate_non_filled_indices (size_t filled_idx){ - // int i=0; - // for(uint8_t l=0;l<_bookkeeping_data().n_legs();l++) - // if(l!=filled_idx) - // _non_filled_indices[i++]=l; - // } // hot path related - public:void _keep_hedging_path_hot(); - void _keep_hedging_path_hot_2(); + void _keep_hedging_path_hot(); void _touch_hedging_data (); // testing only ////////////////// // this provides direct way to inject @@ -417,5 +363,8 @@ public: _on_activate(price, quantity, order_services); } void test_only_on_time (TimeStamp){} + void test_only_keep_hedging_path_hot(){ + _keep_hedging_path_hot(); + } }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h index ec3f7a116..0f2549d25 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h @@ -6,6 +6,7 @@ namespace bts { namespace orderman { class LegPropertyData; +class CacheWarmingState; // The Spreader spawns a bunch of quoters and // hedgers and hands them this interface to // i. get data such as book and leg properties @@ -27,6 +28,11 @@ public: // it does not alter the state or has side effects (as // as the spreader goes) virtual ChildOrder get_new_hedge_order (size_t leg_index) = 0; + // the spreader can be in a cache warming cycle and generate + // fake updates, the quoters and hedgers should ignore them + // (however do as much as they can to keep the instruction + // cache warm) + virtual bool in_cache_warming_cycle() const = 0; virtual ~ISpreaderManager() {} }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 256206188..faa3dd438 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -5,7 +5,7 @@ #include "LegPropertyData.h" #include "SpreaderChildOrderState.h" #include "lib/orderman/orderman_utils/orderman_common.h" -//#include "lib/config/protos/speader.pb.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h" #include "lib/config/config.h" namespace bts { @@ -95,10 +95,12 @@ void SingleLegQuoter::one_time_activate(Price price, } void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ bts_assert(_active_quoting); - LOG(OrderMan, Info, "SingleLegQuoter::update_order_status " - "spread_key:{} leg_idx:{} status:{}", - _spreader.spreader_order_key(),_this_leg_data.leg_index(), - static_cast(u.status())); + log::Level llevel=_spreader.in_cache_warming_cycle()?Diag:Info; + LOG(OrderMan, llevel, + "SingleLegQuoter::update_order_status " + "spread_key:{} leg_idx:{} status:{}", + _spreader.spreader_order_key(),_this_leg_data.leg_index(), + static_cast(u.status())); _worker->on_order_update (u); } void SingleLegQuoter::on_book(size_t leg_index, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h new file mode 100644 index 000000000..f9fe568cd --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h @@ -0,0 +1,65 @@ +#pragma once + +#include +#include "lib/config/config.h" +#include "lib/config/protos/spreader.pb.h" + +namespace bts { +namespace orderman { + +class CacheWarmingState{ +public: + // read from config which enables the machinery to + // push fake fills or not + const bool enable_fills; + // period at which fake fills are generated + // (this is a random number generated from a lower + // and upper bound) + const uint32_t fill_fire_period; + bool in_cache_warming_cycle; + char fill_indicator; + log::Level llevel; + Quantity forced_fill_qty; + double fill_mult=1; + bts::TimeStamp last_cache_warm_fill_ts; + CacheWarmingState() + : + enable_fills(config::get().cache_warming().enable_fills()), + fill_fire_period( + SpreaderUtils::random_number( + config::get().cache_warming().fill_period_low(), + config::get().cache_warming().fill_period_high() + )), + in_cache_warming_cycle(false), + fill_indicator('f'), + llevel(Info), + forced_fill_qty(0), + fill_mult(1), + last_cache_warm_fill_ts() + {} + void set_forced_flag(){ + in_cache_warming_cycle=true; + fill_indicator='k'; + llevel = Diag; + forced_fill_qty=Quantity(100); + fill_mult=0.0; + } + void unset_forced_flag(){ + in_cache_warming_cycle=false; + fill_indicator='f'; + llevel = Info; + forced_fill_qty=Quantity(0); + fill_mult=1.0; + } + Quantity comp_fill_qty(const SpreaderChildOrderState& o) const{ + //if in_cache_warming_cycle == true, o.last_update_filled_quantity()=0 + //so it will return forced_fill_qty; + //else forced_fill_qty == 0, it will return last_update_filled_quantity + return Quantity(o.last_update_filled_quantity().value() + + forced_fill_qty.value()); + } + bool is_fill(const SpreaderChildOrderState& o) const{ + return comp_fill_qty(o).value()>0; + } +}; +}} 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..abe5d6208 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 @@ -4,6 +4,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" #include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h" namespace bts{ namespace orderman{ @@ -88,6 +89,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) if (_quoter->_this_leg_data.leg_params().quote_params().has_quote_mute_zone()) reprice = SpreaderUtils::reprice_quote_mute_zone(_quoter->_price_quantity_state.out_price().value(), computed_price.value(), _quoter->_this_leg_data.trading_side(), _quoter->_this_leg_data.tick_size(), _quoter->_this_leg_data.leg_params().quote_params().quote_mute_zone()); + reprice=reprice && !(_quoter->_spreader.in_cache_warming_cycle()); if (reprice) _modify_order (computed_price, order_quantity,trace); } 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 3a47148f4..8586b23f3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -77,7 +77,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, trace::CorID trace){ - SpreaderOrder::CacheWarmingState& cw=_spreader->_cw_helper; + const CacheWarmingState& cw=_spreader->_cw_helper; SpreaderChildOrderState& updated_order = leg_data.order_update_message(); double mult = cw.fill_mult; LOG(OrderMan, cw.llevel,"h_p w start {} {}", @@ -127,7 +127,8 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, cw.fill_indicator, q_idx, _spreader->_diff_ns()); // if it is an actively quoting leg, inform the quoter about it // so it can decrease the proportional size - if (other_leg_data.leg_property_data().is_active_quoting()){ + if (!cw.in_cache_warming_cycle && + other_leg_data.leg_property_data().is_active_quoting()){ other_leg_data.quoter().update_other_leg_fills( leg_data.leg_property_data().leg_index(), Quantity(total_unhedged_qty)); 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 fcf0a1e27..ce6310260 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3509,7 +3509,7 @@ TEST_CASE ("memory layout", "[spreader]"){ std::cout << "HedgerManager = " << sizeof(HedgerManager) << std::endl; std::cout << "QuoteDriverSetHistory = " << sizeof(QuoteDriverSetHistory) << std::endl; std::cout << "QuoteDriverSet = " << sizeof(QuoteDriverSet) << std::endl; - std::cout << "SpreaderOrder::CacheWarmingState = " << sizeof(SpreaderOrder::CacheWarmingState) << std::endl; + std::cout << "CacheWarmingState = " << sizeof(CacheWarmingState) << std::endl; } TEST_CASE ("4legs_hedging", "[spreader_perf]") { @@ -3725,7 +3725,7 @@ TEST_CASE ("4legs_hedging", "[spreader_perf]") // 1* 25 // 30000* 25 test_sleep(30000,true); - spreader._keep_hedging_path_hot_2(); + spreader.test_only_keep_hedging_path_hot(); for(uint32_t h=0; h Date: Wed, 16 Jan 2019 13:37:04 -0500 Subject: [PATCH 061/103] removed some extra logging data from CacheWarmingState --- .../orders/spreader_orders/SpreaderOrder.h | 2 +- .../spreader/SpreaderCacheWarmingState.h | 4 ---- .../SpreaderWorkingStateWorker.cpp | 18 ++++++------------ 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 9f1d05035..547b44f8b 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -178,7 +178,7 @@ private: _state_worker->on_quoter_order_status_update (leg_data); } else{ - ord_indicator = _cw_helper.fill_indicator; + ord_indicator = 'f'; LOG(OrderMan,_cw_helper.llevel,"h_p {} child update {}",ord_indicator,_diff_ns()); _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h index f9fe568cd..654704772 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h @@ -17,7 +17,6 @@ public: // and upper bound) const uint32_t fill_fire_period; bool in_cache_warming_cycle; - char fill_indicator; log::Level llevel; Quantity forced_fill_qty; double fill_mult=1; @@ -31,7 +30,6 @@ public: config::get().cache_warming().fill_period_high() )), in_cache_warming_cycle(false), - fill_indicator('f'), llevel(Info), forced_fill_qty(0), fill_mult(1), @@ -39,14 +37,12 @@ public: {} void set_forced_flag(){ in_cache_warming_cycle=true; - fill_indicator='k'; llevel = Diag; forced_fill_qty=Quantity(100); fill_mult=0.0; } void unset_forced_flag(){ in_cache_warming_cycle=false; - fill_indicator='f'; llevel = Info; forced_fill_qty=Quantity(0); fill_mult=1.0; 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 8586b23f3..0e477ef55 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -80,8 +80,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, const CacheWarmingState& cw=_spreader->_cw_helper; SpreaderChildOrderState& updated_order = leg_data.order_update_message(); double mult = cw.fill_mult; - LOG(OrderMan, cw.llevel,"h_p w start {} {}", - cw.fill_indicator, _spreader->_diff_ns()); + LOG(OrderMan, cw.llevel,"h_p w start {}", _spreader->_diff_ns()); //_spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); // 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) @@ -116,15 +115,13 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, hedge_price, hedge_qty); hedge_qty = hedge_qty * mult; - LOG(OrderMan,cw.llevel,"h_p comp {} {} {}", - cw.fill_indicator, q_idx, _spreader->_diff_ns()); + LOG(OrderMan,cw.llevel,"h_p comp {} {}", q_idx, _spreader->_diff_ns()); UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); uint32_t total_unhedged_qty= leg_unhedged_delta.subtract_hedge_if_available(mult); total_unhedged_qty = total_unhedged_qty * mult; - LOG(OrderMan,cw.llevel,"h_p delta {} {} {}", - cw.fill_indicator, q_idx, _spreader->_diff_ns()); + LOG(OrderMan,cw.llevel,"h_p delta {} {}", q_idx, _spreader->_diff_ns()); // if it is an actively quoting leg, inform the quoter about it // so it can decrease the proportional size if (!cw.in_cache_warming_cycle && @@ -132,16 +129,14 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, other_leg_data.quoter().update_other_leg_fills( leg_data.leg_property_data().leg_index(), Quantity(total_unhedged_qty)); - LOG(OrderMan,cw.llevel,"h_p q minus {} {} {}", - cw.fill_indicator, q_idx, _spreader->_diff_ns()); + LOG(OrderMan,cw.llevel,"h_p q minus {} {}", q_idx, _spreader->_diff_ns()); } // a hedge is sent regardless _spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(), hedge_price, Quantity(total_unhedged_qty), trace); - LOG(OrderMan,cw.llevel,"h_p send hedge {} {} {}", - cw.fill_indicator, q_idx, _spreader->_diff_ns()); + LOG(OrderMan,cw.llevel,"h_p send hedge {} {}", q_idx, _spreader->_diff_ns()); } } // this is done at the end (i dont like ordering though) because @@ -151,8 +146,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // earlier too) // todo:this needs to be addressed, its confusing leg_data.quoter().update_order_status (updated_order); - LOG(OrderMan,cw.llevel,"h_p update q {} {}", - cw.fill_indicator, _spreader->_diff_ns()); + LOG(OrderMan,cw.llevel,"h_p update q {}", _spreader->_diff_ns()); } void SpreaderWorkingStateWorker::on_quoter_order_status_update( SpreaderLegData& leg_data){ From b2d1d1182628d4e272d85d401e4ad0a5f52de964 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 16 Jan 2019 17:56:40 -0500 Subject: [PATCH 062/103] Added ticker events to MD Source --- src/lib/orderman/actors/MDSource.h | 167 ++++++++++++++++---- src/lib/orderman/events/MDRequestEvent.h | 20 ++- src/lib/orderman/events/TickerUpdateEvent.h | 35 ++++ 3 files changed, 180 insertions(+), 42 deletions(-) create mode 100644 src/lib/orderman/events/TickerUpdateEvent.h diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index aab32b503..c8012b5f2 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -1,6 +1,7 @@ #pragma once #include "lib/logging/logging.h" +#include "lib/md/IntPrice.h" #include "lib/md/MDConsumer.h" #include "lib/md/MDConsumerHandle.h" #include "lib/md/cme/MDP3Utils.h" @@ -9,6 +10,7 @@ #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/events/MDRequestEvent.h" +#include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/tracing/PerfLog.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" @@ -25,9 +27,10 @@ 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() { + : _handles(), _md_consumer(consumer), _book_update(), _ticker_update(), + _perf_log(log), _stats(stats), _loop_timer() { + _trades_buffer.Reserve(1000); auto cme_channels = md::get_configured_cme_channels(); for (auto const &c : cme_channels) for (auto const &s : c.symbols) @@ -56,47 +59,41 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { auto synthetic_count_metric = std::make_shared>( "spark_mdsource_synthetic_count"); + auto ticker_channel_cout_metric = + std::make_shared>( + "spark_mdsource_ticker_channel_count"); _stats.publish(security_count_metric); _stats.publish(synthetic_count_metric); + _stats.publish(ticker_channel_cout_metric); _book_update = make_stream(); - subscribe([this, security_count_metric, - synthetic_count_metric](auto const &update) { - if (update.events) { - for (auto const &ev : *update.events) { - auto k = ev.security_key.value(); + subscribe( + [this, security_count_metric, synthetic_count_metric, + ticker_channel_cout_metric](auto const &update) { + if (update.events) { + for (auto const &ev : *update.events) { + auto k = ev.security_key; - for (auto &h : _handles) - if (h.handle.key() == k) { - // we want to resend this MD so that late joiners can - // catch up - h.last = utils::TimeStamp(); - return; - } + switch (ev.md_type) { + case MDRequestType::BOOK: + on_book_sub(k, *synthetic_count_metric); + break; + case MDRequestType::TICKER: + on_ticker_sub(k, *ticker_channel_cout_metric); + break; + } + } + } + }); - LOG(OrderMan, Warn, - "Starting to publish book updates for security key: {}", k); - auto handle = _md_consumer.get_handle(k); - - auto &channel = _symbol_to_channel[handle.get_usersymbol()]; - if (channel.empty()) - channel = "sim_md"; - - _handles.push_back( - {utils::TimeStamp(), handle, channel.c_str()}); - if (handle.is_synthetic()) { - synthetic_count_metric->increment(); - } - } - security_count_metric->set(_handles.size()); - } - }); + security_count_metric->set(_handles.size()); } private: void on_poll() override { - Book book; + // Book Updates + Book book; auto start = utils::TimeStamp::now(); for (auto &h : _handles) { auto &handle = h.handle; @@ -104,24 +101,124 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { &book.bid()[0], &book.ask()[0]) == md::HandleReadResult::SUCCESS) { book._security_key = SecurityKey(handle.key()); - trace::CorID trace{h.channel, handle.sequence()}; + trace::CorID trace{h.external_event_channel, handle.sequence()}; _perf_log.log(trace, h.last, "md", handle.key()); publish(_book_update, book, trace); } } + + // Ticker Updates + for (auto &c : _channels) { + auto &channel = c.channel; + _trades_buffer.Clear(); + c.cursor = channel.read_trades(_trades_buffer, c.cursor); + + for (auto const &trade : _trades_buffer) { + size_t trade_count = 0; + for (auto &per_sec_ev : c.securities) { + if (trade.key() == per_sec_ev.key.value()) { + trade_count++; + per_sec_ev.trades.emplace_back(TickerUpdateEvent::Trade{ + Timer::now(), + Price(md::IntPrice(trade.mantissa(), + (int8_t)trade.exponent()) + .price()), + Quantity(trade.size()), Quantity(trade.total_volume()), + trade.aggressor_side()}); + } + } + + if (trade_count) + for (auto &per_sec_ev : c.securities) + if (per_sec_ev.trades.size()) { + publish(_ticker_update, per_sec_ev); + per_sec_ev.trades.clear(); + } + } + } + + // Publish stats auto stop = utils::TimeStamp::now(); _loop_timer->observe((start - stop).nanoseconds()); } + void on_book_sub(SecurityKey sk, + metrics::CounterMetric &synthetic_count_metric) { + auto k = sk.value(); + for (auto &h : _handles) + if (h.handle.key() == k) { + // we want to resend this MD so that late joiners can + // catch up + h.last = utils::TimeStamp(); + return; + } + + LOG(OrderMan, Warn, + "Starting to publish book updates for security key: {}", k); + auto handle = _md_consumer.get_handle(k); + + _handles.push_back({utils::TimeStamp(), handle, + get_external_event_channel(handle.get_usersymbol())}); + if (handle.is_synthetic()) + synthetic_count_metric.increment(); + } + + const char *get_external_event_channel(const md::UserSymbol &user_symbol) { + auto &channel = _symbol_to_channel[user_symbol]; + if (channel.empty()) + channel = "sim_md"; + return channel.c_str(); + } + + void on_ticker_sub(SecurityKey sk, + metrics::CounterMetric &channel_count_metric) { + + auto user_symbol = _md_consumer.get_handle(sk.value()).get_usersymbol(); + for (auto &ch : _channels) + if (ch.user_symbol == user_symbol) { + auto it = + std::find_if(ch.securities.begin(), ch.securities.end(), + [sk](auto const &ev) { return ev.key == sk; }); + if (it == ch.securities.end()) { + // first time we are asked for this security, we will + // publish the trades for it next time next round + LOG(OrderMan, Warn, + "Starting to publish ticker updates on user symbol {} for " + "security key: {} (sec count for the symbol: {} )", + user_symbol.to_string(), sk.value(), ch.securities.size()); + ch.securities.push_back(sk); + } + return; + } + + // this is a channel we are not subscribed to + channel_count_metric.increment(); + LOG(OrderMan, Warn, + "Starting to publish ticker updates on user symbol {} for security " + "key: {}", + user_symbol.to_string(), sk.value()); + _channels.push_back( + {0, _md_consumer.get_channel(user_symbol), {}, user_symbol}); + } struct HandleRecord { utils::TimeStamp last; md::MDConsumerHandle handle; - const char *channel; + const char *external_event_channel; }; + boost::container::small_vector _handles; + + struct ChannelRecord { + int64_t cursor; + co2::MDConsumerChannel channel; + boost::container::small_vector securities; + md::UserSymbol user_symbol; + }; + boost::container::small_vector _channels; + google::protobuf::RepeatedPtrField _trades_buffer; - std::vector _handles; md::MDConsumer _md_consumer; mercury::Stream _book_update; + mercury::Stream _ticker_update; trace::PerfLog &_perf_log; metrics::MetricsContainer &_stats; std::shared_ptr> _loop_timer; diff --git a/src/lib/orderman/events/MDRequestEvent.h b/src/lib/orderman/events/MDRequestEvent.h index 475d5b4d5..f8d244502 100644 --- a/src/lib/orderman/events/MDRequestEvent.h +++ b/src/lib/orderman/events/MDRequestEvent.h @@ -2,23 +2,29 @@ #include -#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { +enum class MDRequestType { BOOK, TICKER }; + class MDRequestEvent : public mercury::Event { -public: + public: using SynopsisPolicy = mercury::CacheAll; - MDRequestEvent(SecurityKey k) : security_key(k) {} - MDRequestEvent &operator=(MDRequestEvent const&rhs) - { + + MDRequestEvent(SecurityKey k, MDRequestType md_type) + : security_key(k), md_type(md_type) {} + + MDRequestEvent &operator=(MDRequestEvent const &rhs) { security_key = rhs.security_key; + md_type = rhs.md_type; return *this; } SecurityKey security_key; + MDRequestType md_type; }; -}} - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/TickerUpdateEvent.h b/src/lib/orderman/events/TickerUpdateEvent.h new file mode 100644 index 000000000..2bead2e50 --- /dev/null +++ b/src/lib/orderman/events/TickerUpdateEvent.h @@ -0,0 +1,35 @@ +#pragma once + +#include + +#include "lib/mercury/events/Event.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/utils/bts_chrono.h" +#include "lib/md/protos/co2.pb.h" + +namespace bts { +namespace orderman { + + +class TickerUpdateEvent : public mercury::Event { + SecurityKey _key; + + public: + using SynopsisPolicy = mercury::NoSynopsis; + + SecurityKey key() const {return _key;}; + + struct Trade { + TimeStamp ts; + Price price; + Quantity quantity; + Quantity total_volume; + co2::AggressorSide agressor_side; + }; + + boost::container::small_vector trades; + TickerUpdateEvent(SecurityKey key) : _key(key), trades() {} + +}; +} +} From bea0e5ced7cf631eb3aa0217a58c410cde84ec0d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 16 Jan 2019 17:57:02 -0500 Subject: [PATCH 063/103] Added ticker events to order manager api --- src/lib/CMakeDeps.cmake | 2 +- .../actors/order_manager/OrderManager.cpp | 7 ++++- .../actors/order_manager/OrderServices.h | 30 +++++++++++++------ .../actors/order_manager/OrderServicesData.h | 2 ++ 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index afd768425..ec7dd860c 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index d65304712..68a99d941 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -407,13 +407,18 @@ void OrderManager::init_order_services() { // 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) { - publish(me->services_data.md_request_pub, k); + publish(me->services_data.md_request_pub, k,MDRequestType::BOOK); + }; + std::function on_ticker_sub = [this](SecurityKey k) { + publish(me->services_data.md_request_pub, k,MDRequestType::TICKER); }; std::function on_settlement_sub = [this](SecurityKey k) { publish(me->services_data.settlement_request_pub, k); }; me->services_data.md_subs = std::make_unique>(*this, on_md_sub); + me->services_data.ticker_subs = + std::make_unique>(*this, on_ticker_sub); me->services_data.settlement_subs = std::make_unique>( *this, on_settlement_sub); diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 8ec490563..684175e3d 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -5,6 +5,7 @@ #include "lib/logging/logging.h" #include "lib/orderman/actors/order_manager/OrderManager.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" +#include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" @@ -108,8 +109,8 @@ class OrderServices { 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() {} + _book_updates(), _ticker_updates(), _settlement_updates(), + _time_change(), _sessions(), _create_order_reply() {} void init(OrderServicesData &data, OrderServices &parent) { _parent = &parent; @@ -119,6 +120,7 @@ class OrderServices { void init(OrderServicesData &data) { _data = &data; _book_updates.init(*data.md_subs); + _ticker_updates.init(*data.ticker_subs); _settlement_updates.init(*data.settlement_subs); _time_change.init(*data.time_subs); for (auto &sd : data.sessions) @@ -147,17 +149,19 @@ class OrderServices { ss.queue_fix(mt, f, trace); } - void log(trace::CorID cid, const char *entry_kind, - uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0) { + void log(trace::CorID cid, const char *entry_kind, uint64_t uint64_1 = 0, + const char *txt_1 = "", uint32_t uint32_1 = 0) { _data->log.log(cid, entry_kind, uint64_1, txt_1, uint32_1); } trace::ScopedPerfLogEntry log_scope(trace::CorID cid, const char *entry_kind, - uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0) - { - return trace::ScopedPerfLogEntry(_data->log,cid,entry_kind,uint64_1,txt_1,uint32_1); + uint64_t uint64_1 = 0, + const char *txt_1 = "", + uint32_t uint32_1 = 0) { + return trace::ScopedPerfLogEntry(_data->log, cid, entry_kind, uint64_1, + txt_1, uint32_1); } - + void report_state(const api::orderman::OrderState &state, trace::CorID const &trace = trace::CorID()) { @@ -172,6 +176,7 @@ class OrderServices { _owner->key().value()); unsubscribe_from_child_updates(); _book_updates.unsub_all(); + _ticker_updates.unsub_all(); _settlement_updates.unsub_all(); _time_change.unsub_all(); _create_order_reply.unsub_all(); @@ -199,7 +204,13 @@ class OrderServices { k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); } void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } - + // Ticker + using TickerSubID = EventStream::SubID; + template TickerSubID subscribe_to_ticker(SecurityKey k, CB &&cb) { + return _ticker_updates.sub( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); + } + void unsubscribe_from_ticker(TickerSubID sid) { _ticker_updates.unsub(sid); } // Settlement using SettlementSubID = EventStream::SubID; template @@ -350,6 +361,7 @@ class OrderServices { OrderServices *_parent; std::function _child_update_cb; EventStream _book_updates; + EventStream _ticker_updates; EventStream _settlement_updates; EventStream _time_change; boost::container::small_vector _sessions; diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 06fe8bca2..e664aec0a 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -11,6 +11,7 @@ #include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" +#include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CancelRejectEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" @@ -83,6 +84,7 @@ class OrderServicesData { Limiter limiter; OrderFactory order_factory; std::unique_ptr> md_subs; + std::unique_ptr> ticker_subs; std::unique_ptr> settlement_subs; std::unique_ptr< From ee66ddf9a65bcb0cecbff3da8080a3bd9ee6378d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 17 Jan 2019 10:48:11 -0500 Subject: [PATCH 064/103] Fixed a few bugs in the ticker api code. --- src/lib/orderman/actors/MDSource.h | 8 +++++--- src/lib/orderman/events/TickerUpdateEvent.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index c8012b5f2..b175722fd 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -67,6 +67,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { _stats.publish(ticker_channel_cout_metric); _book_update = make_stream(); + _ticker_update = make_stream(); subscribe( [this, security_count_metric, synthetic_count_metric, ticker_channel_cout_metric](auto const &update) { @@ -116,7 +117,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { for (auto const &trade : _trades_buffer) { size_t trade_count = 0; for (auto &per_sec_ev : c.securities) { - if (trade.key() == per_sec_ev.key.value()) { + if (trade.key() == per_sec_ev.key().value()) { trade_count++; per_sec_ev.trades.emplace_back(TickerUpdateEvent::Trade{ Timer::now(), @@ -178,14 +179,14 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { if (ch.user_symbol == user_symbol) { auto it = std::find_if(ch.securities.begin(), ch.securities.end(), - [sk](auto const &ev) { return ev.key == sk; }); + [sk](auto const &ev) { return ev.key() == sk; }); if (it == ch.securities.end()) { // first time we are asked for this security, we will // publish the trades for it next time next round LOG(OrderMan, Warn, "Starting to publish ticker updates on user symbol {} for " "security key: {} (sec count for the symbol: {} )", - user_symbol.to_string(), sk.value(), ch.securities.size()); + user_symbol.to_string(), sk.value(), ch.securities.size()+1); ch.securities.push_back(sk); } return; @@ -199,6 +200,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { user_symbol.to_string(), sk.value()); _channels.push_back( {0, _md_consumer.get_channel(user_symbol), {}, user_symbol}); + _channels.back().securities.push_back(sk); } struct HandleRecord { utils::TimeStamp last; diff --git a/src/lib/orderman/events/TickerUpdateEvent.h b/src/lib/orderman/events/TickerUpdateEvent.h index 2bead2e50..d34522d48 100644 --- a/src/lib/orderman/events/TickerUpdateEvent.h +++ b/src/lib/orderman/events/TickerUpdateEvent.h @@ -24,7 +24,7 @@ class TickerUpdateEvent : public mercury::Event { Price price; Quantity quantity; Quantity total_volume; - co2::AggressorSide agressor_side; + co2::AggressorSide aggressor_side; }; boost::container::small_vector trades; From ce8d27bb71e67fc8a2fe4f1a09d776261b0e41ac Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 17 Jan 2019 11:44:37 -0500 Subject: [PATCH 065/103] Added time to ticker update. --- src/lib/orderman/actors/MDSource.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index b175722fd..f99d667ad 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -15,6 +15,8 @@ #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" +#include + namespace bts { namespace orderman { @@ -120,7 +122,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { if (trade.key() == per_sec_ev.key().value()) { trade_count++; per_sec_ev.trades.emplace_back(TickerUpdateEvent::Trade{ - Timer::now(), + ll_to_timestamp(trade.time()), Price(md::IntPrice(trade.mantissa(), (int8_t)trade.exponent()) .price()), @@ -143,6 +145,18 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { _loop_timer->observe((start - stop).nanoseconds()); } + TimeStamp ll_to_timestamp(uint64_t lldt) { + return Timer::now(); + using namespace date; + using namespace std::chrono; + + int Y, M, D, h, m, s, ms; + datetime::ll_to_parts(lldt,Y,M,D,h,m,s,ms); + system_clock::time_point tp = sys_days{year{Y} / M / D} + hours{h} + + minutes{m} + seconds{s} + milliseconds{ms}; + return tp; + } + void on_book_sub(SecurityKey sk, metrics::CounterMetric &synthetic_count_metric) { auto k = sk.value(); @@ -186,7 +200,8 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { LOG(OrderMan, Warn, "Starting to publish ticker updates on user symbol {} for " "security key: {} (sec count for the symbol: {} )", - user_symbol.to_string(), sk.value(), ch.securities.size()+1); + user_symbol.to_string(), sk.value(), + ch.securities.size() + 1); ch.securities.push_back(sk); } return; From 3688ec07393acf74b5001a86dac341d7185e6201 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 17 Jan 2019 11:46:19 -0500 Subject: [PATCH 066/103] Moved externals pointer --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index 69f863923..5570689de 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 69f863923502b11c8d7fde491e4b5aec5b705e97 +Subproject commit 5570689de27947a1573aa82e8f0e13000234f639 From 6d438b476402901b5ae2d4a07ed8f1ce00405030 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 17 Jan 2019 13:19:56 -0500 Subject: [PATCH 067/103] New spreader test for muliple quoting legs --- .../spreader_misc/fractional_hedging.txt | 2 +- .../spreader_misc/multi_quoting_legs.txt | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 testing/manual/spreader_misc/multi_quoting_legs.txt diff --git a/testing/manual/spreader_misc/fractional_hedging.txt b/testing/manual/spreader_misc/fractional_hedging.txt index ae6b1bccf..ea0798e65 100644 --- a/testing/manual/spreader_misc/fractional_hedging.txt +++ b/testing/manual/spreader_misc/fractional_hedging.txt @@ -23,7 +23,7 @@ we will add it to the "unhedged delta" till the unhedged delta > 1, and then we or more orders to get the unhedged delta < 1. Force quoting fills based on the left most column (by lifting the quoting offer) -and verify that hedge orders of size "hedge_qty" (3rd column) are sent as a result. +and verify that hedge orders of size "hedge_order_sent" (3rd column) are sent as a result. The "unhedged_delta" column shows the unhedged delta immediatly after the quoting fill and the "remaining_unhedged_delta" column is the unhedged delta after the hedge order has been sent. diff --git a/testing/manual/spreader_misc/multi_quoting_legs.txt b/testing/manual/spreader_misc/multi_quoting_legs.txt new file mode 100644 index 000000000..c5c1806be --- /dev/null +++ b/testing/manual/spreader_misc/multi_quoting_legs.txt @@ -0,0 +1,34 @@ +This test verifies the pecularities of the spreader with > 1 quoting leg. + +0. This needs sim with replay turned off (see step 0 in common_setup_1), so we can create our own markets. + +1. Construct a 2 legged spreader, buy GCM2 sell GCZ2. Set the Price Multipliers to 1 and -1 respectively as +well. Disable all Quote, Pre-Hedge and Post-Hedge parameters. + +2. Enter a 20 lot sell order for GCM2 at 20.50 and a 20 lot buy order for GCZ2 at 19.50. A synthetic sell side +market of 20 at 1.00 should show up. + +3. Now enter a 5 lot synthetic buy order at 0.70. Since both legs are quoting GCM2 uses GCZ2 (19.50 bid) +to quote its bid at 19.50+0.7=20.2, and GCZ2 uses GCM2 (20.05) to quote its offer at 20.5-0.70=19.8. Verify +these quoting prices +(remember, for quoting prices: +leg_1=leg_2_bid_market+spreader_price +leg_2=leg_2_bid_market-spreader_price +) + +4. Move the markets a few times (without crossing and causing any fills) and make sure the quoting prices +are correct, and bring them back to where they were in 2. + +5. Now force a 1 lot fill on the GCZ2 quoting order, by sending a 1 lot buy against it. This should send +out a buy hedge on GCM2 at 20.50 and the quote order for GCM2 should be reduced by 1. + +6. Now lets fill the other quote order with a 2 lot, ie send a sell order of 2 against the GCM2 bid. +Verify that this send a GCZ2 sell hedge at 19.50 and the GCZ2 quote order is now a 1/3 order. + +7. Now we have the spreader 3/5 at 0.70. Verify that. + +8. Now lets remove the GCM2 market (ie the 1/20 at 20.50). This will cause the GCZ2 quoting order to be +pulled. Put the GCM2 market back and the 2 lot GCZ2 quoting order should come back. + +9. Drag the spreader order to 1.0. This should cause the whole spreader order to fill. There will be +2 overfills and an Avg filled price of 0.90. From 42274edbc4a6882c36290f4246c522c139768880 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 17 Jan 2019 13:45:26 -0500 Subject: [PATCH 068/103] Added extra logging level for no logging code paths. --- src/client/spark_api/utils/Log.cs | 1 + src/lib/logging/logging.cpp | 2 +- src/lib/logging/logging.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/spark_api/utils/Log.cs b/src/client/spark_api/utils/Log.cs index f6eb912e1..e3ad3aaea 100644 --- a/src/client/spark_api/utils/Log.cs +++ b/src/client/spark_api/utils/Log.cs @@ -5,6 +5,7 @@ using System.Runtime.InteropServices; namespace bts { enum Level { + NoLog, Diag, Info, Warn, diff --git a/src/lib/logging/logging.cpp b/src/lib/logging/logging.cpp index 82acc96a7..a698279c5 100644 --- a/src/lib/logging/logging.cpp +++ b/src/lib/logging/logging.cpp @@ -95,7 +95,7 @@ void configure_logging(bts::config::Logging const&cfg, bts::config::ThreadGroupC real_cfg.logger_initial_queue_size = cfg.initial_queue_size(); real_cfg.logger_max_queue_growth = cfg.max_queue_growth(); - real_cfg.level_names = { {Diag,"Diag"},{Info,"Info"}, + real_cfg.level_names = { {NoLog,"NoLog"},{Diag,"Diag"},{Info,"Info"}, {Warn,"Warn"},{Error,"Error"}, {Fatal,"Fatal"},{Sys,"Sys"} }; diff --git a/src/lib/logging/logging.h b/src/lib/logging/logging.h index 919234a6e..2678d8552 100644 --- a/src/lib/logging/logging.h +++ b/src/lib/logging/logging.h @@ -13,7 +13,8 @@ namespace bts { namespace config {class Logging; class ThreadGroupCfg;} // Please keep this list in sync with Log.cs -constexpr log::Level Diag {0}; +constexpr log::Level NoLog {0}; +constexpr log::Level Diag {NoLog.ordinal+1}; constexpr log::Level Info {Diag.ordinal+1}; constexpr log::Level Warn {Info.ordinal+1}; constexpr log::Level Error {Warn.ordinal+1}; From a8694d6fb20e9cef9117233401898f53d3df0d42 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 17 Jan 2019 15:21:25 -0600 Subject: [PATCH 069/103] Because this is the bugfix the spark client deserves, but not the ones it needs right now --- src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml b/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml index 0d77a7a05..896e0c44b 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml +++ b/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml @@ -301,7 +301,9 @@ HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" x:Name="_header_scroll_viewer"> - + + + From f3ac92c4345e39b80ad9add2f82069ce97e29a38 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 17 Jan 2019 15:52:56 -0600 Subject: [PATCH 070/103] PR edits; Eric has ESP --- src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml b/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml index 896e0c44b..4cd01bcb9 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml +++ b/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml @@ -62,7 +62,8 @@