Orderman2

This commit is contained in:
Pedro Pinto committed 2017-12-19 11:30:00 -05:00
1 parent fea0ec2279
commit dba051e374
9 files changed
+219 -18

No files matched your search

+5 -1
View File
@@ -108,7 +108,11 @@ message GatewayStatusUpdate {
string gateway_name = 3 [(bts.api.key)=true];
}
message LimitOrderState {NativeOrderStatus native_status = 1;}
message LimitOrderState {
string exchange_order_id = 1;
NativeOrderStatus native_status = 2;
}
message MarketOrderState {NativeOrderStatus native_status = 1;}
message StopMarketOrderState {NativeOrderStatus native_status = 1;}
message StopLimitOrderState {NativeOrderStatus native_status = 1;}
+1 -1
View File
@@ -1 +1 @@
set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/actors/order_manager/OrderBuilder.cpp;orderman2/actors/order_manager/OrderManager.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp)
set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/OrderStore.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/actors/order_manager/OrderBuilder.cpp;orderman2/actors/order_manager/OrderManager.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp)
@@ -33,7 +33,8 @@ struct ExecutionGateway::PImpl
exe_report_stream(),
gw_status_change_stream(),
cancel_reject_stream(),
gw_name(cfg.name())
gw_name(cfg.name()),
cfg (cfg)
{}
JFGw gw;
@@ -44,6 +45,7 @@ struct ExecutionGateway::PImpl
mercury::Stream<GatewayStatusChangeEvent> gw_status_change_stream;
mercury::Stream<CancelRejectEvent> cancel_reject_stream;
GatewayName gw_name;
config::JetFIX::Connection cfg;
};
ExecutionGateway::ExecutionGateway (config::JetFIX::Connection const&cfg) : me (new PImpl(cfg)) {}
@@ -118,9 +120,9 @@ void ExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &msg)
if (msg.has<fix::MultiLegReportingType>() && msg.get<fix::MultiLegReportingType>() == 2)
return;
std::string reject_msg;
std::string text_msg;
if (msg.has<fix::Text>())
reject_msg = msg.get<fix::Text>();
text_msg = msg.get<fix::Text>();
// allocate from our pool
auto data = me->exe_report_pool.construct();
@@ -149,8 +151,8 @@ void ExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &msg)
securities::decode_exchange_price(*sec,Price(msg.get<fix::AvgPx>())) : Price(0);
str_to(msg.get<fix::ExecID>(),&data->exchange_fill_id);
str_to(msg.get<fix::TransactTimeStr>(),&data->transact_time);
data->reject_msg = reject_msg;
data->cfg = &me->cfg;
data->msg = text_msg;
publish(me->exe_report_stream,data);
}
}
@@ -0,0 +1,80 @@
#include "OrderStore.h"
#include "lib/utils/PBUtils.h"
#include "server/sparkd/persistence/SqliteStore.h"
#include "lib/api/services/OrderService2.pb.h"
#include "server/sparkd/orderman2/events/StoredOrderEvent.h"
#include <unordered_set>
namespace bts {
namespace orderman2 {
static auto const orders_ns = "orders";
struct OrderStore::PImpl
{
PImpl() :
known_orders(),
store(new persistence::SqliteStore("orders2")),
order_stream()
{}
std::unordered_map<OrderKey,std::unique_ptr<api::orderman2::OrderRecord>> known_orders;
std::unique_ptr<persistence::IStore> store;
mercury::Stream<StoredOrderEvent> order_stream;
};
OrderStore::OrderStore () : me (new PImpl()) {}
OrderStore::~OrderStore () {}
void OrderStore::init()
{
api::orderman2::OrderRecord rec;
std::vector<StoredOrderEvent> stored_batch;
auto all = me->store->retrieve_all()[orders_ns];
for (auto const &kvp : all)
if (utils::pb::from_string<api::orderman2::OrderRecord> (kvp.second,&rec)) {
auto ok = OrderKey(std::stoi(kvp.first));
auto order_record = std::make_unique<api::orderman2::OrderRecord> (rec);
stored_batch.emplace_back(order_record.get());
me->known_orders[ok] = std::move(order_record);
}
else
LOG(Persistence,Error,
"Could not recover order {} from storage. "
"This should be investigated", kvp.first);
me->order_stream = make_stream<StoredOrderEvent> ();
publish_batch(me->order_stream,stored_batch);
}
// void OrderStore::on(event::NativeOrderStateChange const&ch)
// {
// auto pb = event::to_pb(*ch.header,ch.current_state);
// LOG(OrderMan,Info,"Storing native order: {} ",utils::pb::to_string(pb));
// me->store.store(pb);
// std::vector<api::orderman::OrderState> v {pb};
// order_state_change_signal(event::OrderStateChange {v});
// }
// void OrderStore::on(event::SpreaderOrderStateChange const&sc)
// {
// auto pb = event::to_pb(*sc.header,sc.current_state);
// LOG(OrderMan,Info,"Storing spreader order: {} ",utils::pb::to_string(pb));
// me->store.store(pb);
// std::vector<api::orderman::OrderState> v {pb};
// order_state_change_signal(event::OrderStateChange {v});
// }
// void OrderStore::on(event_grid::event::Init const&)
// {
// auto existing_orders = me->store.retrieve_all();
// LOG(OrderMan,Info,"Publishing initial {} orders recovered from store.", existing_orders.size());
// order_state_change_signal(event::OrderStateChange {existing_orders});
// }
}}
@@ -0,0 +1,21 @@
#pragma once
#include <memory>
#include "server/sparkd/mercury/actors/Actor.h"
namespace bts {
namespace orderman2 {
class OrderStore : public mercury::Actor
{
public:
OrderStore();
~OrderStore();
void init() override;
private:
struct PImpl;
std::unique_ptr<PImpl> me;
};
}}
@@ -71,11 +71,9 @@ Order &OrderFactory::recover(api::orderman2::OrderRecord const&rec)
Order &OrderFactory::recreate_from_exe_report(ExecutionReport const&r)
{
me->my_orders.emplace_back();
auto &order_ptr = me->my_orders.back();
using namespace api::orderman2;
std::unique_ptr<NativeOrder> native_order;
switch (r.order_type) {
case NATIVE_ORDER_TYPE_UNDEFINED:
bts_assert(false);
@@ -84,7 +82,7 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const&r)
bts_assert(false);
break;
case NATIVE_ORDER_TYPE_LIMIT:
order_ptr.reset (new LimitOrder());
native_order. reset (new LimitOrder());
break;
case NATIVE_ORDER_TYPE_STOP:
bts_assert(false);
@@ -99,8 +97,13 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const&r)
bts_assert(false);
break;
}
order_ptr->_key = r.order_key;
order_ptr->_parent_key = null_order_key();
native_order->on_init_from_exe_report(r,PreActivationOrderServices{me->sec_db,*this});
native_order->_key = r.order_key;
native_order->_parent_key = null_order_key();
me->my_orders.emplace_back();
auto &order_ptr = me->my_orders.back();
order_ptr.reset(native_order.release());
return *order_ptr;
}
@@ -145,3 +148,4 @@ Order &OrderFactory::allocate (OrderKey k, OrderKey pk,api::orderman2::OrderDefi
}}
@@ -3,6 +3,7 @@
#include <memory>
#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h"
#include "server/sparkd/mercury/mercury_utils/mercury_common.h"
#include "lib/config/protos/jetfix.pb.h"
namespace bts {
namespace orderman2 {
@@ -28,7 +29,8 @@ public:
Price avg_price;
ExchangeFillID exchange_fill_id;
mercury::TimeStampStr transact_time;
std::string reject_msg;
config::JetFIX::Connection const *cfg;
std::string msg;
};
}}
@@ -1,8 +1,93 @@
#include "LimitOrder.h"
#include "server/sparkd/orderman2/orderman2_utils/ExecutionReport.h"
#include "lib/api/services/OrderService2.pb.h"
#include "server/sparkd/orderman2/order_factory/IOrderFactory.h"
#include <sys/time.h>
namespace bts {
namespace orderman2 {
api::orderman2::OrderStatus map_status(api::orderman2::NativeOrderStatus status)
{
using namespace api::orderman2;
switch (status) {
case NATIVE_ORDER_STATUS_NONE:
case NATIVE_ORDER_STATUS_UNACKNOWLEDGED:
case NATIVE_ORDER_STATUS_REJECTED_BY_SPARK:
case NATIVE_ORDER_STATUS_DONE:
case NATIVE_ORDER_STATUS_REJECTED:
case NATIVE_ORDER_STATUS_ORDER_NOT_FOUND:
return OrderStatus::ORDER_STATUS_INACTIVE;
break;
case NATIVE_ORDER_STATUS_NEW:
case NATIVE_ORDER_STATUS_PENDING_NEW:
case NATIVE_ORDER_STATUS_PARTIALLY_FILLED:
case NATIVE_ORDER_STATUS_REPLACED:
case NATIVE_ORDER_STATUS_PENDING_CANCEL:
case NATIVE_ORDER_STATUS_STOPPED:
case NATIVE_ORDER_STATUS_SUSPENDED:
case NATIVE_ORDER_STATUS_CANCEL_ACK:
case NATIVE_ORDER_STATUS_ACCEPTED_FOR_BIDDING:
case NATIVE_ORDER_STATUS_PENDING_REPLACE:
case NATIVE_ORDER_STATUS_CALCULATED:
return OrderStatus::ORDER_STATUS_ACTIVE;
break;
case NATIVE_ORDER_STATUS_FILLED:
return OrderStatus::ORDER_STATUS_COMPLETED;
break;
case NATIVE_ORDER_STATUS_EXPIRED:
case NATIVE_ORDER_STATUS_CANCELED:
return OrderStatus::ORDER_STATUS_CANCELED;
break;
default:
return OrderStatus::ORDER_STATUS_ERROR;
break;
}
}
void LimitOrder::on_init_from_exe_report(ExecutionReport const&er, const PreActivationOrderServices &os)
{
auto k = er.order_key;
api::orderman2::OrderRecord orecord;
orecord.set_key(k.value());
orecord.set_parent_key(null_order_key().value());
auto &def = *orecord.mutable_def();
def.set_security_key(er.security->id());
def.set_side(er.side);
def.set_login(to_str(er.operator_id));
def.set_account(to_str(er.account_name));
def.set_time_in_force(er.time_in_force);
def.set_manual_order_indicator(er.manual_order_indicator);
def.set_cti_code(api::orderman2::CTICode(er.cfg->cti_code()[0]));
def.mutable_limit();
auto &state = *orecord.mutable_state();
state.set_status(map_status(er.order_status));
state.set_price(er.price.value());
state.set_quantity(er.quantity.value());
state.set_filled_quantity(er.filled_quantity.value());
state.set_last_price(er.last_price.value());
state.set_avg_price(er.avg_price.value());
state.set_last_msg(er.msg);
struct timeval tv;
gettimeofday(&tv, NULL);
state.mutable_last_change()->set_seconds(tv.tv_sec);
state.mutable_last_change()->set_nanos(tv.tv_usec * 1000);
auto &limit_state = *state.mutable_limit();
limit_state.set_exchange_order_id(to_str(er.exchange_order_id));
on_init_recovered(orecord,os);
}
LimitOrder::~LimitOrder() {}
@@ -13,9 +13,12 @@ class LimitOrder : public NativeOrder
public:
~LimitOrder() override;
void on_init_new(api::orderman2::OrderDefinition const&, const PreActivationOrderServices&) override {}
void on_init_recovered(api::orderman2::OrderRecord const&, const PreActivationOrderServices &) override {}
void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &) override {};
void on_init_new(api::orderman2::OrderDefinition const&,
const PreActivationOrderServices&) override {}
void on_init_recovered(api::orderman2::OrderRecord const&,
const PreActivationOrderServices &) override {}
void on_init_from_exe_report(ExecutionReport const&,
const PreActivationOrderServices &) override ;
void on_activate(Price,Quantity,OrderServices &) override {}
void on_update(Price , Quantity ) override {}