SPARK-1514, Server side SDK code complete.

This commit is contained in:
Pedro Pinto committed 2018-09-12 18:43:17 +00:00
1 parent 2885d929a8
commit e29ea5d89b
39 files changed
+936 -234

No files matched your search

+2
View File
@@ -54,6 +54,8 @@ else ()
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/web ${CMAKE_BINARY_DIR}/server
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/
COMMENT "Creating server runtime layout"
DEPENDS sparkd data_files_dir)
@@ -20,23 +20,23 @@ namespace mbts.spark
public static void add_dynamic_order_defs(List<CustomOrderDefinitionImmutable> defs,
Func<CustomOrderDefinition.CustomOneofCase, CustomOrderDefinition> factory)
{
var dyntypes = _list.Value;
foreach (var d in dyntypes.dynamic_orders)
{
var dorder = factory(CustomOrderDefinition.CustomOneofCase.Dynamic);
dorder.Dynamic.DynamicOrderType = d.type_name;
foreach (var p in d.parameter_keys)
dorder.Dynamic.Parameters.Add(p, string.Empty);
defs.Add(new CustomOrderDefinitionImmutable(dorder));
}
// var dyntypes = _list.Value;
// foreach (var d in dyntypes.dynamic_orders)
// {
// var dorder = factory(CustomOrderDefinition.CustomOneofCase.Dynamic);
// dorder.Dynamic.DynamicOrderType = d.type_name;
// foreach (var p in d.parameter_keys)
// dorder.Dynamic.Parameters.Add(p, string.Empty);
// defs.Add(new CustomOrderDefinitionImmutable(dorder));
// }
}
internal static List<NameValueVM> get_parameters(string dyntype)
{
List<NameValueVM> par = new List<NameValueVM>();
var order = _list.Value.dynamic_orders.FirstOrDefault(x => x.type_name == dyntype);
if (order != null)
par.AddRange(order.parameter_keys.Select(x => new NameValueVM() { name = x, value = string.Empty }));
// var order = _list.Value.dynamic_orders.FirstOrDefault(x => x.type_name == dyntype);
// if (order != null)
// par.AddRange(order.parameter_keys.Select(x => new NameValueVM() { name = x, value = string.Empty }));
return par;
}
}
@@ -115,17 +115,17 @@ namespace mbts.spark
public override void assign_to(CustomOrderDefinition value)
{
if (_child_order == null)
_select_child_order(model.factory.default_order_type(_security.Value, true));
_validate();
if (!HasErrors)
{
var i = factory.dynamic_order();
i.DynamicOrderType = _dyn_type;
set_parameter_dictionary(i.Parameters);
child_order.assign_to(i.Child);
value.Dynamic = i;
}
// if (_child_order == null)
// _select_child_order(model.factory.default_order_type(_security.Value, true));
// _validate();
// if (!HasErrors)
// {
// var i = factory.dynamic_order();
// i.DynamicOrderType = _dyn_type;
// set_parameter_dictionary(i.Parameters);
// child_order.assign_to(i.Child);
// value.Dynamic = i;
// }
}
void set_parameter_dictionary(Google.Protobuf.Collections.MapField<string, string> par)
@@ -208,4 +208,4 @@ namespace mbts.spark
}
}
}
}
}
@@ -235,7 +235,7 @@ namespace mbts.spark.utilities {
public DynamicOrderDefinition dynamic_order() => new DynamicOrderDefinition
{
Child = custom_order(),
//Child = custom_order(),
};
+2 -1
View File
@@ -31,7 +31,8 @@ namespace bts {
Mercury,
Testing,
Latency,
DataFlow
DataFlow,
Plugin
// Please keep this list in sync with logging.h/logging.cpp
}
readonly struct Logger {
+1 -1
View File
@@ -1 +1 @@
set(sources api/apicore.proto;api/apigateway.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/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.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/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/dynamic_orders.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.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;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.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/sample_fix.cpp;jetfix/tests/store_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/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/Actor.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/IPollableActor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/OrLine truncated
set(sources api/apicore.proto;api/apigateway.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/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.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/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/dynamic_orders.proto;config/protos/environment.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.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;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.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/sample_fix.cpp;jetfix/tests/store_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/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/Actor.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/IPollableActor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;ordermanLine truncated
+79 -3
View File
@@ -6,6 +6,7 @@ import "lib/api/apioptions.proto";
import "lib/domain_model/Security.proto";
import "google/protobuf/timestamp.proto";
import "lib/sparkproto/SparkProtos.proto";
import "lib/api/apicore.proto";
service OrderService {
option (bts.api.service_description)="Implements order management";
@@ -15,9 +16,12 @@ service OrderService {
rpc cancel_order(Cancel) returns (Response);
rpc update_order(Update) returns (Response);
rpc crack_order(Crack) returns (Response);
rpc get_registered_dynamic_order_types(bts.api.VoidMessage) returns (RegisteredDynamicOrderTypes);
// streams
rpc orders (OrdersSub) returns (stream OrderRecord);
rpc fills (FillsSub) returns (stream Fill);
}
@@ -139,8 +143,7 @@ message CoverOrderDefinition {
}
message DynamicOrderDefinition {
string dynamic_order_type = 1;
map<string,string> parameters = 2;
CustomOrderDefinition child = 3;
map<string, DynamicOrderParam> order_params = 2;
}
// End custom order definitions
@@ -259,7 +262,7 @@ message TopOrderState {}
message TriggerOrderState {}
message CoverOrderState {}
message DynamicOrderState {
map<string,string> state = 2;
map<string,string> state = 1;
}
enum OrderStatus {
@@ -465,3 +468,76 @@ message TriggerExitCondition{
uint32 timeout_seconds=20; //seconds
bool conditional_cancel=30;
}
// Dynamic Orders
enum DynamicOrderPrimitiveDescriptor {
DYNAMIC_ORDER_PRIMITIVE_INT = 0;
DYNAMIC_ORDER_PRIMITIVE_UINT = 1;
DYNAMIC_ORDER_PRIMITIVE_DOUBLE = 2;
DYNAMIC_ORDER_PRIMITIVE_STRING = 3;
DYNAMIC_ORDER_PRIMITIVE_BOOL = 4;
DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF = 5;
}
message DynamicOrderTypeDescriptor {
oneof descriptor {
DynamicOrderPrimitiveDescriptor primitive = 2;
DynamicOrderArrayDescriptor array = 3;
DynamicOrderStructDescriptor structure = 4;
DynamicOrderEnumeratedDescriptor enumerated = 5;
}
}
message DynamicOrderArrayDescriptor {
DynamicOrderTypeDescriptor element_type = 1;
}
message DynamicOrderParamDescriptor {
string param_name = 1;
DynamicOrderTypeDescriptor param_type = 2;
}
message DynamicOrderStructDescriptor {
repeated DynamicOrderParamDescriptor field = 1;
}
message DynamicOrderEnumeratedDescriptor {
repeated string element = 1;
}
message DynamicOrderDescriptor {
string dynamic_order_type = 1;
repeated DynamicOrderParamDescriptor param_desc = 3;
}
message RegisteredDynamicOrderTypes {
repeated DynamicOrderDescriptor dynamic_order_desc = 1;
}
message DynamicOrderParam {
oneof value {
uint32 as_int32 = 1;
uint32 as_uint32 = 2;
double as_double = 3;
string as_string = 4;
bool as_bool = 5;
CustomOrderDefinition as_order_def = 6;
DynamicOrderArray as_array = 7;
DynamicOrderStruct as_struct = 8;
DynamicOrderEnumerated as_enumerated = 9;
}
}
message DynamicOrderArray {
repeated DynamicOrderParam element = 1;
}
message DynamicOrderStruct {
map<string,DynamicOrderParam> field = 1;
}
message DynamicOrderEnumerated {
string enum_value = 1;
}
+1
View File
@@ -116,6 +116,7 @@ void configure_logging(bts::config::Logging const&cfg)
{log::Testing,"Testing"},
{log::Latency,"Latency"},
{log::DataFlow,"DataFlow"},
{log::Plugin,"Plugin"},
};
real_cfg.sinks["console"] =
+1
View File
@@ -42,6 +42,7 @@ constexpr log::Subsystem Mercury {ExSim.ordinal+1 };
constexpr log::Subsystem Testing {Mercury.ordinal+1 };
constexpr log::Subsystem Latency {Testing.ordinal+1 };
constexpr log::Subsystem DataFlow {Latency.ordinal+1 };
constexpr log::Subsystem Plugin {DataFlow.ordinal+1 };
struct LoggerHandle {
LoggerHandle(LoggerHandle const&) = delete;
+3 -3
View File
@@ -17,12 +17,12 @@ namespace orderman {
struct AsyncFactory::PImpl
{
PImpl() :
PImpl(DynamicOrderRegistry const&b) :
orders_stream(),
fix_buffer_stream(),
db(),
order_router(),
order_factory(db,order_router)
order_factory(db,order_router,b)
{}
mercury::Stream<CreateOrderReplyEvent> orders_stream;
@@ -32,7 +32,7 @@ struct AsyncFactory::PImpl
OrderFactory order_factory;
};
AsyncFactory::AsyncFactory() : me(new PImpl()) {}
AsyncFactory::AsyncFactory(DynamicOrderRegistry const&b) : me(new PImpl(b)) {}
AsyncFactory::~AsyncFactory () {}
void AsyncFactory::init()
+2 -1
View File
@@ -7,12 +7,13 @@
namespace bts {
namespace orderman {
class DynamicOrderRegistry;
// used to asynchronously build fix buffers and orders
class AsyncFactory : public mercury::Actor
{
public:
AsyncFactory();
AsyncFactory(DynamicOrderRegistry const&);
~AsyncFactory();
void init() override;
+21 -22
View File
@@ -1,10 +1,10 @@
#include "ServiceBridge.h"
#include "lib/api/public/ServiceContext.h"
#include "lib/utils/PBUtils.h"
#include "lib/orderman/events/ActivateOrderEvent.h"
#include "lib/orderman/events/CancelOrderEvent.h"
#include "lib/orderman/events/CrackOrderEvent.h"
#include "lib/orderman/events/NewAdminDataEvent.h"
#include "lib/orderman/events/NewSecuritiesEvent.h"
#include "lib/orderman/events/OrderManagerReadyEvent.h"
#include "lib/orderman/events/StoredFillEvent.h"
@@ -13,7 +13,7 @@
#include "lib/orderman/order_factory/OrderFactory.h"
#include "lib/orderman/order_router/OrderRouter.h"
#include "lib/orderman/securities/MapSecurityDB.h"
#include "lib/orderman/events/NewAdminDataEvent.h"
#include "lib/utils/PBUtils.h"
#include "lib/api/services/OrderService.pb.h"
#include "lib/orderman/orderman_utils/orderman_common.h"
@@ -24,12 +24,13 @@ namespace orderman {
struct ServiceBridge::PImpl {
PImpl(OnReady const &on_ready, OnOrders const &on_orders,
OnFills const &on_fills)
OnFills const &on_fills,
DynamicOrderRegistry const &dyn_order_registry)
: on_ready(on_ready), on_orders(on_orders), on_fills(on_fills),
have_orders(false), have_securities(false), order_manager_ready(false),
sec_db(), order_router(), order_factory(sec_db, order_router),
known_orders() {
}
sec_db(), order_router(),
order_factory(sec_db, order_router, dyn_order_registry),
known_orders() {}
OnReady on_ready;
OnOrders on_orders;
@@ -47,20 +48,18 @@ struct ServiceBridge::PImpl {
mercury::Stream<NewAdminDataEvent> new_admin_data_pub;
std::unordered_set<OrderKey> known_orders;
std::vector<std::shared_ptr<const api::admin::AdminData>> admin_data_updates;
std::promise<void> ready;
};
ServiceBridge::ServiceBridge(OnReady const &on_ready, OnOrders const &on_orders,
OnFills const &on_fills)
: me(new PImpl(on_ready, on_orders, on_fills)) {}
OnFills const &on_fills,
DynamicOrderRegistry const &dyn_order_registry)
: me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry)) {}
ServiceBridge::~ServiceBridge() {}
void ServiceBridge::block_until_ready()
{
me->ready.get_future().wait();
}
void ServiceBridge::block_until_ready() { me->ready.get_future().wait(); }
void ServiceBridge::init() {
subscribe<NewAdminDataEvent>([this](auto const &u) { this->on(u); });
@@ -125,8 +124,8 @@ void ServiceBridge::on(mercury::Update<OrderManagerReadyEvent> const &update) {
}
}
void ServiceBridge::on(mercury::Update<NewAdminDataEvent> const&update) {
if (update.events)
void ServiceBridge::on(mercury::Update<NewAdminDataEvent> const &update) {
if (update.events)
for (auto ev : *(update.events))
me->order_router.update(*ev.admin_data);
}
@@ -233,12 +232,12 @@ ServiceBridge::crack_order(api::orderman::Crack const &c) {
return f.get();
}
void ServiceBridge::update_admin_data(std::shared_ptr<const api::admin::AdminData> const&admin)
{
void ServiceBridge::update_admin_data(
std::shared_ptr<const api::admin::AdminData> const &admin) {
post_action([this, admin]() {
me->admin_data_updates.push_back (admin);
publish(me->new_admin_data_pub,*admin);
});
me->admin_data_updates.push_back(admin);
publish(me->new_admin_data_pub, *admin);
});
}
bool ServiceBridge::is_ready() const {
@@ -249,5 +248,5 @@ void ServiceBridge::maybe_signal_ready(bool old_ready) {
if (!old_ready && is_ready())
me->on_ready();
}
}
}
} // namespace orderman
} // namespace bts
+37 -29
View File
@@ -1,14 +1,16 @@
#pragma once
#include <memory>
#include "lib/mercury/actors/Actor.h"
#include "lib/config/protos/jetfix.pb.h"
#include "lib/mercury/actors/Actor.h"
#include <memory>
// fwds
namespace bts {
namespace api {
class ServiceContext;
namespace admin { class AdminData;}
namespace admin {
class AdminData;
}
namespace orderman {
class OrderRecord;
class Fill;
@@ -17,32 +19,36 @@ class Create;
class Update;
class Cancel;
class Crack;
}}
} // namespace orderman
} // namespace api
namespace orderman {
class StoredFillEvent;
class StoredOrderEvent;
class NewSecuritiesEvent;
class OrderManagerReadyEvent;
class NewAdminDataEvent;
}}
class DynamicOrderRegistry;
} // namespace orderman
} // namespace bts
// end fwds
// Provides a threading bridge between the quickbux/service world and
// the mercury event broker.
namespace bts {
namespace orderman {
class ServiceBridge : public mercury::Actor
{
public:
template <class EV> using OnEv = std::function<void(EV const&)>;
class ServiceBridge : public mercury::Actor {
public:
template <class EV> using OnEv = std::function<void(EV const &)>;
using OnReady = std::function<void()>;
using OnOrders = std::function<void (std::vector<api::orderman::OrderRecord> const& )>;
using OnFills = std::function<void (std::vector<api::orderman::Fill> const&)>;
ServiceBridge(OnReady const&, OnOrders const&, OnFills const&);
using OnOrders =
std::function<void(std::vector<api::orderman::OrderRecord> const &)>;
using OnFills =
std::function<void(std::vector<api::orderman::Fill> const &)>;
ServiceBridge(OnReady const &, OnOrders const &, OnFills const &,
DynamicOrderRegistry const &);
void init() override;
~ServiceBridge();
@@ -50,23 +56,25 @@ public:
void block_until_ready();
// these can be called from any thread, after block_until_ready() returns
api::orderman::Response create_order(api::orderman::Create const&c);
api::orderman::Response update_order(api::orderman::Update const&c);
api::orderman::Response cancel_order(api::orderman::Cancel const&c);
api::orderman::Response crack_order(api::orderman::Crack const&c);
void update_admin_data(std::shared_ptr<api::admin::AdminData const> const &admin);
private:
api::orderman::Response create_order(api::orderman::Create const &c);
api::orderman::Response update_order(api::orderman::Update const &c);
api::orderman::Response cancel_order(api::orderman::Cancel const &c);
api::orderman::Response crack_order(api::orderman::Crack const &c);
void
update_admin_data(std::shared_ptr<api::admin::AdminData const> const &admin);
private:
struct PImpl;
std::unique_ptr<PImpl> me;
bool is_ready () const;
bool is_ready() const;
void maybe_signal_ready(bool old_ready);
void on(mercury::Update<StoredFillEvent> const&);
void on(mercury::Update<StoredOrderEvent> const&);
void on(mercury::Update<NewSecuritiesEvent> const&);
void on(mercury::Update<OrderManagerReadyEvent> const&);
void on(mercury::Update<NewAdminDataEvent> const&);
void on(mercury::Update<StoredFillEvent> const &);
void on(mercury::Update<StoredOrderEvent> const &);
void on(mercury::Update<NewSecuritiesEvent> const &);
void on(mercury::Update<OrderManagerReadyEvent> const &);
void on(mercury::Update<NewAdminDataEvent> const &);
};
}}
} // namespace orderman
} // namespace bts
@@ -40,7 +40,8 @@ struct OrderManager::OrderInfo {
};
struct OrderManager::PImpl {
PImpl(Actor &owner) : state(State::WAIT_ADMIN), services_data(owner) {}
PImpl(Actor &owner, DynamicOrderRegistry const &b)
: state(State::WAIT_ADMIN), services_data(owner, b) {}
State state;
std::unordered_map<OrderKey, OrderInfo> orders;
@@ -50,7 +51,7 @@ struct OrderManager::PImpl {
mercury::Stream<OrderManagerReadyEvent> pub_ready;
};
OrderManager::OrderManager() : me(new PImpl(*this)) {}
OrderManager::OrderManager(DynamicOrderRegistry const&b) : me(new PImpl(*this,b)) {}
OrderManager::~OrderManager() {}
void OrderManager::init() {
@@ -202,8 +203,7 @@ void OrderManager::on_activate_order(
OrderInfo oi{*order, me->services_data};
auto serv_ptr = oi.order_services.get();
me->orders[k] = std::move(oi);
order->on_activate(ev.price, ev.quantity, *serv_ptr,
ev.trace);
order->on_activate(ev.price, ev.quantity, *serv_ptr, ev.trace);
}
}
@@ -213,8 +213,7 @@ void OrderManager::on_update_order(const mercury::Update<UpdateOrderEvent> &m) {
auto k = ev.key();
auto it = me->orders.find(k);
if (it != me->orders.end())
it->second.order->on_update(ev.price, ev.quantity,
ev.trace);
it->second.order->on_update(ev.price, ev.quantity, ev.trace);
else {
LOG(OrderMan, Error,
"Received an update request for an unknown order {}. "
@@ -22,6 +22,7 @@ class StoredFillEvent;
class CreateFIXBufferReplyEvent;
class GatewayStatusChangeEvent;
class NewAdminDataEvent;
class DynamicOrderRegistry;
}
}
@@ -51,7 +52,7 @@ namespace orderman {
class OrderManager : public mercury::Actor {
public:
OrderManager();
OrderManager(DynamicOrderRegistry const&dyn_order_builder);
~OrderManager();
void init() override;
@@ -5,8 +5,8 @@
namespace bts {
namespace orderman {
OrderServicesData::OrderServicesData(mercury::Actor &owner)
: owner(owner), order_router(), order_factory(sec_db, order_router),
OrderServicesData::OrderServicesData(mercury::Actor &owner,DynamicOrderRegistry const&b)
: owner(owner), order_router(), order_factory(sec_db, order_router,b),
last_timer_ev(
Timer::now(),
to<mercury::TimeStampStr>(datetime::FIX_timestamp(datetime::now()))) {
@@ -67,13 +67,14 @@ struct SessionServicesData {
class OrderServicesData {
public:
OrderServicesData(mercury::Actor &owner);
OrderServicesData(mercury::Actor &owner,DynamicOrderRegistry const&b);
mercury::Actor &owner;
securities::MapSecurityDB sec_db;
OrderRouter order_router;
Limiter limiter;
OrderFactory order_factory;
std::unique_ptr<mercury::ContentSubscription<BookUpdateEvent>> md_subs;
std::unique_ptr<
mercury::ContentSubscription<OrderStateUpdateEvent, ParentKey>>
@@ -0,0 +1,14 @@
#pragma once
#include <memory>
#include <functional>
namespace bts {
namespace orderman {
class DynamicOrder;
using DynamicOrderBuilder = std::function<std::unique_ptr<DynamicOrder>()>;
}}
@@ -0,0 +1,45 @@
#include "DynamicOrderRegistry.h"
#include "lib/orderman/orders/DynamicOrder.h"
#include <unordered_map>
namespace bts {
namespace orderman {
struct DynamicOrderRegistry::PImpl {
std::unordered_map<
std::string,
std::pair<DynamicOrderBuilder, api::orderman::DynamicOrderDescriptor>>
dyn_orders;
};
DynamicOrderRegistry::DynamicOrderRegistry() : me(new PImpl()) {}
DynamicOrderRegistry::~DynamicOrderRegistry() {}
void DynamicOrderRegistry::register_dynamic_order(
api::orderman::DynamicOrderDescriptor const &desc,
DynamicOrderBuilder const &b) {
me->dyn_orders[desc.dynamic_order_type()] = std::make_pair(b, desc);
}
std::unique_ptr<DynamicOrder>
DynamicOrderRegistry::build(std::string const &dynamic_order_type) const {
auto it = me->dyn_orders.find(dynamic_order_type);
if (it != me->dyn_orders.end())
return it->second.first();
else
return std::unique_ptr<DynamicOrder>();
}
std::vector<api::orderman::DynamicOrderDescriptor>
DynamicOrderRegistry::get_all_dynamic_order_types() const {
std::vector<api::orderman::DynamicOrderDescriptor> result;
for (auto const &ot : me->dyn_orders)
result.push_back(ot.second.second);
return result;
}
} // namespace orderman
} // namespace bts
@@ -0,0 +1,27 @@
#pragma once
#include "lib/orderman/order_factory/DynamicOrderBuilder.h"
#include "lib/api/services/OrderService.pb.h"
namespace bts {
namespace orderman {
class DynamicOrderRegistry {
public:
DynamicOrderRegistry();
~DynamicOrderRegistry();
void register_dynamic_order(api::orderman::DynamicOrderDescriptor const&desc,
DynamicOrderBuilder const&builder);
// can return a null if no such order type exists
std::unique_ptr<DynamicOrder> build(std::string const&dynamic_order_type) const;
std::vector<api::orderman::DynamicOrderDescriptor> get_all_dynamic_order_types() const;
private:
struct PImpl;
std::unique_ptr <PImpl> me;
};
}}
+45 -32
View File
@@ -1,24 +1,25 @@
#include "OrderFactory.h"
#include "lib/api/services/OrderService.pb.h"
#include "lib/logging/logging.h"
#include "lib/orderman/orderman_utils/ExecutionReport.h"
#include "lib/orderman/orders/PreActivationOrderServices.h"
#include "lib/utils/Puid.h"
#include "lib/utils/SpinLock.h"
#include "lib/utils/bts_assert.h"
#include "lib/orderman/orderman_utils/ExecutionReport.h"
#include "lib/orderman/orders/PreActivationOrderServices.h"
// order types
#include "lib/orderman/order_factory/DynamicOrderRegistry.h"
#include "lib/orderman/orders/DynamicOrder.h"
#include "lib/orderman/orders/IcebergOrder.h"
#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h"
#include "lib/orderman/orders/NativeOrder.h"
#include "lib/orderman/orders/TimeBoxOrder.h"
#include "lib/orderman/orders/book_algos/TickOrder.h"
#include "lib/orderman/orders/book_algos/LeanOrder.h"
#include "lib/orderman/orders/book_algos/JoinOrder.h"
#include "lib/orderman/orders/book_algos/TopOrder.h"
#include "lib/orderman/orders/book_algos/CoverOrder.h"
#include "lib/orderman/orders/TriggerOrder.h"
#include "lib/orderman/orders/DynamicOrder.h"
#include "lib/orderman/orders/book_algos/CoverOrder.h"
#include "lib/orderman/orders/book_algos/JoinOrder.h"
#include "lib/orderman/orders/book_algos/LeanOrder.h"
#include "lib/orderman/orders/book_algos/TickOrder.h"
#include "lib/orderman/orders/book_algos/TopOrder.h"
#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h"
#include <limits>
#include <mutex>
@@ -48,16 +49,20 @@ OrderKey gen_order_id() {
}
struct OrderFactory::PImpl {
PImpl(securities::ISecurityDB &db,OrderRouter const&router)
: my_orders(), sec_db(db), router(router){}
PImpl(securities::ISecurityDB &db, OrderRouter const &router,
DynamicOrderRegistry const &dr)
: my_orders(), sec_db(db), router(router), dynamic_order_registry(dr) {}
std::vector<std::unique_ptr<Order>> my_orders;
securities::ISecurityDB &sec_db;
OrderRouter const&router;
OrderRouter const &router;
DynamicOrderRegistry const &dynamic_order_registry;
};
OrderFactory::OrderFactory(securities::ISecurityDB &db, OrderRouter const&router)
: me(new PImpl(db, router)) {}
OrderFactory::OrderFactory(securities::ISecurityDB &db,
OrderRouter const &router,
DynamicOrderRegistry const &registry)
: me(new PImpl(db, router, registry)) {}
OrderFactory::~OrderFactory() {}
@@ -66,8 +71,8 @@ Order &OrderFactory::create(OrderKey parent,
auto k = gen_order_id();
auto pk = parent;
auto &order = allocate(k, pk, def);
order.on_init_new(def,
PreActivationOrderServices{me->sec_db, *this,me->router});
order.on_init_new(def,
PreActivationOrderServices{me->sec_db, *this, me->router});
return order;
}
@@ -76,7 +81,7 @@ Order &OrderFactory::recover(api::orderman::OrderRecord const &rec) {
auto pk = OrderKey(rec.parent_key());
auto &order = allocate(k, pk, rec.def());
order.on_init_recovered(
rec, PreActivationOrderServices{me->sec_db, *this,me->router});
rec, PreActivationOrderServices{me->sec_db, *this, me->router});
return order;
}
@@ -90,7 +95,7 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const &r) {
case NATIVE_ORDER_TYPE_STOP_LIMIT: {
auto native_order = std::make_unique<NativeOrder>();
native_order->on_init_from_exe_report(
r, PreActivationOrderServices{me->sec_db, *this,me->router});
r, PreActivationOrderServices{me->sec_db, *this, me->router});
native_order->_key = r.order_key;
native_order->_parent_key = null_order_key();
me->my_orders.emplace_back();
@@ -122,32 +127,40 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk,
order_ptr.reset(new IcebergOrder());
break;
case CustomOrderDefinition::kSpreader:
order_ptr.reset (new orderman::SpreaderOrder());
order_ptr.reset(new orderman::SpreaderOrder());
break;
case CustomOrderDefinition::kTimeBox:
order_ptr.reset (new orderman::TimeBoxOrder());
order_ptr.reset(new orderman::TimeBoxOrder());
break;
case CustomOrderDefinition::kTick:
order_ptr.reset (new orderman::TickOrder());
order_ptr.reset(new orderman::TickOrder());
break;
case CustomOrderDefinition::kLean:
order_ptr.reset (new orderman::LeanOrder());
break;
order_ptr.reset(new orderman::LeanOrder());
break;
case CustomOrderDefinition::kJoin:
order_ptr.reset (new orderman::JoinOrder());
order_ptr.reset(new orderman::JoinOrder());
break;
case CustomOrderDefinition::kTop:
order_ptr.reset (new orderman::TopOrder());
order_ptr.reset(new orderman::TopOrder());
break;
case CustomOrderDefinition::kTrigger:
order_ptr.reset (new orderman::TriggerOrder());
order_ptr.reset(new orderman::TriggerOrder());
break;
case CustomOrderDefinition::kCover:
order_ptr.reset (new orderman::CoverOrder());
break;
case CustomOrderDefinition::kDynamic:
order_ptr.reset (new orderman::DynamicOrder());
order_ptr.reset(new orderman::CoverOrder());
break;
case CustomOrderDefinition::kDynamic: {
order_ptr = me->dynamic_order_registry.build(
def.custom_def().dynamic().dynamic_order_type());
if (!order_ptr) {
// the default dynamic order is empty and will transition
// immediately to an error state, so we use it when we cannot
// resolve the requested type
order_ptr.reset(new orderman::DynamicOrder());
}
break;
}
case CustomOrderDefinition::CUSTOM_NOT_SET:
bts_assert(false);
break;
@@ -156,5 +169,5 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk,
order_ptr->_parent_key = pk;
return *order_ptr;
}
}
}
} // namespace orderman
} // namespace bts
@@ -11,7 +11,8 @@ class ISecurityDB;
}
namespace orderman {
class Order;
}
class DynamicOrderRegistry;
} // namespace orderman
namespace orderman {
class OrderRouter;
}
@@ -32,7 +33,8 @@ namespace orderman {
class OrderFactory : public IOrderFactory {
public:
OrderFactory(securities::ISecurityDB &db, OrderRouter const &router);
OrderFactory(securities::ISecurityDB &db, OrderRouter const &router,
DynamicOrderRegistry const &dynamic_order_reg);
~OrderFactory();
Order &create(OrderKey parent,
+16 -30
View File
@@ -15,7 +15,6 @@ struct DynamicOrder::PImpl {
api::orderman::OrderState state;
};
DynamicOrder::DynamicOrder() : me(new PImpl()) {}
DynamicOrder::~DynamicOrder() {}
@@ -27,13 +26,14 @@ api::orderman::OrderDefinition const &DynamicOrder::definition() const {
void DynamicOrder::on_init_new(api::orderman::OrderDefinition const &def,
const PreActivationOrderServices &) {
me->def = def;
me->state.mutable_trigger();
me->state.mutable_dynamic();
auto const &dynamic_def = def.custom_def().dynamic();
auto msg = fmt::format("Could not find implementation for dynamic order type {}",
dynamic_def.dynamic_order_type());
auto msg =
fmt::format("Could not find implementation for dynamic order type {}",
dynamic_def.dynamic_order_type());
me->state.set_status(ORDER_STATUS_REJECTED_BY_SPARK);
me->state.set_last_msg(msg);
transition(ORDER_STATUS_REJECTED_BY_SPARK, msg);
}
void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec,
@@ -41,35 +41,21 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec,
auto const &def = rec.def();
me->def = def;
me->state = rec.state();
auto msg = fmt::format("Could not find implementation for dynamic order type {}",
def.custom_def().dynamic().dynamic_order_type());
transition(ORDER_STATUS_ERROR, msg);
}
void DynamicOrder::on_activate(Price , Quantity , OrderServices &services,
PerfTrace const&) {
bts_assert(!me->services);
me->services = &services;
report_state();
}
void DynamicOrder::on_update(Price , Quantity , PerfTrace const&) {}
void DynamicOrder::on_crack(PerfTrace const&) {}
void DynamicOrder::on_cancel(PerfTrace const&) {}
void DynamicOrder::transition(api::orderman::OrderStatus new_status,
std::string const &msg) {
auto const &from = OrderStatus_Name(me->state.status());
auto const &to = OrderStatus_Name(new_status);
LOG(OrderMan, Info, "Transitioning dynamic order {} from {} to {}. Msg: {}",
key().value(), from, to, msg);
auto msg =
fmt::format("Could not find implementation for dynamic order type {}",
def.custom_def().dynamic().dynamic_order_type());
me->state.set_status(ORDER_STATUS_REJECTED_BY_SPARK);
me->state.set_last_msg(msg);
me->state.set_status(new_status);
}
void DynamicOrder::report_state() {
me->services->report_state(me->state);
void DynamicOrder::on_activate(Price, Quantity, OrderServices &services,
PerfTrace const &) {
services.report_state(me->state);
}
void DynamicOrder::on_update(Price, Quantity, PerfTrace const &) {}
void DynamicOrder::on_crack(PerfTrace const &) {}
void DynamicOrder::on_cancel(PerfTrace const &) {}
} // namespace orderman
} // namespace bts
-2
View File
@@ -25,8 +25,6 @@ public:
void on_cancel(PerfTrace const&) override ;
private:
void report_state();
void transition(api::orderman::OrderStatus new_state,std::string const&msg);
struct PImpl;
std::unique_ptr<PImpl> me;
};
+27 -7
View File
@@ -16,7 +16,10 @@
#include "lib/orderman/actors/SecuritySrc.h"
#include "lib/orderman/actors/ServiceBridge.h"
#include "lib/orderman/actors/order_manager/OrderManager.h"
#include "lib/orderman/order_factory/DynamicOrderRegistry.h"
#include "lib/utils/bts_chrono.h"
#include "lib/plugin/plugin.h"
#include "lib/plugin/SparkServices.h"
namespace bts {
namespace orderman {
@@ -24,6 +27,7 @@ namespace orderman {
struct OrderServiceServer::PImpl {
PImpl(bts::api::ServiceContext &ctx,
std::shared_ptr<api::ISyntheticSecurityService> &ss,
DynamicOrderRegistry const &d,
metrics::MetricsContainer &stats)
: fast_broker(std::make_shared<mercury::AsyncEventBroker>()),
slow_broker(std::make_shared<mercury::AsyncEventBroker>()),
@@ -31,7 +35,7 @@ struct OrderServiceServer::PImpl {
fast_thread(), slow_thread(), service_ready(false), known_orders(),
known_fills(), publish_orders(), publish_fills(),
admin_service(ctx.locate<api::admin::AdminService>()), md_consumer(ss),
stats(stats) {}
stats(stats), dyn_order_registry(d) {}
std::shared_ptr<mercury::AsyncEventBroker> fast_broker;
std::shared_ptr<mercury::AsyncEventBroker> slow_broker;
@@ -49,14 +53,16 @@ struct OrderServiceServer::PImpl {
api::admin::AdminService admin_service;
bts::md::MDConsumer md_consumer;
metrics::MetricsContainer &stats;
DynamicOrderRegistry const &dyn_order_registry;
};
OrderServiceServer::OrderServiceServer(
bts::api::ServiceContext &ctx,
std::shared_ptr<api::ISyntheticSecurityService> &ss,
DynamicOrderRegistry const&d,
metrics::MetricsContainer &stats)
: api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, stats)) {
: api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d,stats)) {
me->publish_orders = make_orders_publisher();
me->publish_fills = make_fills_publisher();
@@ -69,18 +75,20 @@ OrderServiceServer::OrderServiceServer(
[this, &ctx](auto const &fill) {
ctx.post([this, fill] { this->on_fills(fill); });
});
},
me->dyn_order_registry);
me->fast_broker->init_neighbours({me->slow_broker});
me->slow_broker->init_neighbours({me->fast_broker});
// fast actors
me->fast_exe.spawn<MDSource>(me->md_consumer, me->stats);
me->fast_exe.spawn<OrderManager>();
me->fast_exe.spawn<OrderManager>(me->dyn_order_registry);
auto &all_connections = config::get<config::JetFIX>().connection();
for (auto const &c : all_connections)
me->fast_exe.spawn<ExecutionGateway>(c,stats);
me->fast_exe.spawn<ExecutionGateway>(c, stats);
me->fast_thread = std::thread([this]() {
os::set_thread_name("fast_exe");
@@ -105,7 +113,7 @@ OrderServiceServer::OrderServiceServer(
// slow actors
me->slow_exe.activate(me->service_bridge);
me->slow_exe.spawn<mercury::Timer>();
me->slow_exe.spawn<AsyncFactory>();
me->slow_exe.spawn<AsyncFactory>(me->dyn_order_registry);
me->slow_exe.spawn<OrderStore>();
me->slow_exe.spawn<FillStore>();
me->slow_exe.spawn<SecuritySrc>(me->md_consumer);
@@ -225,5 +233,17 @@ void OrderServiceServer::crack_order(
response = me->service_bridge->crack_order(crack);
r(response);
}
void OrderServiceServer::get_registered_dynamic_order_types(
const api::VoidMessage &,
const api::Response<api::orderman::RegisteredDynamicOrderTypes> &r) {
api::orderman::RegisteredDynamicOrderTypes response;
auto all_orders = me->dyn_order_registry.get_all_dynamic_order_types();
for (auto const &desc : all_orders)
*response.add_dynamic_order_desc() = desc;
r(response);
}
} // namespace orderman
} // namespace bts
+32 -24
View File
@@ -1,39 +1,47 @@
#pragma once
#include <memory>
#include "lib/api/services/OrderService.pb.h"
#include "lib/api/services/OrderService.server.pb.h"
#include "lib/mercury/mercury_utils/IPollableActor.h"
#include <memory>
namespace bts {
namespace api { class ISyntheticSecurityService; }
namespace metrics {class MetricsContainer;}
namespace api {
class ISyntheticSecurityService;
}
namespace metrics {
class MetricsContainer;
}
namespace orderman {
class DynamicOrderRegistry;
class OrderServiceServer : public api::orderman::OrderServiceBase
{
public:
OrderServiceServer (bts::api::ServiceContext& context,
std::shared_ptr<api::ISyntheticSecurityService>&,
metrics::MetricsContainer &);
class OrderServiceServer : public api::orderman::OrderServiceBase {
public:
OrderServiceServer(bts::api::ServiceContext &context,
std::shared_ptr<api::ISyntheticSecurityService> &,
DynamicOrderRegistry const&,
metrics::MetricsContainer &);
~OrderServiceServer();
void create_order(const api::orderman::Create&,
const api::Response<api::orderman::Response>&) override;
void cancel_order(const api::orderman::Cancel&,
const api::Response<api::orderman::Response>&) override;
void update_order(const api::orderman::Update&,
const api::Response<api::orderman::Response>&) override;
void crack_order(const api::orderman::Crack&,
const api::Response<api::orderman::Response>& ) override;
private:
void create_order(const api::orderman::Create &,
const api::Response<api::orderman::Response> &) override;
void cancel_order(const api::orderman::Cancel &,
const api::Response<api::orderman::Response> &) override;
void update_order(const api::orderman::Update &,
const api::Response<api::orderman::Response> &) override;
void crack_order(const api::orderman::Crack &,
const api::Response<api::orderman::Response> &) override;
void get_registered_dynamic_order_types(
const api::VoidMessage &,
const api::Response<api::orderman::RegisteredDynamicOrderTypes> &)
override;
private:
struct PImpl;
std::unique_ptr<PImpl> me;
void on_orders(std::vector<api::orderman::OrderRecord> const&);
void on_fills (std::vector<api::orderman::Fill> const&);
void on_orders(std::vector<api::orderman::OrderRecord> const &);
void on_fills(std::vector<api::orderman::Fill> const &);
};
}}
} // namespace orderman
} // namespace bts
+26
View File
@@ -0,0 +1,26 @@
#include "SparkServices.h"
#include "lib/orderman/order_factory/DynamicOrderRegistry.h"
namespace bts {
using namespace orderman;
struct SparkServices::PImpl {
PImpl(orderman::DynamicOrderRegistry &r) : dyn_order_registry(r) {}
DynamicOrderRegistry &dyn_order_registry;
};
SparkServices::SparkServices(orderman::DynamicOrderRegistry &r)
: me(new PImpl(r)) {}
SparkServices::~SparkServices() {}
void SparkServices::register_dynamic_order(
api::orderman::DynamicOrderDescriptor const &desc,
std::function<std::unique_ptr<DynamicOrder>()> const &builder) {
me->dyn_order_registry.register_dynamic_order(desc, builder);
}
extern "C" void initialize_spark_plugin(SparkServices &) {}
} // namespace bts
+28
View File
@@ -0,0 +1,28 @@
#pragma once
#include "lib/api/services/OrderService.pb.h"
#include <functional>
#include <memory>
#include <string>
namespace bts {
namespace orderman {
class DynamicOrder;
class DynamicOrderRegistry;
} // namespace orderman
class SparkServices {
public:
SparkServices(orderman::DynamicOrderRegistry &);
~SparkServices();
void register_dynamic_order(
api::orderman::DynamicOrderDescriptor const &desc,
std::function<std::unique_ptr<orderman::DynamicOrder>()> const &builder);
private:
struct PImpl;
std::unique_ptr<PImpl> me;
};
} // namespace bts
+50
View File
@@ -0,0 +1,50 @@
#include "lib/logging/logging.h"
#include "lib/logging/logging.h"
#include "lib/orderman/actors/order_manager/OrderBuilder.h"
#include "lib/utils/PBUtils.h"
#include "lib/plugin/SparkServices.h"
#include <algorithm>
#include <boost/dll.hpp>
#include <boost/filesystem.hpp>
namespace bts {
namespace plugin {
using namespace bts::orderman;
void init_plugins(SparkServices &services) {
static std::vector<decltype (boost::dll::import<void (SparkServices&)>(boost::filesystem::path(),""))> keep_alive;
auto plugin_path = os::sparkd_wd() + "/plugins/";
if (!boost::filesystem::is_directory(plugin_path)) {
LOG(Plugin, Info,
"No plugin directory found at {}. Skipping plugin loading",
plugin_path);
return;
}
boost::filesystem::directory_iterator end;
for (auto iter = boost::filesystem::directory_iterator(plugin_path);
iter != end; ++iter) {
auto &f = *iter;
auto pl = f.path().string();
LOG(Plugin, Info, "Attempting to initialize plugin {}", pl);
try {
auto init_plugin = boost::dll::import<void(SparkServices &)>(
f.path(), "init_spark_plugin");
init_plugin(services);
keep_alive.push_back(init_plugin);
LOG(Plugin, Info, "Successfully initialized plugin {}", pl);
} catch (boost::system::system_error const &e) {
LOG(Plugin, Error,
"Failed to initialize plugin {}. Error: {} (OS error code: {})",
pl, std::string(e.what()), e.code());
}
}
}
} // namespace plugin
} // namespace bts
+7
View File
@@ -0,0 +1,7 @@
#pragma once
namespace bts {
class SparkServices;
namespace plugin {
void init_plugins(SparkServices &);
}}
+3 -2
View File
@@ -7,8 +7,9 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/sdk
COMMENT "Building SDK"
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/make_sdk.sh
${CMAKE_CURRENT_SOURCE_DIR}/example/build_example.sh
${CMAKE_CURRENT_SOURCE_DIR}/example/example.cpp
${CMAKE_CURRENT_SOURCE_DIR}/examples/build_examples.sh
${CMAKE_CURRENT_SOURCE_DIR}/examples/md_publisher_example.cpp
${CMAKE_CURRENT_SOURCE_DIR}/examples/order_plugin_example.cpp
server_layout)
add_custom_target(sdk_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/sdk)
-13
View File
@@ -1,13 +0,0 @@
#!/bin/bash
g++ -isystem ../externals/include \
-I ../include \
-I ../include/spark \
-o example \
example.cpp \
-Wl,-rpath,../lib \
-L ../lib \
-l spark \
-llttng-ust \
-ldl
+24
View File
@@ -0,0 +1,24 @@
#!/bin/bash
g++ -isystem ../externals/include \
-I ../include \
-I ../include/spark \
-o md_publisher_example \
md_publisher_example.cpp \
-Wl,-rpath,../lib \
-L ../lib \
-l spark \
-llttng-ust \
-ldl
g++ -isystem ../externals/include \
-I ../include \
-I ../include/spark \
-fPIC \
-g \
-shared \
-o order_plugin_example.so \
order_plugin_example.cpp \
-Wl,-rpath,.. \
-L ../lib \
-l spark
File renamed without changes.
+383
View File
@@ -0,0 +1,383 @@
#include "spark/lib/logging/logging.h"
#include "spark/lib/orderman/orders/DynamicOrder.h"
#include "spark/lib/plugin/SparkServices.h"
#include "spark/lib/orderman/actors/order_manager/ChildOrder.h"
#include "spark/lib/orderman/actors/order_manager/OrderBuilder.h"
#include "spark/lib/orderman/orders/DynamicOrder.h"
#include "spark/lib/utils/PBUtils.h"
using namespace bts::api::orderman;
using namespace bts::orderman;
namespace bts {
namespace order_example {
class DynamicIcebergOrder : public DynamicOrder {
public:
DynamicIcebergOrder();
~DynamicIcebergOrder();
OrderDefinition const &definition() const override;
void on_init_new(OrderDefinition const &,
const PreActivationOrderServices &) override;
void on_init_recovered(OrderRecord const &,
const PreActivationOrderServices &) override;
void on_activate(Price, Quantity, OrderServices &,
PerfTrace const &) override;
void on_update(Price, Quantity, PerfTrace const &) override;
void on_crack(PerfTrace const &) override;
void on_cancel(PerfTrace const &) override;
private:
void report_state();
void send_next_child_order();
void merge_states(OrderState const &iceberg_state,
OrderState const &child_state, OrderState *merged);
void on_child_order_update(OrderStateUpdateEvent const &);
void transition(OrderStatus new_state, std::string const &msg);
void transition(OrderStatus new_state);
struct ActiveChild;
struct PImpl;
std::unique_ptr<PImpl> me;
};
struct DynamicIcebergOrder::ActiveChild {
ActiveChild() {}
ChildOrder order;
api::orderman::OrderState state;
void clear() { state = api::orderman::OrderState(); }
};
struct DynamicIcebergOrder::PImpl {
PImpl() : services(nullptr), child() {}
OrderServices *services;
api::orderman::OrderDefinition def;
api::orderman::OrderState state;
OrderBuilder child_builder;
ActiveChild child;
Quantity show_quantity;
};
DynamicIcebergOrder::DynamicIcebergOrder() : me(new PImpl()) {}
DynamicIcebergOrder::~DynamicIcebergOrder() {}
api::orderman::OrderDefinition const &DynamicIcebergOrder::definition() const {
return me->def;
}
void DynamicIcebergOrder::on_init_new(
api::orderman::OrderDefinition const &def,
const PreActivationOrderServices &services) {
me->def = def;
me->state.mutable_dynamic();
auto const &iceberg_def = def.custom_def().dynamic();
me->show_quantity =
Quantity(iceberg_def.order_params().at("show_size").as_uint32());
auto child_def = def;
*child_def.mutable_custom_def() =
iceberg_def.order_params().at("child").as_order_def();
if (me->show_quantity.value() != 0) {
me->child_builder = OrderBuilder(
key(), child_def, services,
std::max((size_t)1, (size_t)(me->show_quantity).value() / 10));
transition(ORDER_STATUS_INACTIVE);
} else {
auto msg = fmt::format("Show quantity must be greater than 0");
me->state.set_last_msg(msg);
transition(ORDER_STATUS_REJECTED_BY_SPARK, msg);
}
}
void DynamicIcebergOrder::on_init_recovered(
api::orderman::OrderRecord const &rec, const PreActivationOrderServices &) {
auto const &def = rec.def();
me->def = def;
me->state = rec.state();
switch (me->state.status()) {
case ORDER_STATUS_WORKING:
case ORDER_STATUS_DISCONNECTED: {
auto msg = "System restarted with active iceberg order";
me->state.set_last_msg(msg);
transition(ORDER_STATUS_ERROR, msg);
break;
}
// terminal states
case ORDER_STATUS_ERROR:
case ORDER_STATUS_REJECTED_BY_SPARK:
case ORDER_STATUS_COMPLETED:
case ORDER_STATUS_CANCELED:
break;
case ORDER_STATUS_PENDING_WORKING:
case ORDER_STATUS_INACTIVE:
case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_:
case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_:
bts_assert(false);
break;
}
}
void DynamicIcebergOrder::on_activate(Price p, Quantity q,
OrderServices &services,
PerfTrace const &) {
bts_assert(!me->services);
me->services = &services;
me->child_builder.activate(services);
switch (me->state.status()) {
case ORDER_STATUS_INACTIVE:
me->state.set_price(p.value());
me->state.set_quantity(q.value());
services.child_updates.sub(
key(), [this](auto const &os) { this->on_child_order_update(os); });
transition(ORDER_STATUS_WORKING);
send_next_child_order();
break;
// these are not possible since the on_init_recovered code
// would have transitioned us to error already
case ORDER_STATUS_WORKING:
case ORDER_STATUS_PENDING_WORKING:
case ORDER_STATUS_DISCONNECTED: {
bts_assert(false);
break;
}
// terminal states
case ORDER_STATUS_ERROR:
case ORDER_STATUS_REJECTED_BY_SPARK:
case ORDER_STATUS_COMPLETED:
case ORDER_STATUS_CANCELED:
break;
case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_:
case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_:
bts_assert(false);
break;
}
report_state();
}
void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) {
switch (me->state.status()) {
case ORDER_STATUS_WORKING:
case ORDER_STATUS_PENDING_WORKING:
LOG(Plugin, Info,
"Updating DynamicIceberg order {} to price {} quantity {}",
key().value(), p.value(), q.value());
me->state.set_price(p.value());
me->state.set_quantity(q.value());
break;
case ORDER_STATUS_DISCONNECTED:
case ORDER_STATUS_REJECTED_BY_SPARK:
case ORDER_STATUS_COMPLETED:
case ORDER_STATUS_CANCELED:
case ORDER_STATUS_ERROR:
transition(me->state.status(), "Cannot update order");
break;
case ORDER_STATUS_INACTIVE:
case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_:
case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_:
bts_assert(false);
break;
}
report_state();
}
void DynamicIcebergOrder::on_crack(PerfTrace const &) {}
void DynamicIcebergOrder::on_cancel(PerfTrace const &) {
switch (me->state.status()) {
case ORDER_STATUS_WORKING:
LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value());
me->child.order.cancel();
transition(ORDER_STATUS_CANCELED);
break;
case ORDER_STATUS_PENDING_WORKING:
case ORDER_STATUS_DISCONNECTED:
case ORDER_STATUS_REJECTED_BY_SPARK:
case ORDER_STATUS_COMPLETED:
case ORDER_STATUS_CANCELED:
case ORDER_STATUS_ERROR:
transition(me->state.status(), "Cannot cancel order");
break;
case ORDER_STATUS_INACTIVE:
case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_:
case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_:
bts_assert(false);
break;
}
report_state();
}
void DynamicIcebergOrder::report_state() {
if (me->child.state.filled_quantity()) {
api::orderman::OrderState merged_state;
merge_states(me->state, me->child.state, &merged_state);
me->services->report_state(merged_state);
} else
me->services->report_state(me->state);
}
void DynamicIcebergOrder::merge_states(
api::orderman::OrderState const &iceberg_state,
api::orderman::OrderState const &child_state,
api::orderman::OrderState *merged) {
auto child_order_fills = child_state.filled_quantity();
auto child_order_avg_price = child_state.avg_price();
auto child_order_last_price = child_state.last_price();
auto iceberg_fills = iceberg_state.filled_quantity();
auto iceberg_avg_price = iceberg_state.avg_price();
*merged = iceberg_state;
merged->set_filled_quantity(child_order_fills + iceberg_fills);
merged->set_last_price(child_order_last_price);
merged->set_avg_price((child_order_fills * child_order_avg_price +
iceberg_fills * iceberg_avg_price) /
(child_order_fills + iceberg_fills));
}
void DynamicIcebergOrder::send_next_child_order() {
bts_assert(me->state.quantity() > me->state.filled_quantity());
auto remaining = me->state.quantity() - me->state.filled_quantity();
auto to_send = std::min(remaining, me->show_quantity.value());
me->child.order = me->child_builder.build();
LOG(Plugin, Info,
"DynamicIceberg order {} creating new child order {} with size "
"{} price {}. Filled {} so far out of {}",
key().value(), me->child.order.key().value(), to_send, me->state.price(),
me->state.filled_quantity(), me->state.quantity());
me->child.order.activate(Price(me->state.price()), Quantity(to_send));
}
void DynamicIcebergOrder::on_child_order_update(
OrderStateUpdateEvent const &ev) {
switch (me->state.status()) {
case ORDER_STATUS_WORKING:
if (ev.key == me->child.order.key()) {
me->child.state = ev.state;
switch (ev.state.status()) {
case ORDER_STATUS_WORKING:
case ORDER_STATUS_PENDING_WORKING:
// nothing to do but report new state
break;
case ORDER_STATUS_COMPLETED: {
api::orderman::OrderState merged_state;
merge_states(me->state, me->child.state, &merged_state);
me->state = merged_state;
me->child.clear();
if (me->state.quantity() > me->state.filled_quantity())
send_next_child_order();
else
transition(ORDER_STATUS_COMPLETED);
break;
}
case ORDER_STATUS_CANCELED:
LOG(Plugin, Info,
"Unexpected cancel of child {} in DynamicIceberg Order {}. "
"Canceling parent",
ev.key.value(), key().value());
transition(ORDER_STATUS_CANCELED);
break;
case ORDER_STATUS_DISCONNECTED:
case ORDER_STATUS_REJECTED_BY_SPARK:
case ORDER_STATUS_ERROR:
me->child.clear();
transition(ORDER_STATUS_ERROR, "Unexpected child order state");
break;
case ORDER_STATUS_INACTIVE:
case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_:
case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_:
bts_assert(false);
break;
}
} else {
LOG(Plugin, Info,
"DynamicIceberg order {} received update for non active child "
"order{} . update state = {} ",
key().value(), me->child.order.key().value(),
utils::pb::to_string(ev.state));
}
break;
case ORDER_STATUS_CANCELED:
case ORDER_STATUS_ERROR:
case ORDER_STATUS_DISCONNECTED:
case ORDER_STATUS_COMPLETED:
break;
case ORDER_STATUS_PENDING_WORKING:
case ORDER_STATUS_REJECTED_BY_SPARK:
case ORDER_STATUS_INACTIVE:
case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_:
case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_:
bts_assert(false);
break;
}
report_state();
}
void DynamicIcebergOrder::transition(api::orderman::OrderStatus new_status,
std::string const &msg) {
auto const &from = OrderStatus_Name(me->state.status());
auto const &to = OrderStatus_Name(new_status);
LOG(Plugin, Info,
"Transitioning dynamic iceberg order {} from {} to {}. Msg: {}",
key().value(), from, to, msg);
me->state.set_last_msg(msg);
me->state.set_status(new_status);
}
void DynamicIcebergOrder::transition(api::orderman::OrderStatus new_status) {
auto const &from = OrderStatus_Name(me->state.status());
auto const &to = OrderStatus_Name(new_status);
LOG(OrderMan, Info, "Transitioning dynamic iceberg order {} from {} to {}",
key().value(), from, to);
me->state.set_status(new_status);
}
} // namespace order_example
} // namespace bts
DynamicOrderDescriptor get_dynamic_iceberg_order_desc()
{
DynamicOrderDescriptor desc;
// order type name
desc.set_dynamic_order_type("DynamicIcebergOrder");
// show size
auto param = desc.add_param_desc();
param->set_param_name("show_size");
param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT);
// child order
param = desc.add_param_desc();
param->set_param_name("child");
param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF);
}
extern "C" void init_spark_plugin(bts::SparkServices &serv) {
using namespace bts;
serv.register_dynamic_order(get_dynamic_iceberg_order_desc(),
[]() { return std::make_unique<bts::order_example::DynamicIcebergOrder>(); });
LOG(Plugin,Info, "Initialized order_plugin_example.so");
}
+5 -5
View File
@@ -23,10 +23,10 @@ ln -sf $2/../../externals/linux/include $1/sdk/externals/include
ln -sf $2/../../externals/linux/lib/Release $1/sdk/externals/lib
ln -sf $1/server $1/sdk/lib
mkdir $1/sdk/example
cp $2/example/* $1/sdk/example
ln -sf $1/sdk/lib/defaults $1/sdk/example/defaults
chmod +x $1/sdk/example/build_example.sh
(cd $1/sdk/example && ./build_example.sh && ./example >/dev/null && rm example)
mkdir $1/sdk/examples
cp $2/examples/* $1/sdk/examples
ln -sf $1/sdk/lib/defaults $1/sdk/examples/defaults
chmod +x $1/sdk/examples/build_examples.sh
(cd $1/sdk/examples && ./build_examples.sh && ./md_publisher_example >/dev/null)
-18
View File
@@ -1,18 +0,0 @@
#!/bin/bash
if [ ! -f spark_sdk.tgz ]; then
wget http://jenkins/job/Spark_Server/lastSuccessfulBuild/artifact/spark_sdk_1909.tgz -O spark_sdk.tgz
fi
if [ ! -d spark_sdk ]; then
git clone git@bitbucket.org:bluetradesys/spark_sdk.git
else
(cd spark_sdk && git pull)
fi
rm -rf new_sdk
mkdir new_sdk
(cd new_sdk && tar -xvzf ../spark_sdk.tgz)
cp -R new_sdk/* spark_sdk
# http://jenkins/job/Spark_Server/lastSuccessfulBuild/artifact/spark_server_1909.tgz
# http://jenkins/job/Spark_Server/lastSuccessfulBuild/artifact/spark_sdk_1909.tgz
+1 -1
View File
@@ -1 +1 @@
set(sources bts_trace.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.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/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp)
set(sources bts_trace.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/MarketDataAuxiliaryServiceServer.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/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp)
+12 -1
View File
@@ -23,6 +23,9 @@
#include "server/sparkd/user/AdminServiceServer.h"
#include "server/sparkd/user/UserServiceServer.h"
#include "server/sparkd/position/PositionServiceServer.h"
#include "lib/orderman/order_factory/DynamicOrderRegistry.h"
#include "lib/plugin/SparkServices.h"
#include "lib/plugin/plugin.h"
#include "lib/md/relay/QueryServer.h"
@@ -36,6 +39,7 @@ int Run::execute(std::vector<std::string> const &) {
LOG(Gen, Warn, "------------------------------------ Sparkd launched "
"--------------------------------");
config::QuickbusNodeCfg qb_cfg;
auto& ports = config::get<config::Ports>();
qb_cfg.set_my_port(ports.qbus_port());
@@ -53,7 +57,14 @@ int Run::execute(std::vector<std::string> const &) {
std::make_shared<api::synthetic::SyntheticSecurityService>(sc);
md::QueryServerPtr md_query_server(
md::run_query_server(sc, synthetic_service, stats));
orderman::OrderServiceServer order_service_server(sc, synthetic_service,stats);
// initialize order plugins
orderman::DynamicOrderRegistry dyn_order_registry;
SparkServices plugin_services(dyn_order_registry);
plugin::init_plugins(plugin_services);
// finished initializing order plugins
orderman::OrderServiceServer order_service_server(sc, synthetic_service,dyn_order_registry,stats);
support::ErrorReportServer error_report_service(sc);
admin::AdminServiceServer admin_service(sc);
position::PositionServiceServer position_service(sc);
+1 -1
View File
@@ -1 +1 @@
set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs)
set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs)