Added fill recording.

This commit is contained in:
Pedro Pinto committed 2017-12-19 23:21:44 +00:00
1 parent c2984972a6
commit 0440c8fb6f
6 files changed
+142 -2

No files matched your search

+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/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)
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/FillStore.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)
@@ -0,0 +1,89 @@
#include "FillStore.h"
#include "server/sparkd/persistence/SqliteStore.h"
#include "lib/api/services/OrderService2.pb.h"
#include "server/sparkd/orderman2/events/StoredFillEvent.h"
#include "lib/utils/PBUtils.h"
#include "server/sparkd/orderman2/events/NewExecutionReportEvent.h"
#include <sys/time.h>
namespace bts {
namespace orderman2 {
auto const fills_ns = "fills";
struct FillStore::PImpl
{
PImpl() :
store(new persistence::SqliteStore("fills"))
{}
std::unique_ptr<persistence::IStore> store;
std::unordered_map<std::string,std::unique_ptr<api::orderman2::Fill>> known_fills;
mercury::Stream<StoredFillEvent> fill_stream;
};
FillStore::FillStore () : me (new PImpl()) {
}
void FillStore::init()
{
api::orderman2::Fill rec;
std::vector<StoredFillEvent> stored_batch;
auto all = me->store->retrieve_all()[fills_ns];
for (auto const &kvp : all)
if (utils::pb::from_string<api::orderman2::Fill> (kvp.second,&rec)) {
auto fk = kvp.first;
auto fill = std::make_unique<api::orderman2::Fill> (rec);
stored_batch.emplace_back(*fill.get());
me->known_fills[fk] = std::move(fill);
}
else
LOG(Persistence,Error,
"Could not recover fill {} from storage. "
"This should be investigated", kvp.first);
me->fill_stream = make_stream<StoredFillEvent> ();
publish_batch(me->fill_stream,stored_batch);
subscribe<NewExecutionReportEvent> ([this] (auto const&ev) {this->on_execution_report(ev);});
}
FillStore::~FillStore () {}
void FillStore::on_execution_report(const mercury::Update<NewExecutionReportEvent> &u)
{
if (u.events)
for (auto const&ev : *u.events) {
auto &er = *ev.data;
if (er.exec_type == api::orderman2::EXEC_TYPE_PARTIAL_FILL ||
er.exec_type == api::orderman2::EXEC_TYPE_FILL) {
auto fk = fmt::format("{}:{}", er.order_key.value(),to_str(er.exchange_order_id));
auto fill = std::make_unique<api::orderman2::Fill>();
fill->set_order_key(er.order_key.value());
fill->set_security_key(er.security->id());
fill->set_account(to_str(er.account_name));
fill->set_last_price(er.last_price.value());
fill->set_avg_price(er.avg_price.value());
fill->set_side(er.side);
fill->set_last_shares(er.last_shares.value());
fill->set_fill_key(fk);
struct timeval tv;
gettimeofday(&tv, NULL);
fill->mutable_timestamp()->set_seconds(tv.tv_sec);
fill->mutable_timestamp()->set_nanos(tv.tv_usec * 1000);
auto fv = utils::pb::to_string(*fill);
auto &ptr = me->known_fills[fk];
bool is_new = !ptr;
ptr = std::move(fill);
if (is_new)
me->store->insert(fills_ns,fk,fv);
else
me->store->update(fills_ns,fk,fv);
publish(me->fill_stream,*ptr);
}
}
}
}}
@@ -0,0 +1,23 @@
#pragma once
#include <memory>
#include "server/sparkd/mercury/actors/Actor.h"
namespace bts {
namespace orderman2 {
class NewExecutionReportEvent;
class FillStore : public mercury::Actor
{
public:
FillStore();
~FillStore();
void init() override;
private:
struct PImpl;
std::unique_ptr<PImpl> me;
void on_execution_report(const mercury::Update<NewExecutionReportEvent> &);
};
}}
@@ -0,0 +1,23 @@
#pragma once
#include <memory>
#include <boost/container/pmr/small_vector.hpp>
#include "lib/api/services/OrderService2.pb.h"
#include "server/sparkd/mercury/synopsis/MergeByKey.h"
#include "lib/api/services/OrderService2.pb.h"
namespace bts {
namespace orderman2 {
class StoredFillEvent : public mercury::Event <StoredFillEvent>
{
public:
using SynopsisPolicy = mercury::MergeByKey<StoredFillEvent>;
StoredFillEvent(api::orderman2::Fill &fill) : fill(&fill) {}
auto key() const {return fill->fill_key();}
api::orderman2::Fill *fill;
};
}}
@@ -17,7 +17,7 @@ public:
StoredOrderEvent(api::orderman2::OrderRecord &record) : order_record(&record) {}
auto key() {return order_record->key();}
auto key() const {return order_record->key();}
api::orderman2::OrderRecord *order_record;
};
@@ -8,6 +8,8 @@
#include "lib/config/config.h"
#include "lib/config/protos/jetfix.pb.h"
#include "server/sparkd/orderman2/actors/MDSource.h"
#include "server/sparkd/orderman2/actors/OrderStore.h"
#include "server/sparkd/orderman2/actors/FillStore.h"
namespace bts {
namespace orderman2 {
@@ -57,6 +59,8 @@ OrderServiceServer2::OrderServiceServer2 (bts::api::ServiceContext& ctx) :
});
me->slow_thread = std::thread([this] () {
me->slow_exe.spawn<OrderStore>(GatewayName(get_connection().name()));
me->slow_exe.spawn<FillStore>();
me->slow_exe.spawn<SecuritySrc> ();
me->slow_exe.spawn<mercury::Poller> ();
@@ -84,3 +88,4 @@ void OrderServiceServer2::crack_order(const api::orderman2::Crack&,
const api::Response<api::orderman2::Response>& ) {}
}}