diff --git a/src/lib/orderman/OrderServiceServer.cpp b/src/lib/orderman/OrderServiceServer.cpp index 858947f9f..111b65b88 100644 --- a/src/lib/orderman/OrderServiceServer.cpp +++ b/src/lib/orderman/OrderServiceServer.cpp @@ -445,7 +445,8 @@ void OrderServiceServer::_on_exchange_position( for (const auto &p : ev.position.total_exchange_positions) { bts::api::orderman::RetrievedExchangePosition ret_pos = {}; std::string id = p.exchange_sec_desc + "_" + - bts::api::Venue_Name(ev.position.exchange); + bts::api::Venue_Name(ev.position.exchange) + "_" + + p.account_name; ret_pos.set_record_id(id); ret_pos.set_security_key(p.security == nullptr ? 0 : p.security->id()); ret_pos.set_security_resolved(p.security != nullptr); diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp index 5cdeb699f..a2bc1b5ab 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -422,11 +422,12 @@ void EmMDListener::on_order_update( order_state.exchange_order_state); // these are all logs LOG(OrderMan, Info, - "IEMOrderMuxer::on_order_update tid: {} ec.value: {} ec.message: {} " - "key: {} " - "exchange_key: {} status: {} pr: {} qty: {} filled_pr: {} fills: {} " - "n_trades: {}", - os::get_thread_id(), ec.value(), ec.message(), order_key.value(), + "IEMOrderMuxer::on_order_update tid: {} key: {} sub_acct_idx: {} " + "ec.value: {} ec.message: {} update_type: {} exchange_key: {} status: " + "{} pr: {} qty: {} filled_pr: {} fills: {} n_trades: {}", + os::get_thread_id(), order_key.value(), order_state.subaccount_index, + ec.value(), ec.message(), + static_cast(order_state.order_update_type), exchange_order_state.exchange_order_id, static_cast(order_state.order_status), order_state.px.to_double(), extract_qty(order_state.qty), order_state.avg_price.to_double(), diff --git a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h b/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h index d02168f73..9590cfbe4 100644 --- a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h +++ b/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h @@ -19,13 +19,14 @@ struct EMPosition { // This is the order data passed by the EmMDListener via the order_update_cb struct EMOrderState { size_t n_cbs = 0; - double order_px; + emumba::order_entry::status status; // copied directly + double order_px; // copied only when qty > 0 (might not ne needed anymore) double order_qty; + // these are all computed from the fills double total_fills = 0; double avg_filled_price = 0; double last_filled_qty = 0; double last_filled_price = 0; - emumba::order_entry::status status; boost::container::small_vector trades; static bool eq(double d1, double d2) { @@ -36,21 +37,21 @@ struct EMOrderState { return std::get(qty.value()); } - emumba::order_entry::order_state update( - const emumba::order_entry::order_state &o_state) { + void update(const emumba::order_entry::order_state &o_state) { using namespace emumba::market_data; using namespace emumba::order_entry; n_cbs++; status = o_state.order_status; + if (!eq(extract_qty(o_state.qty), 0)) { + order_px = o_state.px.to_double(); + order_qty = extract_qty(o_state.qty); + } else { + LOG(OrderMan, Error, + "EMOrderState::update ZERO qty, px, qty not copied"); + } last_filled_qty = 0; last_filled_price = 0; trades.clear(); - if (!eq(extract_qty(o_state.qty), 0)) { - // TODO - // right now EM generates 0 qty updates, that is ignored - order_px = o_state.px.to_double(); - order_qty = extract_qty(o_state.qty); - } // all fill data is derived from trades instead of order_state's fill data // (for historic reasons). we do log an error if they're off if (!o_state.trades.empty()) { @@ -67,19 +68,12 @@ struct EMOrderState { } if (!eq(total_fills, extract_qty(o_state.total_fills)) || !eq(avg_filled_price, o_state.avg_price.to_double())) { - LOG(OrderMan, Error, + LOG(OrderMan, Warn, "EMOrderState::order_state discrepency total_fills: {} != {} " "avg_filled_px: {} != {}", total_fills, extract_qty(o_state.total_fills), avg_filled_price, o_state.avg_price.to_double()); } - order_state rv; - rv = o_state; - rv.qty = quantity(order_qty); - rv.total_fills = quantity(total_fills); - rv.px = price(order_px); - rv.avg_price = price(avg_filled_price); - return rv; } };