From 353a33a391ec37d0bac52e67773da1e841e4a421 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 29 Aug 2018 14:16:24 +0000 Subject: [PATCH] Added some performance metrics to server. --- src/lib/orderman/actors/MDSource.h | 19 +++++++- .../orderman/server/OrderServiceServer.cpp | 43 +++++++++++++------ src/lib/orderman/server/OrderServiceServer.h | 5 ++- src/server/sparkd/cmds/Run.cpp | 2 +- 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 0f838ebb1..252de4a07 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -21,14 +21,24 @@ namespace orderman { class MDSource : public mercury::Actor, public mercury::IPollableActor { public: - MDSource(md::MDConsumer& consumer): + MDSource(md::MDConsumer& consumer, + metrics::MetricsContainer &stats): _handles(), _md_consumer(consumer), - _book_update() + _book_update(), + _stats(stats), + _loop_timer() {} void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); + _loop_timer = + std::make_shared < metrics::HistogramMetric<16>>( + "spark_metrics_md_loop", + std::array({2, 4, 8, 16, 32, 64, + 128, 256, 512, 1024,2048,4096,8192,16384})); + _stats.publish(_loop_timer); + _book_update = make_stream(); subscribe([this](auto const &update) { if (update.events) @@ -56,6 +66,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { Book book; TickToTradeCorID corid; + auto start = Timer::now(); for (auto &h : _handles) { auto &handle = h.handle; if (handle.get_depth(h.last, std::tuple_size(), @@ -67,6 +78,8 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { publish(_book_update, book, corid); } } + auto stop = Timer::now(); + _loop_timer->observe(us_diff(stop,start)); } struct HandleRecord { @@ -77,6 +90,8 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { std::vector _handles; md::MDConsumer _md_consumer; mercury::Stream _book_update; + metrics::MetricsContainer &_stats; + std::shared_ptr> _loop_timer; }; } } diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index d851d6d66..7c640e4ee 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -3,10 +3,11 @@ #include "lib/api/services/AdminService.client.pb.h" #include "lib/config/config.h" #include "lib/config/protos/jetfix.pb.h" -#include "lib/utils/bts_chrono.h" +#include "lib/md/MDConsumer.h" #include "lib/mercury/actors/Timer.h" #include "lib/mercury/broker/AsyncEventBroker.h" #include "lib/mercury/mercury_utils/Executor.h" +#include "lib/metrics/metrics.h" #include "lib/orderman/actors/AsyncFactory.h" #include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/actors/FillStore.h" @@ -15,20 +16,22 @@ #include "lib/orderman/actors/SecuritySrc.h" #include "lib/orderman/actors/ServiceBridge.h" #include "lib/orderman/actors/order_manager/OrderManager.h" -#include "lib/md/MDConsumer.h" +#include "lib/utils/bts_chrono.h" namespace bts { namespace orderman { struct OrderServiceServer::PImpl { - PImpl(bts::api::ServiceContext &ctx, std::shared_ptr& ss) + PImpl(bts::api::ServiceContext &ctx, + std::shared_ptr &ss, + metrics::MetricsContainer &stats) : fast_broker(std::make_shared()), slow_broker(std::make_shared()), service_bridge(), fast_exe(*fast_broker), slow_exe(*slow_broker), fast_thread(), slow_thread(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), - admin_service(ctx.locate()), - md_consumer(ss) {} + admin_service(ctx.locate()), md_consumer(ss), + stats(stats) {} std::shared_ptr fast_broker; std::shared_ptr slow_broker; @@ -45,12 +48,14 @@ struct OrderServiceServer::PImpl { OrderServiceServer::FillsPublisher publish_fills; api::admin::AdminService admin_service; bts::md::MDConsumer md_consumer; + metrics::MetricsContainer &stats; }; OrderServiceServer::OrderServiceServer( bts::api::ServiceContext &ctx, - std::shared_ptr &ss) - : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss)) { + std::shared_ptr &ss, + metrics::MetricsContainer &stats) + : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, stats)) { me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); @@ -70,7 +75,7 @@ OrderServiceServer::OrderServiceServer( me->slow_broker->init_neighbours({me->fast_broker}); // fast actors - me->fast_exe.spawn(me->md_consumer); + me->fast_exe.spawn(me->md_consumer,me->stats); me->fast_exe.spawn(); auto &all_connections = config::get().connection(); @@ -79,8 +84,18 @@ OrderServiceServer::OrderServiceServer( me->fast_thread = std::thread([this]() { os::set_thread_name("fast_exe"); - for (;;) + auto loop_timer = + std::make_shared < metrics::HistogramMetric<16>>( + "spark_metrics_fast_thread_loop", + std::array({2, 4, 8, 16, 32, 64, + 128, 256, 512, 1024,2048,4096,8192,16384})); + me->stats.publish(loop_timer); + for (;;) { + auto start = Timer::now(); me->fast_exe.do_work(); + auto stop = Timer::now(); + loop_timer->observe(us_diff(stop,start)); + } }); // slow actors @@ -99,13 +114,13 @@ OrderServiceServer::OrderServiceServer( // wait for the service bridge to be ready me->service_bridge->block_until_ready(); - + // subscribe to admin model updates and forward them to the service bridge me->admin_service.subscribe_admin_data() | rxcpp::operators::subscribe( [this](auto const &update) { - bts_assert(update.all().size() == 1); - me->service_bridge->update_admin_data(update.all()[0]); + bts_assert(update.all().size() == 1); + me->service_bridge->update_admin_data(update.all()[0]); }); } @@ -206,5 +221,5 @@ void OrderServiceServer::crack_order( response = me->service_bridge->crack_order(crack); r(response); } -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index 427deeef7..c498b1531 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -7,13 +7,16 @@ namespace bts { namespace api { class ISyntheticSecurityService; } +namespace metrics {class MetricsContainer;} namespace orderman { class OrderServiceServer : public api::orderman::OrderServiceBase { public: - OrderServiceServer (bts::api::ServiceContext& context, std::shared_ptr&); + OrderServiceServer (bts::api::ServiceContext& context, + std::shared_ptr&, + metrics::MetricsContainer &); ~OrderServiceServer(); void create_order(const api::orderman::Create&, diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index a18f05ba3..ff756d764 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -53,7 +53,7 @@ int Run::execute(std::vector const &) { std::make_shared(sc); md::QueryServerPtr md_query_server( md::run_query_server(sc, synthetic_service, stats)); - orderman::OrderServiceServer order_service_server(sc, synthetic_service); + orderman::OrderServiceServer order_service_server(sc, synthetic_service,stats); support::ErrorReportServer error_report_service(sc); admin::AdminServiceServer admin_service(sc); position::PositionServiceServer position_service(sc);