From 8602fde89b513b6593d96050efbf9f251d0104bf Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 5 Oct 2017 13:21:54 +0000 Subject: [PATCH] Fixed a few bugs in spread order management. --- src/server/sparkd/orderman/components/MDSource.h | 6 ++++-- .../sparkd/orderman/service/OrderServiceServer.cpp | 10 ++++++++-- .../orderman/spreader_orders/SpreaderOrderBase.h | 1 - 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/server/sparkd/orderman/components/MDSource.h b/src/server/sparkd/orderman/components/MDSource.h index e22a274a7..ac6586203 100644 --- a/src/server/sparkd/orderman/components/MDSource.h +++ b/src/server/sparkd/orderman/components/MDSource.h @@ -17,9 +17,12 @@ public: void on(event::MDSubscription const&sub) { auto k = sub.for_security->id(); + for (auto &h : _handles) - if (h.handle->key() == k) + if (h.handle->key() == k) { + h.last = utils::TimeStamp(); return ; + } auto managed_handle = _md_consumer.get_managed_handle(k); _keep_alive.push_back(managed_handle); @@ -52,7 +55,6 @@ private: md2::MDConsumerHandle* handle; }; - std::vector _handles; md::MDRecoverableConsumer _md_consumer; std::vector> _keep_alive; diff --git a/src/server/sparkd/orderman/service/OrderServiceServer.cpp b/src/server/sparkd/orderman/service/OrderServiceServer.cpp index c59454545..489d306a6 100644 --- a/src/server/sparkd/orderman/service/OrderServiceServer.cpp +++ b/src/server/sparkd/orderman/service/OrderServiceServer.cpp @@ -183,6 +183,7 @@ struct FastExecutor { struct SlowExecutor { securities::SecurityDB &sec_db; + NativeOrderFactory &native_order_factory; OrderDB &order_db; FillDB &fill_db; SlowNode node; @@ -194,8 +195,12 @@ struct SlowExecutor { std::atomic done; std::thread worker; - SlowExecutor(securities::SecurityDB &db,OrderDB &order_db,FillDB &fill_db) + SlowExecutor(securities::SecurityDB &db, + NativeOrderFactory &native_order_factory, + OrderDB &order_db, + FillDB &fill_db) : sec_db(db), + native_order_factory(native_order_factory), order_db(order_db), fill_db(fill_db), node(), @@ -235,6 +240,7 @@ struct SlowExecutor { while (!done) { sec_db.do_work(); time_source.do_work(); + native_order_factory.do_work(); if (!node.do_work()) std::this_thread::sleep_for(10ms); } @@ -252,7 +258,7 @@ struct OrderServiceServer::PImpl order_db(), fill_db(), fast(get_connection(),sec_db,native_order_factory,order_db.retrieve_all()), - slow(sec_db,order_db,fill_db), + slow(sec_db,native_order_factory,order_db,fill_db), state(State::PENDING_INIT), known_native_orders(), publish_orders(), diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h b/src/server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h index 539b398e5..4474d6b3a 100644 --- a/src/server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h @@ -32,7 +32,6 @@ public: SpreaderOrderBase(securities::SecurityDB &, NativeOrderFactory &, api::orderman::OrderState const&); - SpreaderOrderBase(securities::SecurityDB &, NativeOrderFactory &, OrderKey ,