From 3b3d44d6f623ecc39efc4d4bf37b33a98b0fc4f6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 22 Jun 2018 19:49:45 +0000 Subject: [PATCH] Fixed the shared data problem that was crashing O'Grady. --- .../sparkd/orderman/actors/OrderStore.cpp | 104 +++++++++--------- .../sparkd/orderman/actors/ServiceBridge.cpp | 4 +- .../sparkd/orderman/actors/ServiceBridge.h | 4 +- .../actors/order_manager/OrderManager.cpp | 5 +- .../actors/order_manager/OrderServicesData.h | 1 - .../sparkd/orderman/events/StoredOrderEvent.h | 7 +- .../orderman/server/OrderServiceServer.cpp | 8 +- .../orderman/server/OrderServiceServer.h | 2 +- 8 files changed, 68 insertions(+), 67 deletions(-) diff --git a/src/server/sparkd/orderman/actors/OrderStore.cpp b/src/server/sparkd/orderman/actors/OrderStore.cpp index 2e5ce6e47..4927dc33e 100644 --- a/src/server/sparkd/orderman/actors/OrderStore.cpp +++ b/src/server/sparkd/orderman/actors/OrderStore.cpp @@ -1,10 +1,10 @@ #include "OrderStore.h" -#include "lib/utils/PBUtils.h" -#include "server/sparkd/persistence/SqliteStore.h" #include "lib/api/services/OrderService.pb.h" -#include "server/sparkd/orderman/events/StoredOrderEvent.h" +#include "lib/utils/PBUtils.h" #include "server/sparkd/orderman/events/OrderStateUpdateEvent.h" +#include "server/sparkd/orderman/events/StoredOrderEvent.h" +#include "server/sparkd/persistence/SqliteStore.h" #include @@ -13,74 +13,74 @@ namespace orderman { static auto const orders_ns = "orders"; -struct OrderStore::PImpl -{ - PImpl() : - known_orders(), - store(new persistence::SqliteStore("orders")), - order_stream() - {} +struct OrderStore::PImpl { + PImpl() + : known_orders(), store(new persistence::SqliteStore("orders")), + order_stream() {} const GatewayName gw_name; - std::unordered_map> known_orders; + std::unordered_map known_orders; std::unique_ptr store; mercury::Stream order_stream; }; -OrderStore::OrderStore () : me (new PImpl()) {} -OrderStore::~OrderStore () {} +OrderStore::OrderStore() : me(new PImpl()) {} +OrderStore::~OrderStore() {} -void OrderStore::init() -{ +void OrderStore::init() { api::orderman::OrderRecord rec; std::vector stored_batch; auto all = me->store->retrieve_all()[orders_ns]; - for (auto const &kvp : all) - if (utils::pb::from_string (kvp.second,&rec)) { + for (auto const &kvp : all) + if (utils::pb::from_string(kvp.second, + &rec)) { auto ok = OrderKey(std::stoi(kvp.first)); - auto order_record = std::make_unique (rec); - stored_batch.emplace_back(*order_record.get()); - me->known_orders[ok] = std::move(order_record); - } - else - LOG(OrderMan,Error, + stored_batch.emplace_back(rec); + me->known_orders[ok] = rec.state().created(); + } else + LOG(OrderMan, Error, "Could not recover order {} from storage. " - "This should be investigated", kvp.first); + "This should be investigated", + kvp.first); - me->order_stream = make_stream (); - LOG(OrderMan,Info, - "Order Store published {} orders recoved from disk", all.size()); - publish_batch(me->order_stream,stored_batch); - subscribe ([this] (auto const&ev) {this->on_order_state_update(ev);}); + me->order_stream = make_stream(); + LOG(OrderMan, Info, "Order Store published {} orders recoved from disk", + all.size()); + publish_batch(me->order_stream, stored_batch); + subscribe( + [this](auto const &ev) { this->on_order_state_update(ev); }); } -void OrderStore::on_order_state_update(mercury::Update const&u) -{ +void OrderStore::on_order_state_update( + mercury::Update const &u) { if (u.events) for (auto const &ev : *u.events) { - auto &ptr = me->known_orders[ev.key]; - auto new_order = !ptr; - if (new_order) { - ptr.reset (new api::orderman::OrderRecord()); - *ptr->mutable_def() = *ev.definition; - ptr->set_key(ev.key.value()); - ptr->set_parent_key(ev.parent_key.value()); - *ptr->mutable_state()->mutable_created() = utils::pb::pb_now(); - } - auto created = ptr->state().created(); - *ptr->mutable_state() = ev.state; - *ptr->mutable_state()->mutable_created() = created; - *ptr->mutable_state()->mutable_last_change() = utils::pb::pb_now(); - auto k = std::to_string(ptr->key()); - auto v = utils::pb::to_string(*ptr); - if (new_order) - me->store->insert(orders_ns,k,v); - else - me->store->update(orders_ns,k,v); - publish(me->order_stream,*ptr.get()); + api::orderman::OrderRecord order; + order.set_key(ev.key.value()); + order.set_parent_key(ev.parent_key.value()); + *order.mutable_def() = *ev.definition; + *order.mutable_state() = ev.state; + *order.mutable_state()->mutable_last_change() = utils::pb::pb_now(); + + auto it = me->known_orders.find(ev.key); + if (it == me->known_orders.end()) { + // new order + auto now = utils::pb::pb_now(); + me->known_orders[ev.key] = now; + *order.mutable_state()->mutable_created() = now; + me->store->insert(orders_ns, std::to_string(order.key()), + utils::pb::to_string(order)); + } else { + *order.mutable_state()->mutable_created() = it->second; + me->store->update(orders_ns, std::to_string(order.key()), + utils::pb::to_string(order)); + } + LOG(OrderMan, Diag, "Storing order {}", utils::pb::to_string(order)); + publish(me->order_stream, order); } } -}} +} // namespace orderman +} // namespace bts diff --git a/src/server/sparkd/orderman/actors/ServiceBridge.cpp b/src/server/sparkd/orderman/actors/ServiceBridge.cpp index 4a64ad451..873ec48df 100644 --- a/src/server/sparkd/orderman/actors/ServiceBridge.cpp +++ b/src/server/sparkd/orderman/actors/ServiceBridge.cpp @@ -92,10 +92,10 @@ void ServiceBridge::on(mercury::Update const &update) { bool was_ready = is_ready(); me->have_orders = true; - std::vector orders; + std::vector orders; orders.reserve(update.events->size()); for (auto ev : *(update.events)) { - me->known_orders.insert(OrderKey(ev.order_record->key())); + me->known_orders.insert(OrderKey(ev.order_record.key())); orders.push_back(ev.order_record); } me->on_orders(orders); diff --git a/src/server/sparkd/orderman/actors/ServiceBridge.h b/src/server/sparkd/orderman/actors/ServiceBridge.h index 6e817ae47..a3da34104 100644 --- a/src/server/sparkd/orderman/actors/ServiceBridge.h +++ b/src/server/sparkd/orderman/actors/ServiceBridge.h @@ -39,8 +39,8 @@ public: template using OnEv = std::function; using OnReady = std::function; - using OnOrders = std::function )>; - using OnFills = std::function )>; + using OnOrders = std::function const& )>; + using OnFills = std::function const&)>; ServiceBridge(OnReady const&, OnOrders const&, OnFills const&); void init() override; diff --git a/src/server/sparkd/orderman/actors/order_manager/OrderManager.cpp b/src/server/sparkd/orderman/actors/order_manager/OrderManager.cpp index 060d257be..3c8d5d754 100644 --- a/src/server/sparkd/orderman/actors/order_manager/OrderManager.cpp +++ b/src/server/sparkd/orderman/actors/order_manager/OrderManager.cpp @@ -6,6 +6,7 @@ #include "server/sparkd/orderman/actors/order_manager/OrderServicesData.h" #include "server/sparkd/orderman/events/NewAdminDataEvent.h" #include "server/sparkd/orderman/events/OrderManagerReadyEvent.h" +#include "server/sparkd/orderman/events/StoredOrderEvent.h" #include "server/sparkd/orderman/order_factory/OrderFactory.h" #include "server/sparkd/orderman/orders/Order.h" #include "server/sparkd/securities/ISecurityDB.h" @@ -96,8 +97,8 @@ void OrderManager::on_order_recovery( // recover orders from disk for (auto const &ev : *(update.events)) { auto &order = - me->services_data.order_factory.recover(*ev.order_record); - auto const &ostate = ev.order_record->state(); + me->services_data.order_factory.recover(ev.order_record); + auto const &ostate = ev.order_record.state(); OrderInfo oi{order, me->services_data}; auto serv_ptr = oi.order_services.get(); me->orders[order.key()] = std::move(oi); diff --git a/src/server/sparkd/orderman/actors/order_manager/OrderServicesData.h b/src/server/sparkd/orderman/actors/order_manager/OrderServicesData.h index 861429475..b594d3822 100644 --- a/src/server/sparkd/orderman/actors/order_manager/OrderServicesData.h +++ b/src/server/sparkd/orderman/actors/order_manager/OrderServicesData.h @@ -24,7 +24,6 @@ #include "server/sparkd/orderman/events/NewSecuritiesEvent.h" #include "server/sparkd/orderman/events/OrderStateUpdateEvent.h" #include "server/sparkd/orderman/events/OutFIXMsgEvent.h" -#include "server/sparkd/orderman/events/StoredOrderEvent.h" #include "server/sparkd/orderman/events/UpdateOrderEvent.h" #include "server/sparkd/orderman/limiter/Limiter.h" #include "server/sparkd/orderman/order_router/OrderRouter.h" diff --git a/src/server/sparkd/orderman/events/StoredOrderEvent.h b/src/server/sparkd/orderman/events/StoredOrderEvent.h index 285554ca9..e4eb0ce92 100644 --- a/src/server/sparkd/orderman/events/StoredOrderEvent.h +++ b/src/server/sparkd/orderman/events/StoredOrderEvent.h @@ -5,6 +5,7 @@ #include "lib/api/services/OrderService.pb.h" #include "server/sparkd/mercury/synopsis/MergeByKey.h" #include "lib/api/services/OrderService.pb.h" +#include "server/sparkd/mercury/events/Event.h" namespace bts { namespace orderman { @@ -14,10 +15,10 @@ class StoredOrderEvent : public mercury::Event public: using SynopsisPolicy = mercury::MergeByKey; - StoredOrderEvent(api::orderman::OrderRecord &record) : order_record(&record) {} + StoredOrderEvent(api::orderman::OrderRecord const &record) : order_record(record) {} - auto key() const {return order_record->key();} - api::orderman::OrderRecord *order_record; + auto key() const {return order_record.key();} + api::orderman::OrderRecord order_record; }; }} diff --git a/src/server/sparkd/orderman/server/OrderServiceServer.cpp b/src/server/sparkd/orderman/server/OrderServiceServer.cpp index 6062f03f8..332a84f0d 100644 --- a/src/server/sparkd/orderman/server/OrderServiceServer.cpp +++ b/src/server/sparkd/orderman/server/OrderServiceServer.cpp @@ -110,7 +110,7 @@ OrderServiceServer::~OrderServiceServer() { } void OrderServiceServer::on_orders( - std::vector const &orders) { + std::vector const &orders) { LOG(OrderMan, Info, "Received order update for publishing"); std::vector created; created.reserve(orders.size()); @@ -118,12 +118,12 @@ void OrderServiceServer::on_orders( updated.reserve(orders.size()); for (auto const &rec : orders) { - auto const &k = OrderKey(rec->key()); + auto const &k = OrderKey(rec.key()); if (me->known_orders.count(k) == 0) { me->known_orders.insert(k); - created.push_back(*rec); + created.push_back(rec); } else - updated.push_back(*rec); + updated.push_back(rec); } LOG(OrderMan, Info, diff --git a/src/server/sparkd/orderman/server/OrderServiceServer.h b/src/server/sparkd/orderman/server/OrderServiceServer.h index 2face24cb..14a03e1e6 100644 --- a/src/server/sparkd/orderman/server/OrderServiceServer.h +++ b/src/server/sparkd/orderman/server/OrderServiceServer.h @@ -27,7 +27,7 @@ public: private: struct PImpl; std::unique_ptr me; - void on_orders(std::vector const&); + void on_orders(std::vector const&); void on_fills (std::vector const&); };