From 9824ef768627aacfeb782a49d2b22ea2e6072b71 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 23 Sep 2020 12:37:27 -0400 Subject: [PATCH] Added order indirection interface --- .../orders/spreader_orders/SpreaderOrder.cpp | 7 ++++++- .../orders/spreader_orders/SpreaderOrder.h | 7 ++++--- .../spreader/ISpreaderManager.h | 4 +++- .../spreader/SingleFillHedger.cpp | 3 ++- .../spreader/SpreaderChildOrderState.cpp | 6 +++++- .../spreader/SpreaderChildOrderState.h | 21 +++++++++++++++++-- .../spreader/SpreaderLegData.h | 3 ++- .../external_interfacing/ISpreaderOrderSync.h | 21 +++++++++++++++++++ .../SpreaderOrderServices.cpp | 11 ++++++++-- .../SpreaderOrderServices.h | 7 ++++++- .../SpreaderStartStateWorker.cpp | 1 + .../spreader_orders/tests/tests_common.h | 4 ++++ .../simulator/algos/OrderTranslator.cpp | 12 +++++------ .../simulator/algos/OrderTranslator.h | 21 ++++++++++--------- .../simulator/algos/SimSpreader.cpp | 2 +- .../simulator/algos/SimSpreader.h | 2 +- 16 files changed, 101 insertions(+), 31 deletions(-) create mode 100644 src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index c47c52c92..4c018c5f6 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -7,6 +7,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h" #include "lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h" +#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h" #include "lib/orderman/events/SettlementUpdateEvent.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/helper_macros.h" @@ -20,6 +21,7 @@ namespace orderman { /**************************Cons/Dest*******************************/ SpreaderOrder::SpreaderOrder() : +_order_sync(nullptr), _cancelled (false), _report_dirty(false), _active(true), @@ -122,6 +124,9 @@ ChildOrder SpreaderOrder::get_new_hedge_order(size_t leg_index){ bts::orderman::ChildOrder child_order = leg_data.hedger_order_builder().build(); return child_order; } +ISpreaderOrderSync* SpreaderOrder::order_sync(){ + return _order_sync; +} // events from orders system //////////////////// ///////////////////////////////////////////////// void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ @@ -299,7 +304,7 @@ void SpreaderOrder::_on_init_new(const bts::api::orderman::OrderDefinition& orde LOG(OrderMan, Info, "SpreaderOrder.on_init_new key:{}", key().value()); LOG(OrderMan, Diag, "SpreaderOrder.on_init_new key:{} order_def:{}", key().value(), bts::utils::pb::to_string(order_def)); - bts_assert(!_inited()); + bts_assert(!_inited()); _state_worker->on_init_new(order_def, spreader_pao_services); } void SpreaderOrder::_on_activate(Price price, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index e223d09f1..d8a1507bf 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -25,7 +25,7 @@ namespace api {namespace orderman {class OrderState; class CreateSpreaderOrder;} namespace orderman { class SettlementUpdateEvent; - +class ISpreaderOrderSync; class SpreaderOrder : public Order, public ISpreaderManager { @@ -49,6 +49,7 @@ private: // no error condition NONE }; + ISpreaderOrderSync* _order_sync; // when a fill update, this is populated with // the indices of the other legs //std::array _non_filled_indices; @@ -76,8 +77,7 @@ private: // spreader fires a periodic check bts::TimeStamp _last_check_termination_timestamp; // current state - utils::TimeStamp _perf_ts; - + utils::TimeStamp _perf_ts; ISpreaderStateWorker* _state_worker; SpreaderStartStateWorker _start_state_worker; SpreaderWaitingForInitialDataStateWorker _waiting_for_initial_data_state_worker; @@ -138,6 +138,7 @@ public: } void setup_new_quoter_order (size_t leg_index) override; ChildOrder get_new_hedge_order (size_t leg_index) override; + ISpreaderOrderSync* order_sync() override; inline bool in_cache_warming_cycle() const override{ return _cw_helper.in_cache_warming_cycle; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h index 0f2549d25..33053b6e9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h @@ -7,6 +7,7 @@ namespace orderman { class LegPropertyData; class CacheWarmingState; +class ISpreaderOrderSync; // The Spreader spawns a bunch of quoters and // hedgers and hands them this interface to // i. get data such as book and leg properties @@ -28,10 +29,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; + virtual ISpreaderOrderSync* order_sync() = 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) + // cache warm) virtual bool in_cache_warming_cycle() const = 0; virtual ~ISpreaderManager() {} }; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 21ccd718a..d1a75c37a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -19,7 +19,8 @@ _spreader(spreader_manager), _leg_property_data (leg_property_data), _child_order_state (leg_property_data.leg_security_key(), is_live, - false), + false, + spreader_manager.order_sync()), _price_quantity_state(Price(0), Quantity(0)), _worker (nullptr), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp index 622fd4cba..e6809fb56 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp @@ -7,6 +7,7 @@ namespace orderman{ SpreaderChildOrderState::SpreaderChildOrderState (SpreaderChildOrderState&& src) : _is_live(src._is_live), +_order_sync(std::move(src._order_sync)), _sec_key(src._sec_key), _is_quoting (src._is_quoting), _test_only_order_key(src._test_only_order_key), @@ -29,9 +30,11 @@ _order_place_time(src._order_place_time) SpreaderChildOrderState::SpreaderChildOrderState (SecurityKey sec_key, bool is_live, - bool is_quoting) + bool is_quoting, + ISpreaderOrderSync* order_sync) : _is_live (is_live), +_order_sync(order_sync), _sec_key (sec_key), _is_quoting (is_quoting), _test_only_order_key((uint32_t)bts::Timer::now().time_since_epoch().count()), @@ -44,6 +47,7 @@ void SpreaderChildOrderState::re_init (ChildOrder& child_order){ SpreaderUtils::compute_average_price(_base_price, _base_quantity, _filled_price, _filled_quantity, _base_price, _base_quantity); + _test_only_order_key = OrderKey((uint32_t)bts::Timer::now().time_since_epoch().count()); _n_place_orders = 0; _n_cancel_orders = _n_modify_orders = 0; _child_order = ChildOrder(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 4046db95a..7cf5ef6ef 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -4,6 +4,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" #include "SpreaderUtils.h" +#include "external_interfacing/ISpreaderOrderSync.h" namespace bts { namespace orderman { @@ -17,9 +18,10 @@ private: //_is_live is false for unit tests which enables // this to work without the actual order infrastructure const bool _is_live; + ISpreaderOrderSync* _order_sync; const SecurityKey _sec_key; const bool _is_quoting; - const OrderKey _test_only_order_key; + OrderKey _test_only_order_key; // just for statistics uint16_t _n_place_orders, _n_cancel_orders; uint32_t _n_modify_orders; @@ -53,9 +55,13 @@ public: /////////////////////////////////// SpreaderChildOrderState() = delete; SpreaderChildOrderState(const SpreaderChildOrderState&) = delete; + // this constructor is called from 2 places + // 1. SpreaderLegData, when making the quoting order + // 2. SingleFillHedger when constructing the hedging order SpreaderChildOrderState(SecurityKey sec_key, bool is_live, - bool is_quoting); + bool is_quoting, + ISpreaderOrderSync* order_sync=nullptr); SpreaderChildOrderState (SpreaderChildOrderState&& src); SpreaderChildOrderState& operator=(const SpreaderChildOrderState&) = delete; SpreaderChildOrderState& operator=(SpreaderChildOrderState&&) = delete; @@ -170,6 +176,11 @@ public: _n_place_orders++; if (_is_live) _child_order.activate(price, quantity); + else + if(_order_sync != nullptr) + //TODO + _order_sync->place_order(_sec_key,_test_only_order_key, + api::Side::SIDE_BUY,price, quantity); LOG(OrderMan, Info, "SpreaderChildOrderState::place_order " "is_quoting:{} key:{} sec_key:{} live:{} " "price:{} qty:{} t:{}", @@ -187,6 +198,9 @@ public: _n_modify_orders++; if (_is_live) _child_order.update(price, quantity); + else + if(_order_sync != nullptr) + _order_sync->modify_order(_test_only_order_key,price,quantity); LOG(OrderMan, Info, "SpreaderChildOrderState::modify_order " "is_quoting:{} key:{} sec_key:{} live:{} " "price:{} quantity:{} mod_no:{} t:{}", @@ -202,6 +216,9 @@ public: _n_cancel_orders++; if (_is_live) _child_order.cancel(); + else + if(_order_sync != nullptr) + _order_sync->cancel_order(_test_only_order_key); } void keep_order_warm(){ _child_order.warm_up_activate(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index d6ba456f4..eb751bb7c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -49,7 +49,8 @@ public: _quoter_child_order_state (_is_quoting ? new SpreaderChildOrderState( _leg_property_data.leg_security_key(), services.is_live(), - true) + true, + spreader_manager.order_sync()) : nullptr), _quoter(_is_quoting ? new SingleLegQuoter(spreader_manager, _leg_property_data, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h new file mode 100644 index 000000000..1807e6394 --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h @@ -0,0 +1,21 @@ +#pragma once +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/actors/order_manager/ChildOrder.h" + +namespace bts { +namespace orderman { + +class ISpreaderOrderSync{ +public: + virtual void place_order(SecurityKey, + OrderKey, + api::Side, + Price, + Quantity)=0; + virtual void modify_order(OrderKey, + Price, + Quantity)=0; + virtual void cancel_order(OrderKey)=0; + virtual ~ISpreaderOrderSync() {} +}; +}} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp index cc8a25a34..031f4e226 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp @@ -5,10 +5,13 @@ using namespace bts::api::orderman; namespace bts{ namespace orderman{ -SpreaderOrderServices::SpreaderOrderServices (OrderServices* order_services) +SpreaderOrderServices::SpreaderOrderServices ( + OrderServices* order_services, + ISpreaderOrderSync* order_sync) : _is_live(order_services != nullptr), -_order_services(order_services){ +_order_services(order_services), +_order_sync(order_sync){ } OrderServices& SpreaderOrderServices::order_services(){ @@ -45,4 +48,8 @@ bool SpreaderOrderServices::is_live() const { return _is_live; } +ISpreaderOrderSync* SpreaderOrderServices::order_sync(){ + return _order_sync; +} + }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h index 58c525347..f7674a098 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h @@ -10,6 +10,8 @@ namespace bts { namespace orderman { +class ISpreaderOrderSync; + // SpreaderOrderServices is a thin wrapper around // OrderServices. The solitary instance of this // is held in the Spreader. @@ -20,8 +22,10 @@ class SpreaderOrderServices private: const bool _is_live; bts::orderman::OrderServices* _order_services; + ISpreaderOrderSync* _order_sync; public: - SpreaderOrderServices (OrderServices* order_services); + SpreaderOrderServices (OrderServices* order_services, + ISpreaderOrderSync* order_sync = nullptr); OrderServices& order_services(); void report_state(const api::orderman::OrderState &state); trace::ScopedPerfLogEntry log_scope( @@ -34,6 +38,7 @@ public: const char *txt_1 = "", uint32_t uint32_1 = 0); bool is_live() const; + ISpreaderOrderSync* order_sync(); }; }} 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 a2bcbd15d..b134e0281 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -80,6 +80,7 @@ void SpreaderStartStateWorker::on_init_recovered(const bts::api::orderman::Order void SpreaderStartStateWorker::on_activate(Price price, Quantity quantity, SpreaderOrderServices& order_services){ + _spreader->_order_sync = order_services.order_sync(); // 1. update price, qty _spreader->_set_price_quantity (price, quantity); // 2. activate order builders 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 8ea5fa56e..ad6c13658 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -14,6 +14,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" +#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h" #include #include "lib/os/os.h" #include @@ -91,6 +92,9 @@ public: ChildOrder rv; return rv; } + ISpreaderOrderSync* order_sync() override{ + return nullptr; + } bool in_cache_warming_cycle() const override{ return false; } diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.cpp index 19e1f001e..df05dc8bb 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.cpp @@ -70,11 +70,11 @@ void OrderTranslator::init(ISimServices& sim_services){ me->sim_services = &sim_services; } -void OrderTranslator::place_new_order(OrderKey okey, - SecurityKey skey, - api::Side side, - Price p, - Quantity q){ +void OrderTranslator:: place_order(SecurityKey skey, + OrderKey okey, + api::Side side, + Price p, + Quantity q){ auto& t = me->orders.emplace_back( okey, @@ -118,7 +118,7 @@ void OrderTranslator::modify_order(OrderKey okey, me->sim_services->send(ochange); } -void OrderTranslator::cxl_order(OrderKey okey){ +void OrderTranslator::cancel_order(OrderKey okey){ OrderTuple* t = find_ord(okey,me->orders); bts_assert(t != nullptr); auto& ochange = t->ochange; diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.h b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.h index 39e760bf6..b04ea4546 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/domain_model/Security.pb.h" #include "../AlgoEvent.h" +#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h" namespace bts { namespace orderman {class SpreaderOrder;}} @@ -11,22 +12,22 @@ namespace bts::spartan::mdp3 { class ISimServices; -class OrderTranslator { +class OrderTranslator : public bts::orderman::ISpreaderOrderSync{ private: struct PImpl; std::unique_ptr me; public: OrderTranslator(bts::orderman::SpreaderOrder&); - void init(ISimServices&); - // routes old style order to ISimServices + void init(ISimServices&); + // ISpreaderOrderSync functions // (SpreaderChildOrderState's calls need to end up here) - void place_new_order(bts::orderman::OrderKey, - SecurityKey, - api::Side, - Price, - Quantity); - void modify_order(bts::orderman::OrderKey, Price, Quantity); - void cxl_order(bts::orderman::OrderKey); + void place_order(SecurityKey, + bts::orderman::OrderKey, + api::Side, + Price, + Quantity) override; + void modify_order(bts::orderman::OrderKey, Price, Quantity) override; + void cancel_order(bts::orderman::OrderKey) override; // Sends ISimServices's updates to spreader void route_update_to_spreader(const OrderUpdate&); }; diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp index 52721aa0e..74480ee3c 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp @@ -82,7 +82,7 @@ void SimSpreader::on_notification(AlgoNotification const& ev) { me->spreader.test_only_on_book_update(leg_bk_r); } } - else{ + else{ } } diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.h b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.h index 68c92b319..6c021a4e0 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.h @@ -16,7 +16,7 @@ class SimSpreader : public IAlgoModel { private: struct PImpl; std::unique_ptr me; -public: +public: SimSpreader(const bts::api::orderman::OrderDefinition&, const bts::api::Security&); void init(ISimServices&) override;