diff --git a/src/server/sparkd/fix/DropCopySession.cpp b/src/server/sparkd/fix/DropCopySession.cpp index e171f832b..448bb20b2 100644 --- a/src/server/sparkd/fix/DropCopySession.cpp +++ b/src/server/sparkd/fix/DropCopySession.cpp @@ -66,13 +66,16 @@ void DropCopySession::fromApp(const FIX::Message &message,const FIX::SessionID & void DropCopySession::onMessage(const FIX44::OrderStatusRequest& req, const FIX::SessionID& s) { uint oid = atoi(req.getField(FIX::FIELD::OrderID).c_str()); - auto it = _order_cache.find(oid); - if(it != _order_cache.end()) + _order_cache.lock([&] (auto& order_cache) { - auto&& ostat = build_order_status(s, *it->second); - ostat.setField(FIX::FIELD::OrdStatusReqID, req.getField(FIX::FIELD::OrdStatusReqID)); - _router.send(ostat, s); - } + auto it = order_cache.find(oid); + if(it != order_cache.end()) + { + auto&& ostat = build_order_status(s, *it->second); + ostat.setField(FIX::FIELD::OrdStatusReqID, req.getField(FIX::FIELD::OrdStatusReqID)); + _router.send(ostat, s); + } + }); } void DropCopySession::onMessage(const FIX44::SecurityDefinitionRequest& req, const FIX::SessionID& s) @@ -132,13 +135,15 @@ void DropCopySession::subscribe_fills_and_orders(const FIX::SessionID sessionID) filtered_orders.subscribe([this, &sessionID](const auto& updatevec) { - std::lock_guard l(_lock); for(auto& update : updatevec) { for(auto& order : update.added()) { auto&& ostat = build_order_status(sessionID, *order); - _order_cache[order->key()] = order; + _order_cache.lock( [&order] (auto& order_cache) + { + order_cache[order->key()] = order; + }); _router.send(ostat, sessionID); } for(auto& order : update.changed()) @@ -177,7 +182,6 @@ void DropCopySession::subscribe_fills_and_orders(const FIX::SessionID sessionID) filtered_fills.subscribe([this, &sessionID](const auto& updatevec) { - std::lock_guard l(_lock); for(auto& update : updatevec) { for(auto& fill : update.added()) @@ -236,14 +240,18 @@ FIX44::ExecutionReport DropCopySession::build_fill(const FIX::SessionID& sess, FIX::OrdStatus status; uint filled = 0; uint leaves = 0; double prx = 0.0; api::orderman::NativeOrderState native; - auto orderit = _order_cache.find(fill.order_key()); - if(orderit != _order_cache.end()) + + _order_cache.lock([&] (auto& order_cache) { - const api::orderman::OrderRecord& order = *orderit->second; - process_order_state(order.state(), filled, leaves, prx, status, native); - if( ((double)order.state().quantity()) == fill.last_shares()) - exec = FIX::ExecType(FIX::ExecType_FILL); - } + auto orderit = order_cache.find(fill.order_key()); + if(orderit != order_cache.end()) + { + const api::orderman::OrderRecord& order = *orderit->second; + process_order_state(order.state(), filled, leaves, prx, status, native); + if( ((double)order.state().quantity()) == fill.last_shares()) + exec = FIX::ExecType(FIX::ExecType_FILL); + } + }); if (change) exec = FIX::ExecType(FIX::ExecType_TRADE_CORRECT); @@ -291,7 +299,55 @@ FIX44::ExecutionReport DropCopySession::build_fill(const FIX::SessionID& sess, FIX44::ExecutionReport DropCopySession::build_order_status(const FIX::SessionID& sess, const bts::api::orderman::OrderRecord& order, bool change ) { - return FIX44::ExecutionReport(); + auto exec = FIX::ExecType(FIX::ExecType_NEW); + _order_cache.lock( [&exec, &order] (auto& order_cache) + { + auto it = order_cache.find(order.key()); + if(it != order_cache.end()) + exec = FIX::ExecType(FIX::ExecType_ORDER_STATUS); + }); + + FIX::OrdStatus status; + uint filled = 0; uint leaves = 0; double prx = 0.0; + api::orderman::NativeOrderState native; + process_order_state(order.state(), filled, leaves, prx, status, native); + + auto sec = _router.lookup(order.def().security_key()); + FIX44::ExecutionReport report( + FIX::OrderID(std::to_string(order.key())), + FIX::ExecID("0"), + exec, + status, + FIX::Side(order.def().side() == bts::api::SIDE_BUY ? FIX::Side_BUY : FIX::Side_SELL), + FIX::LeavesQty(leaves), + FIX::CumQty(filled), + FIX::AvgPx(prx)); + + if(sec) + report.setField(FIX::Symbol(sec->symbol())); + report.setField(FIX::FIELD::Account, FIX::Account(order.def().account()).getString() ); + report.setField(FIX::FIELD::OrderQty, FIX::OrderQty(order.state().quantity()).getString() ); + report.setField(FIX::FIELD::Price, FIX::Price(order.state().price()).getString() ); + report.setField(FIX::FIELD::TimeInForce, FIX::TimeInForce((char)order.def().time_in_force()).getString() ); + auto ts = order.state().last_change(); + report.setField(FIX::FIELD::TransactTime, google::protobuf::util::TimeUtil::ToString(ts)); + + report.setField(FIX::FIELD::Text, FIX::Text(order.state().last_msg())); + sec = resolve_execution_report_security(sec, report); + if (native.exchange_order_id() != "") + { + report.setField(FIX::FIELD::OrdType, FIX::OrdType((char)native.native_type()).getString());; + report.setField(FIX::FIELD::SecondaryOrderID, FIX::SecondaryOrderID(native.exchange_order_id()).getString());; + } + //TODO Big race here, we need a correlation id of some sort + _fix_clorderids.lock([&order, &report] (auto& fix_clorderids) + { + auto fixit = fix_clorderids.find(order.key()); + if(fixit != fix_clorderids.end()) + report.setField(FIX::FIELD::ClOrdID, FIX::ClOrdID(fixit->second).getString()); + }); + return report; + } diff --git a/src/server/sparkd/fix/DropCopySession.h b/src/server/sparkd/fix/DropCopySession.h index 0f077f74b..9a100463e 100644 --- a/src/server/sparkd/fix/DropCopySession.h +++ b/src/server/sparkd/fix/DropCopySession.h @@ -48,7 +48,9 @@ protected: protected: bts::api::orderman::OrderService _orderservice; - std::unordered_map> _order_cache; + + utils::LockBox< std::unordered_map> > _order_cache; + utils::LockBox< std::unordered_map > _fix_clorderids; }; }} diff --git a/src/server/sparkd/fix/SessionBase.cpp b/src/server/sparkd/fix/SessionBase.cpp index 253ae439f..cfd562554 100644 --- a/src/server/sparkd/fix/SessionBase.cpp +++ b/src/server/sparkd/fix/SessionBase.cpp @@ -27,22 +27,25 @@ namespace fix { SessionBase::SessionBase(bts::api::ServiceContext& sc, IFixRouter& router, const FIX::SessionID& sess) : _authservice( sc.locate() ), _adminservice( sc.locate() ), - _admin_data(), - - _user_name(), - _token(), _router(router), _sess(sess), - _lock() + + _admin_data(), + _user_name(), + _token() { _adminobservable = _adminservice.subscribe_admin_data() | rxcpp::operators::map( [this](const auto& update) { - std::lock_guard l(_lock); bts_assert(update.all().size() == 1); - _admin_data = *update.all()[0]; - return std::shared_ptr(new AdminModelWrapper(_admin_data, _user_name) ); + + auto adata = _admin_data.lock( [&update] (auto& ad) + { + ad = *update.all()[0]; + return ad; + } ); + return std::shared_ptr(new AdminModelWrapper(adata, _user_name) ); //TODO RACE }); } @@ -293,7 +296,11 @@ FIX::OrdStatus SessionBase::translate_status(const bts::api::orderman::OrderStat uint SessionBase::lookup_account(const std::string& acct) { - auto a = admin::AdminServiceUtils::find_account(_admin_data, acct); + bts::api::admin::BTSAccount* a = nullptr; + _admin_data.lock( [&] (auto& ad) + { + a = admin::AdminServiceUtils::find_account(ad, acct); + }); if(a) return a->id(); else @@ -302,7 +309,11 @@ uint SessionBase::lookup_account(const std::string& acct) uint SessionBase::lookup_user(const std::string& user) { - auto u = admin::AdminServiceUtils::find_user(_admin_data, user); + bts::api::admin::BTSUser* u = nullptr; + _admin_data.lock( [&] (auto& ad) + { + u = admin::AdminServiceUtils::find_user(ad, user); + }); if(u) return u->id(); else diff --git a/src/server/sparkd/fix/SessionBase.h b/src/server/sparkd/fix/SessionBase.h index 771344929..14e8fcf3d 100644 --- a/src/server/sparkd/fix/SessionBase.h +++ b/src/server/sparkd/fix/SessionBase.h @@ -10,8 +10,8 @@ #include "lib/api/services/AdminService.client.pb.h" #include "lib/api/services/OrderService.pb.h" #include "lib/api/services/OrderService.client.pb.h" - #include "lib/domain_model/Security.pb.h" +#include "lib/utils/LockBox.h" #include @@ -72,15 +72,13 @@ protected: protected: bts::api::user::AuthService _authservice; bts::api::admin::AdminService _adminservice; - - bts::api::admin::AdminData _admin_data; rxcpp::observable> _adminobservable; - - std::string _user_name; - bts::api::AuthToken _token; IFixRouter& _router; const FIX::SessionID& _sess; - std::recursive_mutex _lock; + + utils::LockBox _admin_data; + std::string _user_name; + bts::api::AuthToken _token; }; }}