Added order indirection interface
This commit is contained in:
1 parent
2f21e73d8d
commit
9824ef7686
16 files changed
+101
-31
No files matched your search
@@ -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,
|
||||
|
||||
@@ -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<uint8_t,16> _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;
|
||||
}
|
||||
|
||||
@@ -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() {}
|
||||
};
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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,
|
||||
|
||||
+21
@@ -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() {}
|
||||
};
|
||||
}}
|
||||
+9
-2
@@ -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;
|
||||
}
|
||||
|
||||
}}
|
||||
+6
-1
@@ -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();
|
||||
};
|
||||
|
||||
}}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 <google/protobuf/util/message_differencer.h>
|
||||
#include "lib/os/os.h"
|
||||
#include <algorithm>
|
||||
@@ -91,6 +92,9 @@ public:
|
||||
ChildOrder rv;
|
||||
return rv;
|
||||
}
|
||||
ISpreaderOrderSync* order_sync() override{
|
||||
return nullptr;
|
||||
}
|
||||
bool in_cache_warming_cycle() const override{
|
||||
return false;
|
||||
}
|
||||
|
||||
+6
-6
@@ -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;
|
||||
|
||||
+11
-10
@@ -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<PImpl> 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&);
|
||||
};
|
||||
|
||||
@@ -82,7 +82,7 @@ void SimSpreader::on_notification(AlgoNotification const& ev) {
|
||||
me->spreader.test_only_on_book_update(leg_bk_r);
|
||||
}
|
||||
}
|
||||
else{
|
||||
else{
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ class SimSpreader : public IAlgoModel {
|
||||
private:
|
||||
struct PImpl;
|
||||
std::unique_ptr<PImpl> me;
|
||||
public:
|
||||
public:
|
||||
SimSpreader(const bts::api::orderman::OrderDefinition&,
|
||||
const bts::api::Security&);
|
||||
void init(ISimServices&) override;
|
||||
|
||||
Reference in new issue
Block a user