From f73d163312e2ea60cc5bb21887ba5968e24d3791 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 1 Jun 2018 15:36:06 -0400 Subject: [PATCH] implemented most of Pedro's review, need to do the mutators still --- .../sparkd/orderman/orders/NativeOrder.cpp | 37 ++-------------- .../orderman/orders/book_algos/BookAlgo.cpp | 42 ++++++++++++------- .../orderman/orders/book_algos/BookAlgo.h | 16 +++++-- .../orderman/orders/book_algos/JoinOrder.cpp | 22 +++++----- .../orderman/orders/book_algos/JoinOrder.h | 8 ++-- .../orderman/orders/book_algos/LeanOrder.cpp | 8 ++-- .../orderman/orders/book_algos/LeanOrder.h | 4 +- .../orderman/orders/book_algos/TickOrder.cpp | 8 ++-- .../orderman/orders/book_algos/TickOrder.h | 4 +- .../orderman/orders/book_algos/TopOrder.cpp | 22 +++++----- .../orderman/orders/book_algos/TopOrder.h | 8 ++-- 11 files changed, 85 insertions(+), 94 deletions(-) diff --git a/src/server/sparkd/orderman/orders/NativeOrder.cpp b/src/server/sparkd/orderman/orders/NativeOrder.cpp index 18598a0bf..e9fac3c42 100644 --- a/src/server/sparkd/orderman/orders/NativeOrder.cpp +++ b/src/server/sparkd/orderman/orders/NativeOrder.cpp @@ -78,14 +78,7 @@ void NativeOrder::on_init_new(OrderDefinition const &def, case CustomOrderDefinition::kStopLimit: me->state.mutable_stop_limit(); break; - case CustomOrderDefinition::kIceberg: - case CustomOrderDefinition::kSpreader: - case CustomOrderDefinition::kTimeBox: - case CustomOrderDefinition::kTick: - case CustomOrderDefinition::kLean: - case CustomOrderDefinition::kJoin: - case CustomOrderDefinition::kTop: - case CustomOrderDefinition::CUSTOM_NOT_SET: + default: bts_assert(false); break; } @@ -347,14 +340,7 @@ void NativeOrder::on_activate(Price p, Quantity q, case CustomOrderDefinition::kStop: case CustomOrderDefinition::kMarket: break; - case CustomOrderDefinition::kIceberg: - case CustomOrderDefinition::kSpreader: - case CustomOrderDefinition::kTimeBox: - case CustomOrderDefinition::kTick: - case CustomOrderDefinition::kLean: - case CustomOrderDefinition::kJoin: - case CustomOrderDefinition::kTop: - case CustomOrderDefinition::CUSTOM_NOT_SET: + default: bts_assert(false); break; } @@ -837,15 +823,7 @@ void NativeOrder::init_fix() { me->update_price_bm = update_encoding.add(0, price_sz()); break; } - case CustomOrderDefinition::kIceberg: - case CustomOrderDefinition::kSpreader: - case CustomOrderDefinition::kTimeBox: - case CustomOrderDefinition::kTick: - case CustomOrderDefinition::kLean: - case CustomOrderDefinition::kJoin: - case CustomOrderDefinition::kTop: - - case CustomOrderDefinition::CUSTOM_NOT_SET: + default: bts_assert(false); break; } @@ -988,14 +966,7 @@ NativeOrder::get_native_state(api::orderman::OrderState &st) { return *st.mutable_stop()->mutable_native_state(); case OrderState::kStopLimit: return *st.mutable_stop_limit()->mutable_native_state(); - case OrderState::kIceberg: - case OrderState::kSpreader: - case OrderState::kTimeBox: - case OrderState::kTick: - case OrderState::kLean: - case OrderState::kJoin: - case OrderState::kTop: - case OrderState::CUSTOM_NOT_SET: + default: break; } diff --git a/src/server/sparkd/orderman/orders/book_algos/BookAlgo.cpp b/src/server/sparkd/orderman/orders/book_algos/BookAlgo.cpp index b488a00f4..9a9367700 100644 --- a/src/server/sparkd/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/server/sparkd/orderman/orders/book_algos/BookAlgo.cpp @@ -43,16 +43,26 @@ void BookAlgo::on_init_new(const api::orderman::OrderDefinition& def, _def = def; OrderDefinition child_def = def; - setup_child(def, services, child_def); + setup_child(def, services, &child_def); me->child_builder = OrderBuilder(key(), child_def, services, 1); OrderDefinition hedge_def = def; - me->supports_hedge = setup_hedge(def, services, hedge_def); + me->supports_hedge = setup_hedge(def, services, &hedge_def); if(me->supports_hedge) _hedge_builder = OrderBuilder(key(), hedge_def, services, 4); - _tick_size = services.sec_db.resolve(SecurityKey(def.security_key()))->contract_spec().low_tick(); - transition(ORDER_STATUS_INACTIVE); + const bts::api::Security* sec = services.sec_db.resolve(SecurityKey(def.security_key())); + if(sec) + { + _tick_size = sec->contract_spec().low_tick(); + transition(ORDER_STATUS_INACTIVE); + } + else + { + auto msg = fmt::format("Unknown security: {}", def.security_key()); + _state.set_last_msg(msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + } } void BookAlgo::on_init_recovered(const api::orderman::OrderRecord& rec, @@ -92,12 +102,13 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services) { bts_assert(!me->services); me->services = &services; - me->child_builder.activate(services); - if(me->supports_hedge) - _hedge_builder.activate(services); switch (_state.status()) { case ORDER_STATUS_INACTIVE: + me->child_builder.activate(services); + if(me->supports_hedge) + _hedge_builder.activate(services); + _child = me->child_builder.build(); _state.set_price(p.value()); _state.set_quantity(q.value()); @@ -247,7 +258,7 @@ void BookAlgo::transition(api::orderman::OrderStatus new_status, std::string msg { auto const &from = OrderStatus_Name(_state.status()); auto const &to = OrderStatus_Name(new_status); - LOG(OrderMan, Info, "Transitioning TickOrder {} from {} to {}. Msg: {}", key().value(), from, to, msg); + LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", key().value(), from, to, msg); _state.set_status(new_status); } @@ -266,15 +277,16 @@ void BookAlgo::on_child_order_update(const OrderStateUpdateEvent& ev) case ORDER_STATUS_WORKING: switch (ev.state.status()) { - case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: + break; + case ORDER_STATUS_WORKING: if(me->supports_hedge) - send_hedge(orig_state, ev); + send_hedge_if_new_fills(orig_state, ev); break; case ORDER_STATUS_COMPLETED: transition(ORDER_STATUS_COMPLETED); if(me->supports_hedge) - send_hedge(orig_state, ev); + send_hedge_if_new_fills(orig_state, ev); break; case ORDER_STATUS_DISCONNECTED: @@ -343,16 +355,14 @@ void BookAlgo::detach() void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent&) {} -bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, - api::orderman::OrderDefinition&) +bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, api::orderman::OrderDefinition*) { return false; } -void BookAlgo::send_hedge(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) +void BookAlgo::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) { - UNUSED(orig_state); - UNUSED(new_state); + UNUSED(orig_state);UNUSED(new_state); // uint32_t qty = new_state.state.filled_quantity() - orig_state.filled_quantity(); // UNUSED(qty); } diff --git a/src/server/sparkd/orderman/orders/book_algos/BookAlgo.h b/src/server/sparkd/orderman/orders/book_algos/BookAlgo.h index 0404aec9e..209ed1f26 100644 --- a/src/server/sparkd/orderman/orders/book_algos/BookAlgo.h +++ b/src/server/sparkd/orderman/orders/book_algos/BookAlgo.h @@ -31,10 +31,10 @@ public: protected: virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, - api::orderman::OrderDefinition&) = 0; + api::orderman::OrderDefinition*) = 0; virtual bool setup_hedge(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, - api::orderman::OrderDefinition&); - virtual void send_hedge(const api::orderman::OrderState&, const OrderStateUpdateEvent&); + api::orderman::OrderDefinition*); + virtual void send_hedge_if_new_fills(const api::orderman::OrderState&, const OrderStateUpdateEvent&); virtual void on_child_order_update(const OrderStateUpdateEvent&); virtual void on_book_update(const bts::orderman::BookUpdateEvent&); @@ -50,6 +50,16 @@ private: struct PImpl; std::unique_ptr me; +protected: + // const api::orderman::OrderDefinition& this_def() const; + // const api::orderman::OrderState& this_state() const; + // void set_price(double); + // void set_size(uint32_t); + + // void set_child_price(double); + // void set_child_size(uint32_t); + // void update_child(Price, Quantity); + protected: api::orderman::OrderDefinition _def; api::orderman::OrderState _state; diff --git a/src/server/sparkd/orderman/orders/book_algos/JoinOrder.cpp b/src/server/sparkd/orderman/orders/book_algos/JoinOrder.cpp index 278242156..b462515f1 100644 --- a/src/server/sparkd/orderman/orders/book_algos/JoinOrder.cpp +++ b/src/server/sparkd/orderman/orders/book_algos/JoinOrder.cpp @@ -29,13 +29,13 @@ JoinOrder::JoinOrder() : me(new PImpl()) {} JoinOrder::~JoinOrder() {} -void JoinOrder::setup_child(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& child_def) +void JoinOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_child) { _state.mutable_join(); - auto const &join_def = parent_def.custom_def().join(); + auto const &join_def = this_def.custom_def().join(); _child_state.set_status(ORDER_STATUS_INACTIVE); - *child_def.mutable_custom_def() = join_def.child(); + *out_child->mutable_custom_def() = join_def.child(); me->min_tick_offset_on_deploy = join_def.min_tick_offset_on_deploy(); me->join_threshold = join_def.join_threshold(); @@ -44,24 +44,24 @@ void JoinOrder::setup_child(const api::orderman::OrderDefinition& parent_def, co me->did_join = false; } -bool JoinOrder::setup_hedge(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& hedge_def) +bool JoinOrder::setup_hedge(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_hedge) { - auto const &join_def = parent_def.custom_def().join(); + auto const &join_def = this_def.custom_def().join(); if(me->enable_hedge && join_def.has_hedge()) { - *hedge_def.mutable_custom_def() = join_def.hedge(); + *out_hedge->mutable_custom_def() = join_def.hedge(); if(_def.side() == api::SIDE_BUY) - hedge_def.set_side(api::SIDE_SELL); + out_hedge->set_side(api::SIDE_SELL); else - hedge_def.set_side(api::SIDE_BUY); + out_hedge->set_side(api::SIDE_BUY); return true; } else return false; } -void JoinOrder::send_hedge(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) +void JoinOrder::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) { uint32_t qty = new_state.state.filled_quantity() - orig_state.filled_quantity(); if(qty > 0) diff --git a/src/server/sparkd/orderman/orders/book_algos/JoinOrder.h b/src/server/sparkd/orderman/orders/book_algos/JoinOrder.h index 2d666a7d5..7fde409b9 100644 --- a/src/server/sparkd/orderman/orders/book_algos/JoinOrder.h +++ b/src/server/sparkd/orderman/orders/book_algos/JoinOrder.h @@ -19,11 +19,11 @@ public: virtual ~JoinOrder(); protected: - void setup_child(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& child_def) override; + void setup_child(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, + api::orderman::OrderDefinition*) override; bool setup_hedge(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, - api::orderman::OrderDefinition&) override; - void send_hedge(const api::orderman::OrderState&, const OrderStateUpdateEvent&) override; + api::orderman::OrderDefinition*) override; + void send_hedge_if_new_fills(const api::orderman::OrderState&, const OrderStateUpdateEvent&) override; void on_book_update(const bts::orderman::BookUpdateEvent&) override; private: diff --git a/src/server/sparkd/orderman/orders/book_algos/LeanOrder.cpp b/src/server/sparkd/orderman/orders/book_algos/LeanOrder.cpp index c56246f89..68d5527c8 100644 --- a/src/server/sparkd/orderman/orders/book_algos/LeanOrder.cpp +++ b/src/server/sparkd/orderman/orders/book_algos/LeanOrder.cpp @@ -25,13 +25,13 @@ LeanOrder::LeanOrder() : me(new PImpl()) {} LeanOrder::~LeanOrder() {} -void LeanOrder::setup_child(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& child_def) +void LeanOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_child) { _state.mutable_lean(); - auto const &lean_def = parent_def.custom_def().lean(); + auto const &lean_def = this_def.custom_def().lean(); _child_state.set_status(ORDER_STATUS_INACTIVE); - *child_def.mutable_custom_def() = lean_def.child(); + *out_child->mutable_custom_def() = lean_def.child(); me->cross_threshold = lean_def.cross_threshold(); me->max_chase_ticks = lean_def.max_chase_ticks(); diff --git a/src/server/sparkd/orderman/orders/book_algos/LeanOrder.h b/src/server/sparkd/orderman/orders/book_algos/LeanOrder.h index cb546eff4..1114b30e1 100644 --- a/src/server/sparkd/orderman/orders/book_algos/LeanOrder.h +++ b/src/server/sparkd/orderman/orders/book_algos/LeanOrder.h @@ -20,8 +20,8 @@ public: virtual ~LeanOrder(); protected: - void setup_child(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& child_def) override; + void setup_child(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, + api::orderman::OrderDefinition*) override; void on_book_update(const bts::orderman::BookUpdateEvent&) override; private: void payup(const md::PriceSize& opposite, uint32_t cross_ticks = 0) override; diff --git a/src/server/sparkd/orderman/orders/book_algos/TickOrder.cpp b/src/server/sparkd/orderman/orders/book_algos/TickOrder.cpp index 443251b19..789f23240 100644 --- a/src/server/sparkd/orderman/orders/book_algos/TickOrder.cpp +++ b/src/server/sparkd/orderman/orders/book_algos/TickOrder.cpp @@ -28,13 +28,13 @@ TickOrder::TickOrder() : me(new PImpl()) {} TickOrder::~TickOrder() {} -void TickOrder::setup_child(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& child_def) +void TickOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_child) { _state.mutable_tick(); - auto const &tick_def = parent_def.custom_def().tick(); + auto const &tick_def = this_def.custom_def().tick(); _child_state.set_status(ORDER_STATUS_INACTIVE); - *child_def.mutable_custom_def() = tick_def.child(); + *out_child->mutable_custom_def() = tick_def.child(); me->min_tick_offset_on_deploy = tick_def.min_tick_offset_on_deploy(); me->cross_threshold = tick_def.cross_threshold(); diff --git a/src/server/sparkd/orderman/orders/book_algos/TickOrder.h b/src/server/sparkd/orderman/orders/book_algos/TickOrder.h index bfebf8c04..fa7bfe9b3 100644 --- a/src/server/sparkd/orderman/orders/book_algos/TickOrder.h +++ b/src/server/sparkd/orderman/orders/book_algos/TickOrder.h @@ -20,8 +20,8 @@ public: virtual ~TickOrder(); protected: - void setup_child(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& child_def) override; + void setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition*) override; void on_book_update(const bts::orderman::BookUpdateEvent&) override; private: void payup(const md::PriceSize& opposite, uint32_t cross_ticks) override; diff --git a/src/server/sparkd/orderman/orders/book_algos/TopOrder.cpp b/src/server/sparkd/orderman/orders/book_algos/TopOrder.cpp index fda3e9db6..e6621e381 100644 --- a/src/server/sparkd/orderman/orders/book_algos/TopOrder.cpp +++ b/src/server/sparkd/orderman/orders/book_algos/TopOrder.cpp @@ -27,13 +27,13 @@ TopOrder::TopOrder() : me(new PImpl()) {} TopOrder::~TopOrder() {} -void TopOrder::setup_child(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& child_def) +void TopOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_child) { _state.mutable_top(); - auto const &top_def = parent_def.custom_def().top(); + auto const &top_def = this_def.custom_def().top(); _child_state.set_status(ORDER_STATUS_INACTIVE); - *child_def.mutable_custom_def() = top_def.child(); + *out_child->mutable_custom_def() = top_def.child(); me->watch_level_tick_offset = top_def.watch_level_tick_offset(); me->top_threshold = top_def.top_threshold(); @@ -41,24 +41,24 @@ void TopOrder::setup_child(const api::orderman::OrderDefinition& parent_def, con me->hedge_ticks = top_def.hedge_ticks(); } -bool TopOrder::setup_hedge(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& hedge_def) +bool TopOrder::setup_hedge(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_hedge) { - auto const &top_def = parent_def.custom_def().top(); + auto const &top_def = this_def.custom_def().top(); if(me->enable_hedge && top_def.has_hedge()) { - *hedge_def.mutable_custom_def() = top_def.hedge(); + *out_hedge->mutable_custom_def() = top_def.hedge(); if(_def.side() == api::SIDE_BUY) - hedge_def.set_side(api::SIDE_SELL); + out_hedge->set_side(api::SIDE_SELL); else - hedge_def.set_side(api::SIDE_BUY); + out_hedge->set_side(api::SIDE_BUY); return true; } else return false; } -void TopOrder::send_hedge(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) +void TopOrder::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) { uint32_t qty = new_state.state.filled_quantity() - orig_state.filled_quantity(); if(qty > 0) diff --git a/src/server/sparkd/orderman/orders/book_algos/TopOrder.h b/src/server/sparkd/orderman/orders/book_algos/TopOrder.h index fb45ca54c..02b9bbaf3 100644 --- a/src/server/sparkd/orderman/orders/book_algos/TopOrder.h +++ b/src/server/sparkd/orderman/orders/book_algos/TopOrder.h @@ -18,11 +18,11 @@ public: virtual ~TopOrder(); protected: - void setup_child(const api::orderman::OrderDefinition& parent_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition& child_def) override; + void setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition*) override; bool setup_hedge(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, - api::orderman::OrderDefinition&) override; - void send_hedge(const api::orderman::OrderState&, const OrderStateUpdateEvent&) override; + api::orderman::OrderDefinition*) override; + void send_hedge_if_new_fills(const api::orderman::OrderState&, const OrderStateUpdateEvent&) override; void on_book_update(const bts::orderman::BookUpdateEvent&) override; private: