This commit is contained in:
Pedro Pinto committed 2017-09-26 22:26:54 +00:00
1 parent d4e8f945a3
commit 313a1fa383
42 files changed
+968 -226

No files matched your search

+1 -1
View File
@@ -1 +1 @@
set(sources api/apicore.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/services/ApiUnitTestService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Account.conf;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Symbols.conf;config/defaults/User.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/Account.proto;config/protos/Executor.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/User.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Structure/FixedSecurity.cpp;md/Structure/PriceSize.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;security_model/SecurityHelper.cpp;security_model/old_security.proto;sparkproto/SparkProtos.proto;testing/windows_test_driver.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp)
set(sources api/apicore.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/services/ApiUnitTestService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Account.conf;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Symbols.conf;config/defaults/User.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/Account.proto;config/protos/Executor.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/User.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Structure/FixedSecurity.cpp;md/Structure/PriceSize.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;security_model/SecurityHelper.cpp;security_model/old_security.proto;sparkproto/SparkProtos.proto;testing/windows_test_driver.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp)
+11 -14
View File
@@ -120,23 +120,23 @@ message NativeOrderState {
// Mutable, always available
orderman.ManualOrderIndicator manual_order_indicator = 11;
double price = 12;
uint32 order_quantity = 13;
OrderStatus order_status= 14;
double last_price = 17;
double last_price = 12;
double avg_price = 15;
uint32 order_quantity = 13;
uint32 filled_quantity=16;
string reject_msg=18;
OrderStatus order_status= 14;
}
message SpreaderOrderState {}
message OrderState {
uint32 order_key = 3 [(bts.api.key)=true];
google.protobuf.Timestamp timestamp = 4;
uint32 order_key = 1 [(bts.api.key)=true];
google.protobuf.Timestamp timestamp = 2;
string reject_msg=3;
oneof state {
NativeOrderState native = 1;
SpreaderOrderState spreader = 2;
NativeOrderState native = 4;
SpreaderOrderState spreader = 5;
}
}
@@ -149,7 +149,6 @@ message CreateNativeOrder{
orderman.OrderType order_type = 7;
orderman.CustomerOrFirm customer_or_firm = 8;
orderman.CTICode cti_code = 9;
string user_login = 10;
orderman.ManualOrderIndicator manual_order_indicator = 11;
double price = 12;
uint32 quantity = 13;
@@ -169,7 +168,6 @@ message UpdateNativeOrder {
uint32 security_key = 4;
orderman.CustomerOrFirm customer_or_firm = 8;
orderman.CTICode cti_code = 9;
string user_login = 10;
orderman.ManualOrderIndicator manual_order_indicator = 11;
double price = 12;
uint32 quantity = 13;
@@ -191,7 +189,6 @@ message CancelNativeOrder {
api.BuySell side = 5;
orderman.CustomerOrFirm customer_or_firm = 8;
orderman.CTICode cti_code = 9;
string user_login = 10;
orderman.ManualOrderIndicator manual_order_indicator = 11;
}
@@ -229,8 +226,8 @@ message NativeFill {
double avg_price = 9;
api.BuySell side = 5;
double last_shares = 6;
string fill_id = 7;
google.protobuf.Timestamp transact_timestamp = 8;
string fill_id = 7 [(bts.api.key)=true];
google.protobuf.Timestamp timestamp = 8;
}
message OrdersSub {}
+27
View File
@@ -0,0 +1,27 @@
JetFIX {
value {
connection {
name: "cme_ans"
platform: GLBX
socket_connect_host_ip: "69.50.112.177"
socket_connect_port: 61881
sender_compid: "ANS004N"
target_compid: "CME"
target_subid: "64"
start_time: "00:30:00"
end_time: "23:30:00"
start_day: "sunday"
end_day: "friday"
sender_subid: "BTS"
raw_data: "T4CTS"
}
}
}
SparkConnection {
value {
connection_name: "cme_ans"
}
}
+4
View File
@@ -88,3 +88,7 @@ message JetFIXSimConnections {
required JetFIX.Connection cboe_eye = 40;
required JetFIX.Connection glbx_hedger = 50;
}
message SparkConnection {
required string connection_name = 10;
}
+7
View File
@@ -1,6 +1,7 @@
#pragma once
#include <string>
#include <google/protobuf/text_format.h>
#include "bts_export.h"
namespace google {
@@ -12,6 +13,12 @@ namespace bts {
namespace utils {
namespace pb {
BTS_EXPORT std::string to_string (google::protobuf::Message const &msg);
template <class T> bool from_string(const std::string &str, T*out)
{
return google::protobuf::TextFormat::ParseFromString (str,out);
}
}}}
-1
View File
@@ -57,7 +57,6 @@ BTS_EXPORT std::string FIX_date_time_string (PTime const &t);
BTS_EXPORT PTime parse_FIX_timestamp (const std::string &ts);
BTS_EXPORT std::string FIX_timestamp (PTime const &t);
BTS_EXPORT void FIX_timestamp (PTime const &t,std::string *out);
BTS_EXPORT PTime parse_FIX_timestamp (const std::string &ts);
BTS_EXPORT bool is_from_today(PTime const &time);
BTS_EXPORT bool is_at_least_msecs_old (PTime const &time, uint64_t ms);
BTS_EXPORT bool is_at_least_secs_old (PTime const &time, uint64_t sec);
+1 -1
View File
@@ -1 +1 @@
set(sources ;grid/Node.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/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;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp)
set(sources ;event_grid/EventNode.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/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;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/service/OrderServiceServer.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp)
+27
View File
@@ -0,0 +1,27 @@
#pragma once
#include <memory>
namespace bts {
namespace event_grid {
template <typename... Events> struct Consumes
}
};
template <typename... Events> struct Produces {};
template <typename Implementer,
typename Consumes,
typename Produces>
class Component
{
template <class EN>
void set_node(EN &en) {
}
};
}}
@@ -0,0 +1,7 @@
#include "EventNode.h"
namespace bts {
namespace event_grid {
}}
@@ -7,7 +7,7 @@
#include <moodycamel/concurrentqueue.h>
namespace bts {
namespace grid {
namespace event_grid {
template <class E,size_t MaxObs=10>
class EventRecord
@@ -35,53 +35,40 @@ private:
std::array<Observer,MaxObs> _observers;
};
template <int N,typename HandlerArray,typename EventRecordTuple, typename Payload>
struct HandlerInit {
static void init(HandlerArray &handlers,EventRecordTuple &event_records)
{
using Event = typename std::tuple_element<N, EventRecordTuple>::type::Event;
handlers[N] = [&event_records] (Payload const&pl, bool fwd) {
std::get<N>(event_records).signal(*(Event*) (&pl[0]),fwd);
};
HandlerInit<N-1,HandlerArray,EventRecordTuple,Payload>::init(handlers,event_records);
}
};
template<typename HandlerArray,typename EventRecordTuple, typename Payload>
struct HandlerInit<-1,HandlerArray,EventRecordTuple,Payload>
{
static void init(HandlerArray &,EventRecordTuple &) {}
};
template <typename... Events>
class Node {
private:
class EventNode {
public:
constexpr static auto MaxMsgSize = meta::max(sizeof(Events)...);
constexpr static auto NumberEvents = sizeof...(Events);
using Payload = std::array<uint8_t,MaxMsgSize>;
using EventRecordTuple = std::tuple<EventRecord<Events>...> ;
using EventHandler = std::function<void(const Payload &, bool fwd)> ;
using HandlerArray = std::array<EventHandler,NumberEvents> ;
struct Msg {
uint8_t handler_idx;
uint8_t forwarded;
Payload payload;
};
using EventHandler = std::function<void(const Payload &)> ;
moodycamel::ConcurrentQueue<Msg> _queue;
std::array<EventHandler,NumberEvents> _handlers;
EventRecordTuple _events;
template <int N>
void init_handlers()
EventNode() : _queue(),
_handlers(),
_events()
{
using Event = typename std::tuple_element<N, EventRecordTuple>::type::Event;
_handlers[N] = [this] (Payload const&pl) {_events[N].signal(*(Event*) (&pl[0]));};
if (N < NumberEvents)
init_handlers<N+1> ();
}
template <class Event>
void send(Event const&ev,bool fwd)
{
Msg m;
m.handler_idx = meta::GetTypeIdxInTuple<Event,EventRecordTuple>::value;
m.forwarded = fwd;
new (&m.payload[0]) Event (ev);
_queue.enqueue(m);
}
public:
Node() : _queue(),
_handlers(),
_events()
{
init_handlers<0> ();
HandlerInit<NumberEvents-1,HandlerArray,EventRecordTuple,Payload>::init (_handlers,_events);
}
template <class Event>
@@ -91,7 +78,7 @@ public:
void observe(typename EventRecord<Event>::Observer const&o)
{
auto &ev_record =
std::get<meta::GetTypeIdxInTuple<Event,EventRecordTuple>::value> (_events);
std::get<meta::GetTypeIdxInTuple<EventRecord<Event>,EventRecordTuple>::value> (_events);
ev_record.observe(o);
}
@@ -99,25 +86,50 @@ public:
void observe(typename EventRecord<Event>::NoFwdObserver const&o)
{
auto &ev_record =
std::get<meta::GetTypeIdxInTuple<Event,EventRecordTuple>::value> (_events);
std::get<meta::GetTypeIdxInTuple<EventRecord<Event>,EventRecordTuple>::value> (_events);
ev_record.observe([o](auto const&ev,bool) {o(ev);});
}
void dispatch_events()
bool do_work()
{
Msg m;
if (_queue.try_dequeue(m))
_handlers[m.handler_idx](m.payload);
if (_queue.try_dequeue(m)) {
_handlers[m.handler_idx](m.payload,m.forwarded);
return true;
}
else
return false;
}
template <class Event, class N1, class N2>
friend void forward(N1 &from, N2& to);
private:
struct Msg {
uint8_t handler_idx;
uint8_t forwarded;
Payload payload;
};
template <class Event>
void send(Event const&ev,bool fwd)
{
Msg m;
m.handler_idx = meta::GetTypeIdxInTuple<EventRecord<Event>,EventRecordTuple>::value;
m.forwarded = fwd;
new (&m.payload[0]) Event (ev);
_queue.enqueue(m);
}
moodycamel::ConcurrentQueue<Msg> _queue;
std::array<EventHandler,NumberEvents> _handlers;
EventRecordTuple _events;
};
template <class Event, class N1, class N2>
void forward(N1 &from, N2& to)
{
from.observe([&to](Event const&ev, bool fwded) {
from.template observe<Event>([&to](Event const&ev, bool fwded) {
if (!fwded)
to.send(ev,true);
});
@@ -3,7 +3,7 @@
#include <memory>
namespace bts {
namespace grid {
namespace event_grid {
namespace event {
class Init {};
-20
View File
@@ -1,20 +0,0 @@
#pragma once
#include <memory>
#include "lib/api/services/OrderService.pb.h"
#include "lib/domain_model/common.h"
#include "server/sparkd/orderman/utils/orderman_utils.h"
namespace bts {
namespace grid {
namespace event {
class CancelNativeOrder
{
NativeOrder *order;
};
}}}
-7
View File
@@ -1,7 +0,0 @@
#include "Node.h"
namespace bts {
namespace grid {
}}
+3
View File
@@ -12,8 +12,11 @@
#include "server/sparkd/persistence/PersistenceServiceServer.h"
#include "server/sparkd/user/UserServiceServer.h"
#include "server/sparkd/md/run_md.h"
#include "server/sparkd/orderman/service/OrderServiceServer.h"
#include "lib/md/relay/QueryServer.h"
#include "server/sparkd/orderman/events/ExecutionReport.h"
namespace bts {
config::QuickbusNodeCfg make_cfg()
{
@@ -0,0 +1,28 @@
#pragma once
#include <memory>
namespace bts {
namespace orderman {
class FillDB;
namespace event { class ExecutionReport; class NativeFill;}
class FillRecorder
{
public:
FillRecorder(FillDB &store);
~FillRecorder();
// in
void on(event::ExecutionReport const&er);
// out
std::function<void(event::NativeFill const&)> native_fill_signal;
private:
struct PImpl;
std::unique_ptr<PImpl> me;
};
}}
@@ -18,9 +18,20 @@ namespace orderman {
using namespace jetfix;
Gateway::Gateway(config::JetFIX::Connection const&c, securities::SecurityDB &db, Observer &o)
: _gw(c),_obs(o),_sec_db(db),_name(c.name())
Gateway::Gateway(config::JetFIX::Connection const&c, securities::SecurityDB &db)
:
execution_report_signal([](auto) {}),
cancel_reject_signal([](auto) {}),
gateway_status_change_signal([](auto) {}),
gateway_begin_replay_signal([](auto) {}),
gateway_end_replay_signal([](auto) {}),
_gw(c),_sec_db(db),_name(c.name()),
_n_reports(0),
_exe_report_buffer()
{
_exe_report_buffer.reserve(1000);
get_exe_report_buffer() ; // prime alloc buffer
// On Execution Report
_gw.on<fix::ExecutionReportMsg>() = [this] (fix::ExecutionReportMsg const&msg) {
OrderKey ok;
@@ -38,7 +49,8 @@ Gateway::Gateway(config::JetFIX::Connection const&c, securities::SecurityDB &db,
std::string reject_msg;
if (msg.has<fix::Text>())
reject_msg = msg.get<fix::Text>();
auto rep = event::ExecutionReport {
auto storage = new (get_exe_report_buffer()) event::ExecutionReport::Data {
to<AccountName>(msg.get<fix::Account>()),
to<OperatorID>(msg.get<fix::TargetSubID>()),
ok, sec,
@@ -55,9 +67,11 @@ Gateway::Gateway(config::JetFIX::Connection const&c, securities::SecurityDB &db,
Quantity(msg.get<fix::LastShares>()),
securities::decode_exchange_price(*sec,Price(msg.get<fix::LastPx>())),
securities::decode_exchange_price(*sec,Price(msg.get<fix::AvgPx>())),
to<ExchangeFillID>(msg.get<fix::ExecID>()),
to<OrderTimeStamp>(msg.get<fix::TransactTimeStr>()),
reject_msg
};
_obs.on(rep);
execution_report_signal(event::ExecutionReport {storage});
}
};
@@ -72,16 +86,16 @@ Gateway::Gateway(config::JetFIX::Connection const&c, securities::SecurityDB &db,
reject_msg = msg.get<fix::Text>();
else if (msg.has<fix::CXlRejReason>())
reject_msg = fmt::format ("Order cancel was rejected with error code {}", msg.get<fix::CXlRejReason>());
_obs.on(event::CancelReject {ok, reject_msg});
cancel_reject_signal(event::CancelReject {ok, reject_msg});
};
// On Status Change
_gw.on_ready() = [this] () {_obs.on(event::GatewayStatusChange{_name,true});};
_gw.on_disconnect() = [this] () {_obs.on(event::GatewayStatusChange{_name,false});};
_gw.on_ready() = [this] () {gateway_status_change_signal(event::GatewayStatusChange{_name,true});};
_gw.on_disconnect() = [this] () {gateway_status_change_signal(event::GatewayStatusChange{_name,false});};
// On Replay
_gw.on_begin_replay() = [this] () {_obs.on(event::GatewayBeginReplay{_name});};
_gw.on_end_replay() = [this] () {_obs.on(event::GatewayEndReplay{_name});};
_gw.on_begin_replay() = [this] () {gateway_begin_replay_signal(event::GatewayBeginReplay{_name});};
_gw.on_end_replay() = [this] () {gateway_end_replay_signal(event::GatewayEndReplay{_name});};
// On Error msgs
_gw.on<fix::BusinessMessageRejectMsg>() = [this] (fix::BusinessMessageRejectMsg const&m) {
@@ -97,5 +111,16 @@ Gateway::Gateway(config::JetFIX::Connection const&c, securities::SecurityDB &db,
_gw.start();
}
event::ExecutionReport::Data * Gateway::get_exe_report_buffer()
{
auto block_size = std::tuple_size<ExeReportBlock> ();
auto max_storage = _exe_report_buffer.size() * block_size;
if (_n_reports == max_storage)
_exe_report_buffer.push_back(std::make_unique<ExeReportBlock>());
auto &result = (*_exe_report_buffer.back())[_n_reports % block_size];
_n_reports++;
return &result ;
}
}}
+18 -12
View File
@@ -4,7 +4,9 @@
#include "server/sparkd/jetfix/jetfix.h"
#include "server/sparkd/orderman/events/OutGatewayMsg.h"
#include "lib/config/protos/jetfix.pb.h"
#include "server/sparkd/orderman/service/OrderServiceServer.h"
#include "server/sparkd/orderman/utils/orderman_utils.h"
#include "server/sparkd/orderman/events/ExecutionReport.h"
#include <fmt/format.h>
@@ -13,7 +15,6 @@ namespace securities {class SecurityDB;}
namespace orderman {
namespace event {
class ExecutionReport;
class CancelReject;
class GatewayStatusChange;
class GatewayBeginReplay;
@@ -23,19 +24,20 @@ class GatewayEndReplay;
class Gateway
{
public:
class Observer {
public:
virtual void on(event::ExecutionReport const&) = 0;
virtual void on(event::CancelReject const&) = 0;
virtual void on(event::GatewayStatusChange const&) = 0;
virtual void on(event::GatewayBeginReplay const&) = 0;
virtual void on(event::GatewayEndReplay const&) = 0;
};
Gateway(config::JetFIX::Connection const&, securities::SecurityDB &, Observer &);
Gateway(config::JetFIX::Connection const&, securities::SecurityDB &);
void do_work() {_gw.dispatch_events();}
// in
void on(event::OutGatewayMsg const&m) {_gw.send(m.msg);}
void dispatch_events() {_gw.dispatch_events();}
// out
std::function<void(event::ExecutionReport const&)> execution_report_signal;
std::function<void(event::CancelReject const&)> cancel_reject_signal;
std::function<void(event::GatewayStatusChange const&)> gateway_status_change_signal;
std::function<void(event::GatewayBeginReplay const&)> gateway_begin_replay_signal;
std::function<void(event::GatewayEndReplay const&)> gateway_end_replay_signal;
private:
using FIXGw = jetfix::JetFIXGateway<jetfix::fix::ExecutionReportMsg,
@@ -43,9 +45,13 @@ private:
jetfix::fix::RejectMsg,
jetfix::fix::CancelRejectMsg>;
FIXGw _gw;
Observer &_obs;
securities::SecurityDB &_sec_db;
GatewayName _name;
using ExeReportBlock = std::array<event::ExecutionReport::Data,10000>;
using ExeReportBlockPtr = std::unique_ptr<ExeReportBlock> ;
size_t _n_reports;
std::vector<ExeReportBlockPtr> _exe_report_buffer;
event::ExecutionReport::Data* get_exe_report_buffer();
};
}}
@@ -12,10 +12,7 @@ namespace orderman {
class MDSource
{
public:
using OnBook = std::function<void(event::BookUpdate const&)>;
MDSource(OnBook const&cb) : _on_book(cb), _handles(),_md_consumer(),_keep_alive() {}
// in
void on(event::MDSubscription const&sub)
{
auto k = sub.for_security->id();
@@ -28,8 +25,13 @@ public:
_handles.push_back({utils::TimeStamp(),managed_handle.get()});
}
// out
std::function<void(event::BookUpdate const&)> book_update_signal;
void poll_md() {
MDSource() : book_update_signal([](auto){}), _handles(),_md_consumer(),_keep_alive() {}
void do_work() {
event::BookUpdate book;
for (auto &h : _handles)
if (h.handle->get_depth(h.last,
@@ -37,12 +39,11 @@ public:
&book.bid()[0],
&book.ask()[0]) == md2::HandleReadResult::SUCCESS) {
book.security_key = SecurityKey(h.handle->key());
_on_book(book);
book_update_signal(book);
}
}
private:
OnBook _on_book;
struct HandleRecord {
utils::TimeStamp last;
md2::MDConsumerHandle* handle;
@@ -35,10 +35,8 @@ enum class NativeOrderMan::State {REPLAY,DISCONNECTED,CONNECTED};
struct NativeOrderMan::PImpl
{
PImpl(securities::SecurityDB &sec_db,
config::JetFIX::Connection const&jf_cfg,
Observer &obs) :
obs(obs),
PImpl(config::JetFIX::Connection const&jf_cfg,
securities::SecurityDB &sec_db) :
state(State::REPLAY),
latest_timestamp(to<OrderTimeStamp> (datetime::FIX_timestamp(datetime::now()))),
order_map(),
@@ -48,7 +46,6 @@ struct NativeOrderMan::PImpl
{}
Observer &obs;
State state;
OrderTimeStamp latest_timestamp;
@@ -58,19 +55,23 @@ struct NativeOrderMan::PImpl
config::JetFIX::Connection jf_cfg;
};
NativeOrderMan::NativeOrderMan (securities::SecurityDB &sec_db,
std::vector<api::orderman::OrderState> const &existing_orders,
config::JetFIX::Connection const&gw_connection,
Observer &obs)
: me (new PImpl(sec_db,gw_connection,obs))
NativeOrderMan::NativeOrderMan (config::JetFIX::Connection const&gw_connection,
securities::SecurityDB &sec_db,
std::vector<api::orderman::OrderState> const &existing_orders)
: me (new PImpl(gw_connection,sec_db))
{
for (auto const &os : existing_orders)
if (os.has_native()) {
auto &native_state = os.native();
auto sk = SecurityKey(native_state.security_key());
auto sec = me->sec_db.resolve(sk);
if (sec)
me->order_map[OrderKey(os.order_key())] = std::make_unique<NativeOrder> (*sec,OrderKey(os.order_key()),native_state);
if (sec) {
const std::string *rej_msg = nullptr;
if (os.reject_msg().size())
rej_msg = &os.reject_msg();
me->order_map[OrderKey(os.order_key())] = std::make_unique<NativeOrder> (*sec,OrderKey(os.order_key()),
rej_msg,native_state);
}
else {
LOG(OrderMan,Error,
"Cannot resolve security key {} in stored order {}. This is a serious problem. "
@@ -81,8 +82,9 @@ NativeOrderMan::NativeOrderMan (securities::SecurityDB &sec_db,
pre_allocate_buffers();
}
NativeOrderMan::~NativeOrderMan() {}
void NativeOrderMan::on(grid::event::Init const&)
void NativeOrderMan::on(event_grid::event::Init const&)
{
LOG(OrderMan,Diag, "NativeOrderMan init");
@@ -90,7 +92,7 @@ void NativeOrderMan::on(grid::event::Init const&)
for (auto const &kvp : me->order_map) {
auto const &order = *kvp.second;
me->obs.on(event::NativeOrderStateChange {&order.header(),order._state});
native_order_state_change_signal(event::NativeOrderStateChange {&order.header(),order._state});
}
}
@@ -124,11 +126,11 @@ void NativeOrderMan::on(event::CreateNativeOrder const&create)
order.set_status (api::orderman::OS_UNACKNOWLEDGED);
auto buffer = get_fix_bufer();
order.encode_create(me->latest_timestamp,create.price,create.quantity,&buffer->fix[0]);
me->obs.on(event::OutGatewayMsg {buffer});
out_gateway_msg_signal(event::OutGatewayMsg {buffer});
break;
}
me->obs.on(event::NativeOrderStateChange {&order.header(),order.state()});
native_order_state_change_signal(event::NativeOrderStateChange {&order.header(),order.state()});
}
void NativeOrderMan::on(event::UpdateNativeOrder const&update)
@@ -139,7 +141,7 @@ void NativeOrderMan::on(event::UpdateNativeOrder const&update)
auto buffer = get_fix_bufer();
order.encode_update(me->latest_timestamp,update.price,update.quantity,&buffer->fix[0]);
me->obs.on(event::OutGatewayMsg {buffer});
out_gateway_msg_signal(event::OutGatewayMsg {buffer});
}
void NativeOrderMan::on(event::CancelNativeOrder const&cancel)
@@ -150,7 +152,7 @@ void NativeOrderMan::on(event::CancelNativeOrder const&cancel)
auto buffer = get_fix_bufer();
order.encode_cancel(me->latest_timestamp,&buffer->fix[0]);
me->obs.on(event::OutGatewayMsg {buffer});
out_gateway_msg_signal(event::OutGatewayMsg {buffer});
}
void NativeOrderMan::on(event::GatewayStatusChange const&status)
@@ -197,7 +199,7 @@ void NativeOrderMan::on(event::GatewayEndReplay const&)
void NativeOrderMan::on(event::ExecutionReport const&er)
{
auto k = er.order_key;
auto k = er.data->order_key;
LOG(OrderMan,Diag, "NativeOrderMan ExecutionReport for order {}",k.value());
@@ -212,25 +214,27 @@ void NativeOrderMan::on(event::ExecutionReport const&er)
"to the gateway's default values", k.value());
api::orderman::NativeOrderState recovered;
recovered.set_account_name(to_str(er.account_name));
recovered.set_operator_id(to_str(er.operator_id));
recovered.set_security_key(er.security->id());
recovered.set_side(er.side);
recovered.set_time_in_force(er.time_in_force);
recovered.set_order_type(er.order_type);
recovered.set_account_name(to_str(er.data->account_name));
recovered.set_operator_id(to_str(er.data->operator_id));
recovered.set_security_key(er.data->security->id());
recovered.set_side(er.data->side);
recovered.set_time_in_force(er.data->time_in_force);
recovered.set_order_type(er.data->order_type);
recovered.set_customer_or_firm(api::orderman::CustomerOrFirm(me->jf_cfg.customer_or_firm()));
recovered.set_cti_code (api::orderman::CTICode(me->jf_cfg.cti_code()[0]));
recovered.set_exchange_order_id(to_str(er.exchange_order_id));
recovered.set_manual_order_indicator(er.manual_order_indicator);
recovered.set_price(er.price.value());
recovered.set_order_quantity(er.order_quantity.value());
recovered.set_order_status(er.order_status);
recovered.set_avg_price(er.avg_price.value());
recovered.set_filled_quantity(er.filled_quantity.value());
recovered.set_reject_msg(er.reject_msg);
order_ptr = std::make_unique<NativeOrder>(*er.security,k,recovered);
recovered.set_exchange_order_id(to_str(er.data->exchange_order_id));
recovered.set_manual_order_indicator(er.data->manual_order_indicator);
recovered.set_last_price(er.data->last_price.value());
recovered.set_order_quantity(er.data->order_quantity.value());
recovered.set_order_status(er.data->order_status);
recovered.set_avg_price(er.data->avg_price.value());
recovered.set_filled_quantity(er.data->filled_quantity.value());
const std::string *reject_msg = nullptr;
if (er.data->reject_msg.size())
reject_msg = &(er.data->reject_msg);
order_ptr = std::make_unique<NativeOrder>(*er.data->security,k,reject_msg,recovered);
}
me->obs.on(event::NativeOrderStateChange {&order_ptr->header(),order_ptr->state()});
native_order_state_change_signal(event::NativeOrderStateChange {&order_ptr->header(),order_ptr->state()});
}
void NativeOrderMan::on(event::CancelReject const&cr)
@@ -242,7 +246,7 @@ void NativeOrderMan::on(event::CancelReject const&cr)
auto &order_ptr = me->order_map[k];
if (order_ptr) {
order_ptr->set_reject_msg(cr.reject_msg);
me->obs.on(event::NativeOrderStateChange {&order_ptr->header(),order_ptr->state()});
native_order_state_change_signal(event::NativeOrderStateChange {&order_ptr->header(),order_ptr->state()});
}
else
LOG(OrderMan,Error,
@@ -292,3 +296,4 @@ void NativeOrderMan::transition(State new_state)
}
}}
@@ -8,7 +8,7 @@
#include <vector>
namespace bts {
namespace grid {namespace event {class Init;}}
namespace event_grid {namespace event {class Init;}}
namespace securities {class SecurityDB;}
namespace api {namespace orderman {class OrderState;}}
@@ -31,31 +31,26 @@ class TimeChange ;
class NativeOrderMan
{
public:
class Observer {
public:
virtual void on(event::NativeOrderStateChange const&) = 0;
virtual void on(event::OutGatewayMsg const&) = 0;
};
NativeOrderMan (securities::SecurityDB &sec_db,
std::vector<api::orderman::OrderState> const &existing_orders,
config::JetFIX::Connection const&gw_connection,
Observer &obs);
void on(grid::event::Init const&);
// in
void on(event_grid::event::Init const&);
void on(event::CreateNativeOrder const&);
void on(event::UpdateNativeOrder const&);
void on(event::CancelNativeOrder const&);
void on(event::GatewayStatusChange const&);
void on(event::GatewayBeginReplay const&);
void on(event::GatewayEndReplay const&);
void on(event::ExecutionReport const&);
void on(event::CancelReject const&);
void on(event::TimeChange const&);
// out
std::function<void(event::NativeOrderStateChange const&)> native_order_state_change_signal;
std::function<void(event::OutGatewayMsg const&)> out_gateway_msg_signal;
NativeOrderMan (config::JetFIX::Connection const&gw_connection,
securities::SecurityDB &sec_db,
std::vector<api::orderman::OrderState> const &existing_orders);
~NativeOrderMan();
private:
enum class State;
struct PImpl;
@@ -0,0 +1,38 @@
#include "OrderRecorder.h"
#include "lib/api/services/OrderService.pb.h"
#include "lib/logging/logging.h"
#include "lib/utils/PBUtils.h"
#include "server/sparkd/orderman/persistence/OrderDB.h"
#include "server/sparkd/orderman/events/NativeOrderStateChange.h"
#include "server/sparkd/orderman/events/OrderStateChange.h"
namespace bts {
namespace orderman {
struct OrderRecorder::PImpl
{
PImpl(OrderDB &store) :
store(store)
{}
OrderDB &store;
};
OrderRecorder::OrderRecorder (OrderDB &store)
:
order_state_change_signal([](auto&) {}),
me (new PImpl(store))
{}
OrderRecorder::~OrderRecorder () {}
void OrderRecorder::on(event::NativeOrderStateChange const&ch)
{
auto pb = event::to_pb(*ch.header,ch.current_state);
me->store.store(pb);
LOG(OrderMan,Info,"Storing order: {} ",utils::pb::to_string(pb));
order_state_change_signal(event::OrderStateChange {pb});
}
}}
@@ -0,0 +1,29 @@
#pragma once
#include <memory>
namespace bts {
namespace orderman {
class OrderDB;
namespace event { class NativeOrderStateChange; class OrderStateChange; }
class OrderRecorder
{
public:
OrderRecorder(OrderDB &store);
~OrderRecorder();
// in
void on(event::NativeOrderStateChange const&);
// out
std::function<void(event::OrderStateChange const&)> order_state_change_signal;
private:
struct PImpl;
std::unique_ptr<PImpl> me;
};
}}
@@ -1,9 +1,9 @@
#pragma once
#include "server/sparkd/orderman/events/NewSecurities.h"
#include "server/sparkd/orderman/events/BookUpdate.h"
#include "lib/utils/TimeStamp.h"
#include "lib/md/MDConsumerHandle.h"
#include "server/sparkd/orderman/events/TimeChange.h"
#include "server/sparkd/orderman/utils/orderman_utils.h"
#include "lib/utils/bts_chrono.h"
namespace bts {
namespace orderman {
@@ -11,24 +11,25 @@ namespace orderman {
class TimeSource
{
public:
using OnTime = std::function<void(event::TimeChange const&)>;
MDSource(OnTime const&cb) : _on_time(cb),_last() {}
TimeSource() : time_update_signal([](auto){}),_last() {}
void check_time() {
// out
std::function<void(event::TimeChange const&)> time_update_signal;
void do_work() {
auto now = Timer::now();
if (ms_diff(now,_last) > 10) {
_last = now;
event::TimeChange change;
auto ts_str = datetime::FIX_timestamp(datetime::now());
bts_assert(ts_str.size() == std::tuple_size<OrderManTime>());
std::copy(ts_str.begin(),ts_str.end(),&change.ts_str[0]);
_on_time(change);
auto change = event::TimeChange {
Timer::now(),
to<OrderTimeStamp> (datetime::FIX_timestamp(datetime::now()))
};
time_update_signal(change);
}
}
private:
OnTime _on_time;
TimeStamp _last;
};
@@ -8,6 +8,8 @@
namespace bts {
namespace orderman {
class NativeOrder;
namespace event {
class CancelNativeOrder
@@ -0,0 +1,32 @@
#include "ExecutionReport.h"
#include "lib/utils/datetime.h"
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/posix_time/conversion.hpp>
#include <google/protobuf/timestamp.pb.h>
#include <fmt/format.h>
namespace bts {
namespace orderman {
namespace event {
api::orderman::NativeFill to_pb(ExecutionReport::Data const&r)
{
bts_assert(r.exec_type == api::orderman::ET_PARTIAL_FILL || r.exec_type == api::orderman::ET_FILL) ;
api::orderman::NativeFill result;
result.set_order_key(r.order_key.value());
result.set_security_key(r.security->id());
result.set_account(to_str(r.account_name));
result.set_last_price(r.last_price.value());
result.set_avg_price(r.avg_price.value());
result.set_fill_id(fmt::format("{}/{}",r.order_key.value(),to_str(r.exchange_fill_id)));
auto ts = datetime::parse_FIX_timestamp(to_str(r.transact_time));
google::protobuf::Timestamp gts;
gts.set_seconds(boost::posix_time::to_time_t(ts));
gts.set_nanos(0);
*result.mutable_timestamp() = gts;
return result;
}
}}}
@@ -1,11 +1,12 @@
#pragma once
#include <memory>
#include "lib/api/services/OrderService.pb.h"
#include "lib/domain_model/common.h"
#include "server/sparkd/orderman/utils/orderman_utils.h"
#include <memory>
namespace bts {
namespace orderman {
namespace event {
@@ -13,25 +14,32 @@ namespace event {
class ExecutionReport
{
public:
AccountName account_name;
OperatorID operator_id;
OrderKey order_key;
api::Security const*security;
api::BuySell side;
api::orderman::TimeInForce time_in_force;
api::orderman::OrderType order_type;
api::orderman::ExecType exec_type;
api::orderman::OrderStatus order_status;
api::orderman::ManualOrderIndicator manual_order_indicator;
ExchangeOrderID exchange_order_id;
Price price;
Quantity order_quantity;
Quantity filled_quantity;
Quantity last_shares;
Price last_price;
Price avg_price;
std::string reject_msg;
struct Data {
AccountName account_name;
OperatorID operator_id;
OrderKey order_key;
api::Security const*security;
api::BuySell side;
api::orderman::TimeInForce time_in_force;
api::orderman::OrderType order_type;
api::orderman::ExecType exec_type;
api::orderman::OrderStatus order_status;
api::orderman::ManualOrderIndicator manual_order_indicator;
ExchangeOrderID exchange_order_id;
Price price;
Quantity order_quantity;
Quantity filled_quantity;
Quantity last_shares;
Price last_price;
Price avg_price;
ExchangeFillID exchange_fill_id;
OrderTimeStamp transact_time;
std::string reject_msg;
};
Data const *data;
};
api::orderman::NativeFill to_pb(ExecutionReport::Data const&r);
}}}
@@ -0,0 +1,16 @@
#pragma once
#include <memory>
#include "lib/api/services/OrderService.pb.h"
namespace bts {
namespace orderman {
namespace event {
class NativeFill
{
public:
api::orderman::NativeFill fill;
};
}}}
@@ -0,0 +1,56 @@
#include "NativeOrderStateChange.h"
#include "lib/api/services/OrderService.pb.h"
#include "server/sparkd/orderman/native_orders/NativeOrderHeader.h"
#include "server/sparkd/orderman/native_orders/NativeOrderState.h"
#include "server/sparkd/orderman/utils/orderman_utils.h"
#include <sys/time.h>
namespace bts {
namespace orderman {
namespace event {
api::orderman::OrderState to_pb(NativeOrderHeader const&header,NativeOrderState const &current_state)
{
api::orderman::OrderState result;
result.set_order_key(header.order_key.value());
auto &ts = *result.mutable_timestamp();
struct timeval tv;
gettimeofday(&tv, NULL);
ts.set_seconds(tv.tv_sec);
ts.set_nanos(tv.tv_usec * 1000);
auto &native = *result.mutable_native();
native.set_account_name(to_str(header.account_name));
native.set_operator_id(to_str(header.operator_id));
native.set_security_key(header.security->id());
native.set_side(header.side);
native.set_time_in_force(header.time_in_force);
native.set_order_type(header.order_type);
native.set_customer_or_firm(header.customer_or_firm);
native.set_cti_code(header.cti_code);
if (current_state.exchange_order_id) {
auto trim_oid = to_trim_str(current_state.exchange_order_id->value());
std::string trim(trim_oid.first,trim_oid.second);
native.set_exchange_order_id(trim);
}
if (current_state.reject_msg)
result.set_reject_msg(std::string(current_state.reject_msg));
native.set_manual_order_indicator(header.manual_order_indicator);
native.set_last_price(current_state.last_price.value());
native.set_avg_price(current_state.avg_price.value());
native.set_order_quantity(current_state.order_quantity.value());
native.set_filled_quantity(current_state.filled_quantity.value());
native.set_order_status(current_state.order_status);
return result;
}
}}}
@@ -4,6 +4,7 @@
#include "server/sparkd/orderman/native_orders/NativeOrderState.h"
namespace bts {
namespace api { namespace orderman {class OrderState;}}
namespace orderman {
class NativeOrderHeader;
namespace event {
@@ -15,4 +16,6 @@ public:
NativeOrderState current_state;
};
api::orderman::OrderState to_pb(NativeOrderHeader const&header,NativeOrderState const &current_state);
}}}
@@ -0,0 +1,16 @@
#pragma once
#include <memory>
#include "lib/api/services/OrderService.pb.h"
namespace bts {
namespace orderman {
namespace event {
class OrderStateChange
{
public:
api::orderman::OrderState state;
};
}}}
@@ -20,7 +20,7 @@ void NativeOrder::init_update_fix()
_fix_data.update_transact_time_bm =
encoding.add<fix::TransactTimeStr> (datetime::FIX_timestamp(datetime::now()));
encoding.add<fix::Account> (to_str(_header.account));
encoding.add<fix::Account> (to_str(_header.account_name));
encoding.add<fix::SenderSubID> (to_str(_header.operator_id));
encoding.add<fix::Side> (_header.side);
encoding.add<fix::TimeInForce> (_header.time_in_force);
@@ -53,7 +53,7 @@ void NativeOrder::init_create_fix()
_fix_data.create_transact_time_bm =
encoding.add<fix::TransactTimeStr> (datetime::FIX_timestamp(datetime::now()));
encoding.add<fix::Account> (to_str(_header.account));
encoding.add<fix::Account> (to_str(_header.account_name));
encoding.add<fix::SenderSubID> (to_str(_header.operator_id));
encoding.add<fix::Side> (_header.side);
encoding.add<fix::TimeInForce> (_header.time_in_force);
@@ -76,7 +76,7 @@ void NativeOrder::init_cancel_fix()
_fix_data.cancel_transact_time_bm =
encoding.add<fix::TransactTimeStr> (datetime::FIX_timestamp(datetime::now()));
encoding.add<fix::Account> (to_str(_header.account));
encoding.add<fix::Account> (to_str(_header.account_name));
encoding.add<fix::SenderSubID> (to_str(_header.operator_id));
encoding.add<fix::Side> (_header.side);
encoding.add<fix::TimeInForce> (_header.time_in_force);
@@ -25,6 +25,7 @@ class NativeOrder
public:
NativeOrder(api::Security const&sec,
OrderKey k,
std::string const *reject_msg,
api::orderman::NativeOrderState const&pb) :
_fix_data(),
_state(),
@@ -32,7 +33,6 @@ public:
_exchange_order_id(),
_keep_alive_rej()
{
_exchange_order_id = to<ExchangeOrderID> (pb.exchange_order_id());
_header = NativeOrderHeader {
k,
@@ -48,8 +48,8 @@ public:
};
_state = NativeOrderState {
Price(pb.price()),
Price(pb.last_price()),
Price(pb.avg_price()),
Quantity(pb.order_quantity()),
Quantity(pb.filled_quantity()),
pb.order_status(),
@@ -57,8 +57,13 @@ public:
nullptr
};
if (pb.reject_msg().size())
set_reject_msg(pb.reject_msg());
if (reject_msg)
set_reject_msg(*reject_msg);
if (pb.exchange_order_id().size())
update_exchange_order_id(to<ExchangeOrderID>(pb.exchange_order_id()));
else
_state.exchange_order_id = nullptr;
init_fix();
}
@@ -90,9 +95,9 @@ public:
bool on(event::ExecutionReport const&er)
{
if (_state.exchange_order_id == nullptr)
update_exchange_order_id(er.exchange_order_id);
update_exchange_order_id(er.data->exchange_order_id);
switch (er.exec_type) {
switch (er.data->exec_type) {
case api::orderman::ET_PENDING_NEW:
case api::orderman::ET_PENDING_REPLACE:
case api::orderman::ET_PENDING_CANCEL:
@@ -100,13 +105,13 @@ public:
// no ops
return false;
default: {
_state.last_price = er.last_price;
_state.avg_price = er.avg_price;
_state.order_quantity = er.order_quantity;
_state.filled_quantity = er.filled_quantity;
_state.order_status = er.order_status;
if (er.reject_msg.size())
set_reject_msg(er.reject_msg);
_state.last_price = er.data->last_price;
_state.avg_price = er.data->avg_price;
_state.order_quantity = er.data->order_quantity;
_state.filled_quantity = er.data->filled_quantity;
_state.order_status = er.data->order_status;
if (er.data->reject_msg.size())
set_reject_msg(er.data->reject_msg);
else
_state.reject_msg = nullptr;
return true;
@@ -14,7 +14,7 @@ class NativeOrderHeader
public:
OrderKey order_key;
const api::Security *security;
AccountName account;
AccountName account_name;
OperatorID operator_id;
api::BuySell side;
api::orderman::TimeInForce time_in_force;
@@ -0,0 +1,55 @@
#include "FillDB.h"
#include "server/sparkd/persistence/SqliteStore.h"
#include "lib/api/services/OrderService.pb.h"
#include "lib/logging/logging.h"
#include "lib/utils/PBUtils.h"
namespace bts {
namespace orderman {
auto const fills_ns = "fills";
using NativeFill = api::orderman::NativeFill;
struct FillDB::PImpl
{
PImpl() :
store(new persistence::SqliteStore("fills"))
{}
std::unique_ptr<persistence::IStore> store;
};
FillDB::FillDB () : me (new PImpl()) {}
FillDB::~FillDB () {}
void FillDB::store(NativeFill const&f)
{
auto k = f.fill_id();
auto v = utils::pb::to_string(f);
auto is_there = me->store->retrieve_one(fills_ns,k);
if (is_there.first)
me->store->update(fills_ns,k,v);
else
me->store->insert(fills_ns,k,v);
}
std::vector<api::orderman::NativeFill> FillDB::retrieve_all()
{
auto all = me->store->retrieve_all()[fills_ns];
std::vector<NativeFill> result;
NativeFill nf;
for (auto const &kvp : all)
if (utils::pb::from_string<NativeFill> (kvp.second,&nf))
result.emplace_back(nf);
else
LOG(Persistence,Error,
"Could not recover fill {} from storage. "
"This should be investigated", kvp.first);
return result;
}
}}
@@ -0,0 +1,22 @@
#pragma once
#include <memory>
#include <vector>
namespace bts {
namespace api {namespace orderman {class NativeFill;}}
namespace orderman {
class FillDB
{
public:
FillDB();
void store(api::orderman::NativeFill const&f);
std::vector<api::orderman::NativeFill> retrieve_all();
~FillDB();
private:
struct PImpl;
std::unique_ptr<PImpl> me;
};
}}
@@ -0,0 +1,55 @@
#include "OrderDB.h"
#include "server/sparkd/persistence/SqliteStore.h"
#include "lib/api/services/OrderService.pb.h"
#include "lib/logging/logging.h"
#include "lib/utils/PBUtils.h"
namespace bts {
namespace orderman {
auto const orders_ns = "orders";
using OrderState = api::orderman::OrderState;
struct OrderDB::PImpl
{
PImpl() :
store(new persistence::SqliteStore("orders"))
{}
std::unique_ptr<persistence::IStore> store;
};
OrderDB::OrderDB () : me (new PImpl()) {}
OrderDB::~OrderDB () {}
void OrderDB::store(OrderState const&os)
{
auto k = std::to_string(os.order_key());
auto v = utils::pb::to_string(os);
auto is_there = me->store->retrieve_one(orders_ns,k);
if (is_there.first)
me->store->update(orders_ns,k,v);
else
me->store->insert(orders_ns,k,v);
}
std::vector<api::orderman::OrderState> OrderDB::retrieve_all()
{
auto all = me->store->retrieve_all()[orders_ns];
std::vector<OrderState> result;
OrderState os;
for (auto const &kvp : all)
if (utils::pb::from_string<OrderState> (kvp.second,&os))
result.emplace_back(os);
else
LOG(Persistence,Error,
"Could not recover order {} from storage. "
"This should be investigated", kvp.first);
return result;
}
}}
@@ -0,0 +1,22 @@
#pragma once
#include <memory>
#include <vector>
namespace bts {
namespace api {namespace orderman {class OrderState;}}
namespace orderman {
class OrderDB
{
public:
OrderDB();
~OrderDB();
void store(api::orderman::OrderState const&os);
std::vector<api::orderman::OrderState> retrieve_all();
private:
struct PImpl;
std::unique_ptr<PImpl> me;
};
}}
@@ -0,0 +1,220 @@
#include "OrderServiceServer.h"
#include "server/sparkd/event_grid/EventNode.h"
#include "server/sparkd/orderman/components/Gateway.h"
#include "server/sparkd/orderman/components/NativeOrderMan.h"
#include "server/sparkd/orderman/components/MDSource.h"
#include "server/sparkd/orderman/components/TimeSource.h"
#include "server/sparkd/orderman/components/FillRecorder.h"
#include "server/sparkd/orderman/components/OrderRecorder.h"
#include "server/sparkd/securities/SecurityDB.h"
#include "server/sparkd/orderman/persistence/OrderDB.h"
#include "server/sparkd/orderman/persistence/FillDB.h"
#include "server/sparkd/orderman/components/FillRecorder.h"
#include "server/sparkd/orderman/components/OrderRecorder.h"
#include "../events/BookUpdate.h"
#include "../events/CancelNativeOrder.h"
#include "../events/CancelReject.h"
#include "../events/CreateNativeOrder.h"
#include "../events/ExecutionReport.h"
#include "../events/GatewayBeginReplay.h"
#include "../events/GatewayEndReplay.h"
#include "../events/GatewayStatusChange.h"
#include "../events/MDSubscription.h"
#include "../events/NativeOrderStateChange.h"
#include "../events/OutGatewayMsg.h"
#include "../events/TimeChange.h"
#include "../events/UpdateNativeOrder.h"
#include "server/sparkd/event_grid/events/Init.h"
namespace bts {
namespace orderman {
config::JetFIX::Connection get_connection()
{
auto &all_connections = config::get<config::JetFIX>().connection();
auto selected_connection = config::get<config::SparkConnection>().connection_name();
for (auto const&c : all_connections)
if (c.name() == selected_connection)
return c;
bts_assert(false);
return config::JetFIX::Connection();
}
using FastNode = event_grid::EventNode<event::BookUpdate,
event::CancelNativeOrder,
event::CancelReject,
event::CreateNativeOrder,
event::ExecutionReport,
event::GatewayBeginReplay,
event::GatewayEndReplay,
event::GatewayStatusChange,
event::MDSubscription,
event::NativeOrderStateChange,
event::OutGatewayMsg,
event::TimeChange ,
event::UpdateNativeOrder,
event_grid::event::Init> ;
size_t fast_sz()
{
return FastNode::MaxMsgSize;
}
using SlowNode = event_grid::EventNode<event::ExecutionReport,
event::GatewayStatusChange,
event::NativeOrderStateChange,
event::TimeChange>;
struct FastExecutor {
securities::SecurityDB &sec_db;
FastNode node;
Gateway gw;
MDSource md;
NativeOrderMan order_man;
std::atomic<bool> done;
std::thread worker;
FastExecutor(config::JetFIX::Connection const& cfg,
securities::SecurityDB &db,
std::vector<api::orderman::OrderState> const &orders)
: sec_db(db),
node(),
gw (cfg,db),
md(),
order_man(cfg,sec_db,orders),
done(false),
worker()
{
// wiring up gw
// in
node.observe<event::OutGatewayMsg> ([this] (const auto &ev) { gw.on(ev);});
// out
gw.execution_report_signal = [this] (auto const &ev) {node.send(ev);};
gw.cancel_reject_signal = [this] (auto const &ev) {node.send(ev);};
gw.gateway_status_change_signal = [this] (auto const &ev) {node.send(ev);};
gw.gateway_begin_replay_signal = [this] (auto const &ev) {node.send(ev);};
gw.gateway_end_replay_signal = [this] (auto const &ev) {node.send(ev);};
// wiring up md
// in
node.observe<event::MDSubscription> ([this] (const auto &ev) {md.on(ev);});
// out
md.book_update_signal = [this] (auto const&ev) {node.send(ev);};
// wiring up order_man
// in
node.observe<event_grid::event::Init> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::CreateNativeOrder> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::UpdateNativeOrder> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::CancelNativeOrder> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::GatewayStatusChange> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::GatewayBeginReplay> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::GatewayEndReplay> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::ExecutionReport> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::CancelReject> ([this] (const auto &ev) {order_man.on(ev);});
node.observe<event::TimeChange> ([this] (const auto &ev) {order_man.on(ev);});
// out
order_man.out_gateway_msg_signal = [this] (auto const &ev) {node.send(ev);};
order_man.native_order_state_change_signal = [this] (auto const &ev) {node.send(ev);};
}
~FastExecutor()
{
done = true;
worker.join();
}
void run () {
worker = std::thread ([this] () {
while (!done) {
md.do_work();
gw.do_work();
node.do_work();
}
});
}
};
struct SlowExecutor {
securities::SecurityDB &sec_db;
OrderDB &order_db;
FillDB &fill_db;
SlowNode node;
TimeSource time_source;
FillRecorder fill_recorder;
OrderRecorder order_recorder;
std::atomic<bool> done;
std::thread worker;
SlowExecutor(securities::SecurityDB &db,OrderDB &order_db,FillDB &fill_db)
: sec_db(db),
order_db(order_db),
fill_db(fill_db),
node(),
time_source(),
fill_recorder(fill_db),
order_recorder(order_db),
done(false),
worker()
{
// time source
time_source.time_update_signal = [this] (const auto &ev) { node.send(ev);};
// fill storage
node.observe<event::ExecutionReport> ([this] (const auto &ev) {fill_recorder.on(ev);});
// order storage
node.observe<event::NativeOrderStateChange> ([this] (const auto &ev) {order_recorder.on(ev);});
}
~SlowExecutor()
{
done = true;
worker.join();
}
void run () {
worker = std::thread ([this] () {
while (!done) {
sec_db.do_work();
time_source.do_work();
if (!node.do_work())
std::this_thread::sleep_for(10ms);
}
});
}
};
struct OrderServiceServer::PImpl
{
PImpl() :
sec_db(),
order_db(),
fill_db(),
fast(get_connection(),sec_db, {}),
slow(sec_db,order_db,fill_db)
{
event_grid::forward<event::TimeChange> (slow.node,fast.node);
}
securities::SecurityDB sec_db;
OrderDB order_db;
FillDB fill_db;
FastExecutor fast;
SlowExecutor slow;
};
}}
@@ -0,0 +1,33 @@
#pragma once
#include <memory>
#include "lib/api/services/OrderService.server.pb.h"
namespace bts {
namespace orderman {
class OrderServiceServer : public api::orderman::OrderServiceBase
{
public:
OrderServiceServer (bts::api::ServiceContext& context);
~OrderServiceServer();
void create_order(const api::orderman::CreateOrderRequest& ,
std::function<void(const ::bts::api::orderman::CreateOrderResponse&)> ) override;
void cancel_order(const api::orderman::CancelOrderRequest& ,
std::function<void(const ::bts::api::orderman::CancelOrderResponse&)> ) override;
void update_order(const api::orderman::UpdateOrderRequest& ,
std::function<void(const ::bts::api::orderman::UpdateOrderResponse&)> ) override;
private:
struct PImpl;
std::unique_ptr<PImpl> me;
};
size_t fast_sz();
}}
@@ -20,6 +20,7 @@ using ExchangeOrderID = utils::ValueWrapper<struct ExchangeOrderIDTag,std::array
using OrderTimeStamp = utils::ValueWrapper<struct OrderTimeStampTag,std::array<char, sizeof("20121204-14:44:02.000")-1>> ;
using SecurityPtr = const api::Security *;
using AccountName = utils::ValueWrapper<struct AccountNameTag,std::array<char,12>>;
using ExchangeFillID = utils::ValueWrapper<struct ExchangeFillIDTag,std::array<char,40>>;
template <size_t N> void to_array(std::string const&str,std::array<char,N>*out )
{
+14 -3
View File
@@ -7,6 +7,7 @@
#include "lib/logging/logging.h"
#include "server/sparkd/orderman/utils/orderman_utils.h"
#include "server/sparkd/persistence/SqliteStore.h"
#include "lib/utils/bts_chrono.h"
#include <unordered_set>
#include <unordered_map>
@@ -22,7 +23,8 @@ struct SecurityDB::PImpl
PImpl() :
store(new persistence::SqliteStore("securities")),
md_consumer(),
known_securities()
known_securities(),
last_scan()
{}
std::unique_ptr<persistence::IStore> store;
@@ -35,6 +37,7 @@ struct SecurityDB::PImpl
// protected by lock. used internally and externally
std::mutex lock;
std::unordered_map<SecurityKey::Value,std::unique_ptr<api::Security>> known_securities;
TimeStamp last_scan;
};
SecurityDB::SecurityDB () : me (new PImpl())
@@ -60,6 +63,8 @@ SecurityDB::SecurityDB () : me (new PImpl())
}
SecurityDB::~SecurityDB() {}
void SecurityDB::store_if_new(api::Security const&sec)
{
if (me->known_security_keys.count(sec.id()) == 0) {
@@ -93,8 +98,14 @@ api::Security const *SecurityDB::resolve(SecurityKey const&k)
return nullptr;
}
void SecurityDB::scan_for_new_securities()
{me->md_consumer.scan_securities ();}
void SecurityDB::do_work()
{
auto now = Timer::now();
if (sec_diff(now,me->last_scan) > 5) {
me->last_scan = now;
me->md_consumer.scan_securities ();
}
}
}}
+2 -1
View File
@@ -11,8 +11,9 @@ class SecurityDB
{
public:
SecurityDB();
~SecurityDB();
api::Security const *resolve(SecurityKey const&k);
void scan_for_new_securities();
void do_work();
private:
void store_if_new(api::Security const&sec);
struct PImpl;