From d23a072ad6d835a23aaaa3ec246415582b97d2ba Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 26 Sep 2019 18:27:41 -0400 Subject: [PATCH] rx --- src/server/sparkd/fix/DropCopySession.cpp | 26 +++++++++++++---------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/server/sparkd/fix/DropCopySession.cpp b/src/server/sparkd/fix/DropCopySession.cpp index 4a8147fa7..cc9c527d7 100644 --- a/src/server/sparkd/fix/DropCopySession.cpp +++ b/src/server/sparkd/fix/DropCopySession.cpp @@ -111,18 +111,22 @@ void DropCopySession::subscribe_fills_and_orders(const FIX::SessionID sessionID) auto orders = _orderservice.subscribe_orders() | rxcpp::operators::buffer_with_time( std::chrono::milliseconds(500) ); - // auto admin = _adminobservable | - // rxcpp::operators::combine_latest([] (auto& admin, auto& order) - // { - // return std::make_pair(admin, order); - // }, orders) | - // rxcpp::operators::filter([] (const auto& pair) - // { - // //return pair.first.can_view_account(pair.second.def().account()); - // return true; - // }); + auto admin = _adminobservable.combine_latest(orders) + .filter( [] (auto& tuple) + { + return true; + }); + // rxcpp::operators::combine_latest([] (auto& admin, auto& order) + // { + // return std::make_pair(admin, order); + // }, orders); + // rxcpp::operators::filter([] (auto& pair) + // { + // return pair.first->can_view_account(pair.second.def().account()); + // //return true; + // }); - orders.subscribe([this](const auto& update) + admin.subscribe([this](const auto& update) { std::lock_guard l(_lock);