From 44369bae431c8a6d8d3f843a7e81e3ea3e46c27c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 28 Dec 2018 22:13:38 +0000 Subject: [PATCH 001/218] Some work on supporting full order updates. --- src/lib/api/services/OrderService.proto | 33 +++- src/lib/orderman/actors/FillStore.cpp | 141 +++++++++--------- src/lib/orderman/actors/FillStore.h | 4 +- src/lib/orderman/actors/OrderStore.cpp | 72 +++++---- src/lib/orderman/actors/OrderStore.h | 3 + src/lib/orderman/actors/ServiceBridge.cpp | 3 +- .../actors/order_manager/OrderManager.cpp | 30 ++-- .../actors/order_manager/OrderServices.h | 13 +- .../actors/order_manager/OrderServicesData.h | 2 + .../events/OrderDefinitionUpdateEvent.h | 25 ++++ .../orderman/events/OrderStateUpdateEvent.h | 5 +- src/lib/orderman/events/UpdateOrderEvent.h | 20 ++- src/lib/orderman/orders/DynamicOrder.cpp | 4 - src/lib/orderman/orders/DynamicOrder.h | 1 - src/lib/orderman/orders/IcebergOrder.h | 2 +- src/lib/orderman/orders/NativeOrder.h | 2 +- src/lib/orderman/orders/Order.cpp | 2 + src/lib/orderman/orders/Order.h | 3 +- src/lib/orderman/orders/TimeBoxOrder.h | 2 +- src/lib/orderman/orders/TriggerOrder.h | 2 +- src/lib/orderman/orders/book_algos/BookAlgo.h | 2 +- .../orders/spreader_orders/SpreaderOrder.cpp | 19 +-- .../orders/spreader_orders/SpreaderOrder.h | 4 +- .../spreader_orders/tests/tests_common.h | 2 +- 24 files changed, 234 insertions(+), 162 deletions(-) create mode 100644 src/lib/orderman/events/OrderDefinitionUpdateEvent.h diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 8c9a00de1..5e396c5d4 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -12,11 +12,21 @@ service OrderService { option (bts.api.service_description)="Implements order management"; // service calls - rpc create_order(Create) returns (Response) { option(skip_excel_generation) = true; }; - rpc cancel_order(Cancel) returns (Response) { option(skip_excel_generation) = true; }; - rpc update_order(Update) returns (Response) { option(skip_excel_generation) = true; }; - rpc crack_order(Crack) returns (Response) { option(skip_excel_generation) = true; }; - rpc get_registered_dynamic_order_types(bts.api.VoidMessage) returns (RegisteredDynamicOrderTypes); + rpc create_order(Create) returns (Response) + { option(skip_excel_generation) = true; }; + + rpc cancel_order(Cancel) returns (Response) + { option(skip_excel_generation) = true; }; + + rpc update_order(Update) returns (Response) + { option(skip_excel_generation) = true; }; + + rpc crack_order(Crack) returns (Response) + { option(skip_excel_generation) = true; }; + + rpc get_registered_dynamic_order_types(bts.api.VoidMessage) + returns (RegisteredDynamicOrderTypes); + // streams rpc orders (OrdersSub) returns (stream OrderRecord); @@ -24,8 +34,17 @@ service OrderService { } // request types -message Create {OrderDefinition new_order = 1;double price = 2; uint32 quantity = 3;} -message Update {uint32 order_key = 1; double price = 2; uint32 quantity = 3;} +message Create { + OrderDefinition new_order = 1; + double price = 2; + uint32 quantity = 3; +} +message Update { + CustomOrderDefinition custom = 4; + double price = 2; + uint32 quantity = 3; + uint32 order_key = 1; +} message Cancel {uint32 order_key = 1;}; message Crack {uint32 order_key = 1;}; diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index a7d2fab18..f74b60549 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -3,7 +3,7 @@ #include "lib/orderman/actors/SODPosition.h" #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" +#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" #include "lib/orderman/events/StoredFillEvent.h" #include "lib/persistence/SqliteStore.h" #include "lib/utils/PBUtils.h" @@ -30,8 +30,7 @@ struct FillStore::PImpl { State state; std::unique_ptr store; std::unordered_set known_fills; - std::unordered_map - known_orders; + std::unordered_map known_orders; std::unordered_map fills_with_unresolved_accounts; mercury::Stream fill_stream; mercury::Actor::SubHandle stored_sec_sub; @@ -43,72 +42,75 @@ FillStore::FillStore() : me(new PImpl()) {} void FillStore::init() { me->state = State::WAIT_SEC; - me->stored_sec_sub = subscribe([this]( - auto const &update) { - if (update.events) { - if (me->state == State::WAIT_SEC) { + me->stored_sec_sub = + subscribe([this](auto const &update) { + if (update.events) { + if (me->state == State::WAIT_SEC) { - LOG(OrderMan, Info, - "Fill store received initial list of {} securities", - update.events->size()); + LOG(OrderMan, Info, + "Fill store received initial list of {} securities", + update.events->size()); - // don't need securities anymore, NewExecutionReportEvent - // events will carry the security with them - unsubscribe(me->stored_sec_sub); + // don't need securities anymore, NewExecutionReportEvent + // events will carry the security with them + unsubscribe(me->stored_sec_sub); - // Subscribe to NewExecutionReportEvent for new fills - subscribe( - [this](auto const &ev) { this->on_execution_report(ev); }); + // Subscribe to NewExecutionReportEvent for new fills + subscribe( + [this](auto const &ev) { this->on_execution_report(ev); }); - // index securities - std::map sec_idx; - for (auto const &ev : *(update.events)) { - auto sec_ptr = ev.security; - sec_idx[SecurityKey(sec_ptr->id())] = sec_ptr; - } + // index securities + std::map sec_idx; + for (auto const &ev : *(update.events)) { + auto sec_ptr = ev.security; + sec_idx[SecurityKey(sec_ptr->id())] = sec_ptr; + } - // Load stored fills, resolve their securities and publish the lot - api::orderman::Fill fill; - std::vector stored_batch; - LOG(persist, Info, "Loading load all fills"); - auto all = me->store->retrieve_all()[fills_ns]; - LOG(persist, Info, "Finished loading all {} fills", all.size()); - for (auto const &kvp : all) - if (utils::pb::from_string(kvp.second, - &fill)) { + // Load stored fills, resolve their securities and publish the + // lot + api::orderman::Fill fill; + std::vector stored_batch; + LOG(persist, Info, "Loading load all fills"); + auto all = me->store->retrieve_all()[fills_ns]; + LOG(persist, Info, "Finished loading all {} fills", all.size()); + for (auto const &kvp : all) + if (utils::pb::from_string(kvp.second, + &fill)) { - auto sec = sec_idx[SecurityKey(fill.security_key())]; - if (sec) { - auto fk = kvp.first; - if (!me->sod_pos_map.add_fill_to_sod_pos(fill)) - stored_batch.emplace_back(fill, *sec); - me->known_fills.insert(fk); - } else - LOG(persist, Diag, - "Stored fill {} contains unresolved security {}. ", - kvp.first, fill.security_key()); - } else - LOG(persist, Error, - "Could not recover fill {} from storage. " - "This should be investigated", - kvp.first); - me->fill_stream = make_stream(); - LOG(OrderMan, Info, - "Fill Store published {} fills recoved from disk out of {} " - "total fills", - stored_batch.size(), all.size()); - me->sod_pos_map.add_sod_pos_as_fill_events(stored_batch, sec_idx); - publish_batch(me->fill_stream, stored_batch); + auto sec = sec_idx[SecurityKey(fill.security_key())]; + if (sec) { + auto fk = kvp.first; + if (!me->sod_pos_map.add_fill_to_sod_pos(fill)) + stored_batch.emplace_back(fill, *sec); + me->known_fills.insert(fk); + } else + LOG(persist, Diag, + "Stored fill {} contains unresolved security {}. ", + kvp.first, fill.security_key()); + } else + LOG(persist, Error, + "Could not recover fill {} from storage. " + "This should be investigated", + kvp.first); + me->fill_stream = make_stream(); + LOG(OrderMan, Info, + "Fill Store published {} fills recoved from disk out of {} " + "total fills", + stored_batch.size(), all.size()); + me->sod_pos_map.add_sod_pos_as_fill_events(stored_batch, + sec_idx); + publish_batch(me->fill_stream, stored_batch); - // subscribe to order updates so we can resolve - // account ids for future execution reports - subscribe( - [this](auto const &ev) { this->on_order_state_update(ev); }); + // subscribe to order updates so we can resolve + // account ids for future execution reports + subscribe([this](auto const &ev) { + this->on_order_definition_update(ev); + }); - me->state = State::READY; - } - } - }); + me->state = State::READY; + } + } + }); } FillStore::~FillStore() {} @@ -145,10 +147,11 @@ void FillStore::on_execution_report( fill.mutable_timestamp()->set_seconds(tv.tv_sec); fill.mutable_timestamp()->set_nanos(tv.tv_usec * 1000); - auto order_def = me->known_orders[er.order_key]; - if (order_def) - fill.set_account(order_def->account()); - else + auto it = me->known_orders.find(er.order_key); + if (it != me->known_orders.end()) { + auto &order_def = it->second; + fill.set_account(order_def.account()); + } else me->fills_with_unresolved_accounts[er.order_key] .fills.push_back(fill); @@ -164,17 +167,17 @@ void FillStore::on_execution_report( } // if u.events } -void FillStore::on_order_state_update( - mercury::Update const &u) { +void FillStore::on_order_definition_update( + mercury::Update const &u) { if (u.events) for (auto const &ev : *u.events) { - me->known_orders[ev.key] = ev.definition; + me->known_orders[ev.key] = ev.def; // see if we can resolve the accounts for any fills that we // might have already received for this order auto &unresolved_fills = me->fills_with_unresolved_accounts[ev.key]; for (auto &f : unresolved_fills.fills) { - f.set_account(ev.definition->account()); + f.set_account(ev.def.account()); auto fv = utils::pb::to_string(f); me->store->update(fills_ns, f.fill_key(), fv); publish(me->fill_stream, f, *unresolved_fills.security); diff --git a/src/lib/orderman/actors/FillStore.h b/src/lib/orderman/actors/FillStore.h index 7d1c7b909..732559cda 100644 --- a/src/lib/orderman/actors/FillStore.h +++ b/src/lib/orderman/actors/FillStore.h @@ -6,7 +6,7 @@ namespace bts { namespace orderman { class NewExecutionReportEvent; -class OrderStateUpdateEvent; +class OrderDefinitionUpdateEvent; // Listens for fill execution reports published by fix gateways, // republishing them as StoredFillEvent events and storing those on @@ -25,7 +25,7 @@ private: std::unique_ptr me; void on_execution_report(const mercury::Update &); - void on_order_state_update(mercury::Update const&); + void on_order_definition_update(mercury::Update const&); }; }} diff --git a/src/lib/orderman/actors/OrderStore.cpp b/src/lib/orderman/actors/OrderStore.cpp index db6dd64b4..8f07f0cec 100644 --- a/src/lib/orderman/actors/OrderStore.cpp +++ b/src/lib/orderman/actors/OrderStore.cpp @@ -7,6 +7,7 @@ #include "lib/orderman/actors/SODPosition.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" +#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" #include "lib/orderman/events/StoredOrderEvent.h" #include "lib/persistence/SqliteStore.h" #include "lib/utils/PBUtils.h" @@ -29,7 +30,7 @@ struct OrderStore::PImpl { State state; const GatewayName gw_name; - std::unordered_map known_orders; + std::unordered_map known_orders; std::unique_ptr store; mercury::Stream order_stream; mercury::Actor::SubHandle stored_sec_sub; @@ -55,9 +56,12 @@ void OrderStore::init() { // batch so we can filter out orders on expired securities unsubscribe(me->stored_sec_sub); - // subscribe to order updates so we can store them + // subscribe to order state and order definition updates so + // we publish newly created order records subscribe( [this](auto const &ev) { this->on_order_state_update(ev); }); + subscribe( + [this](auto const &ev) { this->on_order_definition_update(ev); }); // index securities std::map sec_idx; @@ -93,7 +97,7 @@ void OrderStore::init() { } else { if (!_order_cutoff(rec)) stored_batch.emplace_back(rec); - me->known_orders[ok] = rec.state(); + me->known_orders[ok] = rec; } } else LOG(OrderMan, Error, @@ -115,35 +119,49 @@ void OrderStore::init() { void OrderStore::on_order_state_update( mercury::Update const &u) { + + std::set modified_orders; if (u.events) for (auto const &ev : *u.events) { - 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.rebuild_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(); - *order.mutable_state()->mutable_created() = now; - me->known_orders[ev.key] = order.state(); - me->store->insert(orders_ns, std::to_string(order.key()), - utils::pb::to_string(order)); - } else { - // existing order - auto &existing_state = it->second; - existing_state.MergeFrom(order.state()); - *order.mutable_state() = existing_state; - me->store->update(orders_ns, std::to_string(order.key()), - utils::pb::to_string(order)); + auto &rec = me->known_orders[ev.key]; + rec.set_key(ev.key.value()); + rec.set_parent_key(ev.parent_key.value()); + modified_orders.insert(ev.key); + if (rec.has_state()) + rec.mutable_state()->MergeFrom(ev.rebuild_state()); + else { + *rec.mutable_state()->mutable_created() = utils::pb::pb_now(); + *rec.mutable_state() = ev.rebuild_state(); } - LOG(OrderMan, Diag, "Storing order {}", utils::pb::to_string(order)); - publish(me->order_stream, order); + *rec.mutable_state()->mutable_last_change() = utils::pb::pb_now(); } + store_and_publish_if_complete(modified_orders); +} + +void OrderStore::on_order_definition_update( + mercury::Update const &u) { + + std::set modified_orders; + if (u.events) + for (auto const &ev : *u.events) { + auto &rec = me->known_orders[ev.key]; + rec.set_key(ev.key.value()); + *rec.mutable_def() = ev.def; + modified_orders.insert(ev.key); + } + store_and_publish_if_complete(modified_orders); +} + +void OrderStore::store_and_publish_if_complete(std::set const&changed) +{ + std::vector stored_batch; + for (auto k : changed) { + auto &rec = me->known_orders[k]; + if (rec.has_def() && rec.has_state()) + stored_batch.emplace_back(rec); + } + publish_batch(me->order_stream,stored_batch); } bool OrderStore::_order_cutoff(const api::orderman::OrderRecord &rec) { diff --git a/src/lib/orderman/actors/OrderStore.h b/src/lib/orderman/actors/OrderStore.h index 535a6cc24..0e766f056 100644 --- a/src/lib/orderman/actors/OrderStore.h +++ b/src/lib/orderman/actors/OrderStore.h @@ -8,6 +8,7 @@ namespace bts { namespace api {namespace orderman {class OrderRecord;}} namespace orderman { class OrderStateUpdateEvent; +class OrderDefinitionUpdateEvent; // listens for OrderStateUpdateEvent events and maps them to // StoredOrderEvent events, storing them to disk in the process. On @@ -25,7 +26,9 @@ private: std::unique_ptr me; bool _order_cutoff(const api::orderman::OrderRecord& rec); + void store_and_publish_if_complete(std::set const&); void on_order_state_update(mercury::Update const&ev); + void on_order_definition_update(mercury::Update const&ev); }; }} diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 62a5ba336..d067406bf 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -177,8 +177,7 @@ ServiceBridge::update_order(api::orderman::Update const &c) { auto ok = OrderKey(c.order_key()); r.set_order_key(c.order_key()); if (me->known_orders.count(ok)) { - publish(me->update_order_pub, ok, Price(c.price()), - Quantity(c.quantity())); + publish(me->update_order_pub,c); r.set_error_code(api::orderman::ORDER_ERROR_OK); } else r.set_error_code(api::orderman::ORDER_ERROR_UNKNOWN_ORDER); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index d65304712..da1f3f683 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -32,7 +32,7 @@ enum class OrderManager::State { struct OrderManager::PImpl { PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l) - : state(State::WAIT_ADMIN), services_data(owner, b, l) {} + : state(State::WAIT_ADMIN), services_data(owner, b, l) {} State state; std::unordered_map orders; @@ -75,7 +75,7 @@ void OrderManager::on_securities( const mercury::Update &update) { // forward to execution gateways - for (auto &osd : me->services_data.sessions) + for (auto &osd : me->services_data.sessions) osd->gw.on_securities(update); if (update.events) { @@ -211,8 +211,12 @@ void OrderManager::on_update_order(const mercury::Update &m) { for (auto const &ev : *m.events) { auto k = ev.key(); auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second->on_update(ev.price, ev.quantity, ev.trace); + if (it != me->orders.end()) { + if (ev.is_full_update()) + it->second->on_update(ev.full_update(),trace::CorID{}); + else + it->second->on_update(Price(ev.price()),Quantity(ev.quantity()),trace::CorID{}); + } else { LOG(OrderMan, Error, "Received an update request for an unknown order {}. " @@ -357,20 +361,20 @@ void OrderManager::init_order_services() { // reject evets auto s_ptr = s.get(); s->exe_report_pub = make_stream(gw_name); - s->gw.on_exe_report() = [s_ptr,this] (auto const &er, auto const &t) { - publish(s_ptr->exe_report_pub, &er,t); + s->gw.on_exe_report() = [s_ptr, this](auto const &er, auto const &t) { + publish(s_ptr->exe_report_pub, &er, t); }; s->gw_status_change_pub = make_stream(gw_name); - s->gw.on_gw_status_change() = [s_ptr,this,gw_name] (bool b) { - publish(s_ptr->gw_status_change_pub, gw_name,b); + s->gw.on_gw_status_change() = [s_ptr, this, gw_name](bool b) { + publish(s_ptr->gw_status_change_pub, gw_name, b); }; s->cancel_reject_pub = make_stream(gw_name); - s->gw.on_cancel_reject() = [s_ptr,this] (auto const &k,auto const&msg) { - publish(s_ptr->cancel_reject_pub, k,msg); + s->gw.on_cancel_reject() = [s_ptr, this](auto const &k, auto const &msg) { + publish(s_ptr->cancel_reject_pub, k, msg); }; // handlers are ready so we can start processing fix events s->gw.start(); - + reload_fix_buffer(*s); } @@ -401,7 +405,9 @@ void OrderManager::init_order_services() { me->services_data.settlement_request_pub = make_stream(); me->services_data.report_order_state_pub = - make_stream(); + make_stream(); + me->services_data.report_order_definition_pub = + make_stream(); me->pub_ready = make_stream(); // md subs are peculiar in that we try to make them on demand, so diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 8ec490563..66c522e59 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -157,12 +157,16 @@ class OrderServices { { return trace::ScopedPerfLogEntry(_data->log,cid,entry_kind,uint64_1,txt_1,uint32_1); } + + void report_definition(const api::orderman::OrderDefinition &def) { + _data->owner.publish(_data->report_order_definition_pub, _owner->key(),def); + } void report_state(const api::orderman::OrderState &state, trace::CorID const &trace = trace::CorID()) { OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), - _owner->definition(), state, trace); + state, trace); _data->owner.publish(_data->report_order_state_pub, ev); if (orderman::in_terminal_state(state.status())) { @@ -196,7 +200,11 @@ class OrderServices { using BookSubID = EventStream::SubID; template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { return _book_updates.sub( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); + k, [this, cb](auto const &ev) { + + this->on_external_event(ev, cb); + + }); } void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } @@ -343,6 +351,7 @@ class OrderServices { } bool _busy; + trace::CorID corid; boost::container::small_vector, 10> _pending_calls; Order *_owner; diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 06fe8bca2..20728b34d 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -30,6 +30,7 @@ #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/utils/datetime.h" +#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" #include @@ -96,6 +97,7 @@ class OrderServicesData { mercury::Stream md_request_pub; mercury::Stream settlement_request_pub; mercury::Stream report_order_state_pub; + mercury::Stream report_order_definition_pub; mercury::TimerEvent last_timer_ev; std::vector> sessions; diff --git a/src/lib/orderman/events/OrderDefinitionUpdateEvent.h b/src/lib/orderman/events/OrderDefinitionUpdateEvent.h new file mode 100644 index 000000000..cae95b3bb --- /dev/null +++ b/src/lib/orderman/events/OrderDefinitionUpdateEvent.h @@ -0,0 +1,25 @@ +#pragma once + +#include "lib/mercury/events/Event.h" +#include "lib/api/services/OrderService.pb.h" +#include "lib/tracing/PerfLog.h" + +#include + +namespace bts { +namespace orderman { + +class OrderDefinitionUpdateEvent: public mercury::Event { + public: + using SynopsisPolicy = mercury::CacheAll; + + OrderDefinitionUpdateEvent(OrderKey k, api::orderman::OrderDefinition const&def) + : key(k), def(def) + {} + + OrderKey key; + api::orderman::OrderDefinition def; +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 678b5f9c9..1fc5de8b7 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -13,10 +13,9 @@ class OrderStateUpdateEvent : public mercury::Event { public: using SynopsisPolicy = mercury::CacheAll; OrderStateUpdateEvent(OrderKey key, OrderKey parent_key, - api::orderman::OrderDefinition const &def, api::orderman::OrderState const &state, trace::CorID const &trace = trace::CorID()) - : key(key), parent_key(parent_key), trace(trace), definition(&def) { + : key(key), parent_key(parent_key), trace(trace) { status = state.status(); price = state.price(); @@ -63,8 +62,6 @@ class OrderStateUpdateEvent : public mercury::Event { api::orderman::NativeOrderType native_type; mercury::TimeStampStr last_transact_time; - api::orderman::OrderDefinition const *definition; - api::orderman::OrderState rebuild_state() const { api::orderman::OrderState result; result.set_status(status); diff --git a/src/lib/orderman/events/UpdateOrderEvent.h b/src/lib/orderman/events/UpdateOrderEvent.h index c514c9649..f2037d80a 100644 --- a/src/lib/orderman/events/UpdateOrderEvent.h +++ b/src/lib/orderman/events/UpdateOrderEvent.h @@ -14,21 +14,19 @@ class UpdateOrderEvent : public mercury::Event public: using SynopsisPolicy = mercury::NoSynopsis; - UpdateOrderEvent (OrderKey k, Price p, Quantity q) : - k(k), price(p), quantity(q), trace() - {} - - UpdateOrderEvent (OrderKey k, Price p, Quantity q,trace::CorID const&trace) : - k(k), price(p), quantity(q), trace(trace) + UpdateOrderEvent (api::orderman::Update const&update) : + _update(update) {} // used by ContentSubscription - OrderKey key() const {return k;} + OrderKey key() const {return OrderKey(_update.order_key());} + Price price() const {return Price(_update.price());} + Quantity quantity() const {return Quantity(_update.quantity());} + bool is_full_update() const {return _update.has_custom();} + api::orderman::Update const &full_update() const {return _update;} - OrderKey k; - Price price; - Quantity quantity; - trace::CorID trace; +private: + api::orderman::Update _update; }; }} diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index df6670c3f..1bad1d602 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -19,10 +19,6 @@ DynamicOrder::DynamicOrder() : me(new PImpl()) {} DynamicOrder::~DynamicOrder() {} -api::orderman::OrderDefinition const &DynamicOrder::definition() const { - return me->def; -} - void DynamicOrder::on_init_new(api::orderman::OrderDefinition const &def, const PreActivationOrderServices &) { me->def = def; diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib/orderman/orders/DynamicOrder.h index d346b6b5c..d9abcd130 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib/orderman/orders/DynamicOrder.h @@ -14,7 +14,6 @@ class DynamicOrder : public Order public: DynamicOrder(); ~DynamicOrder(); - api::orderman::OrderDefinition const&definition() const override; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index c0b3f8ceb..1c4772f44 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -15,7 +15,7 @@ class IcebergOrder : public Order public: IcebergOrder(); ~IcebergOrder(); - api::orderman::OrderDefinition const&definition() const override; + api::orderman::OrderDefinition const&definition() const ; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 88c040a58..3f07d7961 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -19,7 +19,7 @@ public: NativeOrder(); ~NativeOrder() override; - api::orderman::OrderDefinition const &definition() const override; + api::orderman::OrderDefinition const &definition() const ; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index a25ba3779..8abb9185c 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -21,5 +21,7 @@ void Order::init_order_services(OrderServicesData &osd,OrderServices &parent) Order::~Order() {} +void Order::on_update(api::orderman::Update const&, trace::CorID const&) {} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index eebcea1bf..54734a947 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -37,8 +37,6 @@ class Order { OrderKey key() const { return _key; } OrderKey parent_key() const { return _parent_key; } - virtual api::orderman::OrderDefinition const &definition() const = 0; - // construction - can be slow virtual void on_init_new(api::orderman::OrderDefinition const &, const PreActivationOrderServices &) = 0; @@ -50,6 +48,7 @@ class Order { // order is running, maintenance virtual void on_update(Price, Quantity, trace::CorID const&) = 0; + virtual void on_update(api::orderman::Update const&, trace::CorID const&) ; virtual void on_crack(trace::CorID const&) = 0; virtual void on_cancel(trace::CorID const&) = 0; diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index 9475a5a37..0546f4900 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -14,7 +14,7 @@ class TimeBoxOrder : public Order public: TimeBoxOrder(); ~TimeBoxOrder(); - api::orderman::OrderDefinition const&definition() const override; + api::orderman::OrderDefinition const&definition() const ; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index a62c82cba..263d42d99 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -49,7 +49,7 @@ enum CancelMode{ public: TriggerOrder(); ~TriggerOrder(); - api::orderman::OrderDefinition const& definition() const override; + api::orderman::OrderDefinition const& definition() const ; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 689bb1da0..49e58d496 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -19,7 +19,7 @@ class BookAlgo : public Order public: BookAlgo(); virtual ~BookAlgo(); - const api::orderman::OrderDefinition& definition() const override; + const api::orderman::OrderDefinition& definition() const ; void on_init_new(const api::orderman::OrderDefinition&, const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 35db07ad6..1edfc90cd 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -125,7 +125,6 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ _order_services->log_scope(ord_ev.trace, "SpreaderOrder::_on_child_order_update", key().value()); - SecurityKey sec_key = SecurityKey(ord_ev.definition->security_key()); OrderKey order_key = ord_ev.key; bts::api::orderman::OrderStatus status = ord_ev.status; @@ -134,9 +133,9 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ order_price=Price(ord_ev.price); if (!SpreaderUtils::order_acknowledged(status)){ LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update, unack'ed " - "callback for key:{} sec_key:{} order_key:{} " + "callback for key:{} order_key:{} " "status:{} ignoring", - key(), sec_key, order_key, status); + key(), order_key, status); bts_assert(filled_qty.value() == 0); return; } @@ -146,11 +145,10 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ ChildOrderError order_error = _get_order_error (ord_ev, leg_data.quoter().expecting_cancel_update()); LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " - "key:{} sec_key:{} state:{} order_key:{} status:{} " + "key:{} state:{} order_key:{} status:{} " "filled_qty:{} price:{} last_price:{} " "msg:{} child_order_error:{}", - key(), sec_key, - static_cast(_state_worker->state()), order_key, status, + key(), static_cast(_state_worker->state()), order_key, status, filled_qty, order_price, last_price, ord_ev.last_msg, static_cast(order_error)); leg_data.order_update_message().on_order_update(ord_ev); @@ -177,11 +175,10 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ ChildOrderError order_error = _get_order_error (ord_ev, hedger->expecting_cancel_update()); LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger " - "key:{} sec_key:{} state:{} order_key:{} status:{} " + "key:{} state:{} order_key:{} status:{} " "filled_qty:{} price:{} last_price:{} " "msg:{} child_order_error:{}", - key(), sec_key, - static_cast(_state_worker->state()), order_key, status, + key(), static_cast(_state_worker->state()), order_key, status, filled_qty, order_price, last_price, ord_ev.last_msg, static_cast(order_error)); hedger->order_state().on_order_update(ord_ev); @@ -192,9 +189,9 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ } else LOG(OrderMan, Error, "SpreaderOrder::_on_child_order_update unknown ord " - "key:{} sec_key:{} order_key:{} status:{} " + "key:{} order_key:{} status:{} " "filled_qty:{} last_price:{} msg:{}", - key(), sec_key, order_key, status, filled_qty, + key(), order_key, status, filled_qty, last_price, ord_ev.last_msg); } LOG(OrderMan,Info,"h_p cb done {} {}",cb_type, _diff_ns()); diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 4303a6c68..7b94d671c 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -91,7 +91,7 @@ public: public: // inherited function to return the OrderDefinition. asserts // if on_init_new has not been called yet - const api::orderman::OrderDefinition& definition() const override; + const api::orderman::OrderDefinition& definition() const ; // this is the construction, can be slow void on_init_new(const bts::api::orderman::OrderDefinition& order_def, const PreActivationOrderServices&) override; @@ -269,7 +269,7 @@ public: order_state.set_status(status); order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); - OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,trace::CorID()); + OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_state,trace::CorID()); _on_child_order_update (ord_ev); } void test_only_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& pao_services) {_on_init_new(order_def, pao_services);} diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index ad61c0a38..01da5c649 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -102,7 +102,7 @@ void on_order_update (SpreaderChildOrderState& order, //order_state.set_filled_quantity (order.current_fills().value() + last_filled_quantity.value()); order_state.set_filled_quantity (filled_quantity.value()); bts::api::orderman::OrderDefinition order_def; - OrderStateUpdateEvent e (OrderKey(),OrderKey(),order_def, order_state); + OrderStateUpdateEvent e (OrderKey(),OrderKey(),order_state); order.on_order_update(e); } /**********************************************************************/ From cfd15d3371bbb7cecb7df963296a6e53126021b7 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 31 Dec 2018 17:46:00 +0000 Subject: [PATCH 002/218] Allowed full order definition updates. --- src/lib/orderman/actors/FillStore.cpp | 4 +- src/lib/orderman/actors/OrderStore.cpp | 2 +- .../actors/order_manager/OrderManager.cpp | 23 ++++++-- .../actors/order_manager/OrderManager.h | 11 +++- .../actors/order_manager/OrderServices.h | 3 +- .../events/OrderDefinitionUpdateEvent.h | 13 ++-- .../orderman/order_factory/OrderFactory.cpp | 6 +- src/lib/orderman/orders/NativeOrder.cpp | 6 +- src/lib/orderman/orders/NativeOrder.h | 59 +++++++++++-------- src/lib/orderman/orders/Order.cpp | 10 ++++ src/lib/orderman/orders/Order.h | 6 ++ 11 files changed, 98 insertions(+), 45 deletions(-) diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index f74b60549..5bf53fc5c 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -171,13 +171,13 @@ void FillStore::on_order_definition_update( mercury::Update const &u) { if (u.events) for (auto const &ev : *u.events) { - me->known_orders[ev.key] = ev.def; + me->known_orders[ev.key] = *ev.def; // see if we can resolve the accounts for any fills that we // might have already received for this order auto &unresolved_fills = me->fills_with_unresolved_accounts[ev.key]; for (auto &f : unresolved_fills.fills) { - f.set_account(ev.def.account()); + f.set_account(ev.def->account()); auto fv = utils::pb::to_string(f); me->store->update(fills_ns, f.fill_key(), fv); publish(me->fill_stream, f, *unresolved_fills.security); diff --git a/src/lib/orderman/actors/OrderStore.cpp b/src/lib/orderman/actors/OrderStore.cpp index 8f07f0cec..4e4cd2936 100644 --- a/src/lib/orderman/actors/OrderStore.cpp +++ b/src/lib/orderman/actors/OrderStore.cpp @@ -147,7 +147,7 @@ void OrderStore::on_order_definition_update( for (auto const &ev : *u.events) { auto &rec = me->known_orders[ev.key]; rec.set_key(ev.key.value()); - *rec.mutable_def() = ev.def; + *rec.mutable_def() = *ev.def; modified_orders.insert(ev.key); } store_and_publish_if_complete(modified_orders); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index da1f3f683..e634a072f 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -148,6 +148,8 @@ void OrderManager::on_order_recovery( for (auto const &ev : *(update.events)) { auto &order = me->services_data.order_factory.recover(ev.order_record); + auto const &def = order.def(); + publish_order_def_update(OrderKey(ev.key()),def); order.init_order_services(me->services_data); auto r = me->orders.emplace(order.key(), &order); @@ -185,6 +187,8 @@ void OrderManager::on_execution_report( auto order = &me->services_data.order_factory.recreate_from_exe_report( *report.data); + auto const &def = order->def(); + publish_order_def_update(OrderKey(k),def); order->init_order_services(me->services_data); auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); @@ -199,6 +203,8 @@ void OrderManager::on_activate_order( if (m.events) for (auto const &ev : *m.events) { auto order = ev.order; + auto const &def = order->def(); + publish_order_def_update(order->key(),def); order->init_order_services(me->services_data); auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); @@ -213,11 +219,11 @@ void OrderManager::on_update_order(const mercury::Update &m) { auto it = me->orders.find(k); if (it != me->orders.end()) { if (ev.is_full_update()) - it->second->on_update(ev.full_update(),trace::CorID{}); + it->second->on_update(ev.full_update(), trace::CorID{}); else - it->second->on_update(Price(ev.price()),Quantity(ev.quantity()),trace::CorID{}); - } - else { + it->second->on_update(Price(ev.price()), Quantity(ev.quantity()), + trace::CorID{}); + } else { LOG(OrderMan, Error, "Received an update request for an unknown order {}. " "This should not happen and likely indicates a serious bug. ", @@ -270,6 +276,9 @@ void OrderManager::on_gateway_state( OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, Price p, Quantity q, trace::CorID const &trace) { + auto const &def = order.def(); + publish_order_def_update(order.key(),def); + order.init_order_services(me->services_data, parent); auto r = me->orders.emplace(order.key(), &order); bts_assert(r.second); @@ -460,5 +469,11 @@ void OrderManager::on_poll() { osd->gw.dispatch_incoming_fix_messages(); } +void OrderManager::publish_order_def_update( + OrderKey k, + std::shared_ptr const &def) { + publish(me->services_data.report_order_definition_pub,k,def); +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index a8ec11582..db9fabbcf 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -14,7 +14,9 @@ // fwd namespace bts { -namespace trace {class PerfLog;} +namespace trace { +class PerfLog; +} namespace mercury { class TimerEvent; } @@ -60,7 +62,8 @@ namespace orderman { class OrderManager : public mercury::Actor, public mercury::IPollableActor { public: - OrderManager(DynamicOrderRegistry const &dyn_order_builder, trace::PerfLog &); + OrderManager(DynamicOrderRegistry const &dyn_order_builder, + trace::PerfLog &); ~OrderManager(); void init() override; @@ -91,6 +94,10 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { OrderServices &activate_child(OrderServices &parent, Order &, Price, Quantity, trace::CorID const &); + void publish_order_def_update( + OrderKey k, + std::shared_ptr const &def); + std::vector &free_buffers(std::string const &); enum class State; struct OrderInfo; diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 66c522e59..ecd01559b 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -159,7 +159,8 @@ class OrderServices { } void report_definition(const api::orderman::OrderDefinition &def) { - _data->owner.publish(_data->report_order_definition_pub, _owner->key(),def); + _owner->set_def(def); + _data->owner.publish(_data->report_order_definition_pub, _owner->key(),_owner->def()); } void report_state(const api::orderman::OrderState &state, diff --git a/src/lib/orderman/events/OrderDefinitionUpdateEvent.h b/src/lib/orderman/events/OrderDefinitionUpdateEvent.h index cae95b3bb..744da9043 100644 --- a/src/lib/orderman/events/OrderDefinitionUpdateEvent.h +++ b/src/lib/orderman/events/OrderDefinitionUpdateEvent.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/mercury/events/Event.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/mercury/events/Event.h" #include "lib/tracing/PerfLog.h" #include @@ -9,16 +9,17 @@ namespace bts { namespace orderman { -class OrderDefinitionUpdateEvent: public mercury::Event { +class OrderDefinitionUpdateEvent + : public mercury::Event { public: using SynopsisPolicy = mercury::CacheAll; - OrderDefinitionUpdateEvent(OrderKey k, api::orderman::OrderDefinition const&def) - : key(k), def(def) - {} + OrderDefinitionUpdateEvent( + OrderKey k, std::shared_ptr const &def) + : key(k), def(def) {} OrderKey key; - api::orderman::OrderDefinition def; + std::shared_ptr def; }; } // namespace orderman diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index a5eb59f90..a03ff8ce4 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -72,8 +72,10 @@ Order &OrderFactory::create(OrderKey parent, auto k = gen_order_id(); auto pk = parent; auto &order = allocate(k, pk, def); + order.set_def(def); order.on_init_new(def, PreActivationOrderServices{me->sec_db, *this, me->router}); + return order; } @@ -81,6 +83,7 @@ Order &OrderFactory::recover(api::orderman::OrderRecord const &rec) { auto k = OrderKey(rec.key()); auto pk = OrderKey(rec.parent_key()); auto &order = allocate(k, pk, rec.def()); + order.set_def(rec.def()); order.on_init_recovered( rec, PreActivationOrderServices{me->sec_db, *this, me->router}); return order; @@ -95,8 +98,9 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const &r) { case NATIVE_ORDER_TYPE_STOP: case NATIVE_ORDER_TYPE_STOP_LIMIT: { auto native_order = std::make_unique(); - native_order->on_init_from_exe_report( + auto def = native_order->on_init_from_exe_report( r, PreActivationOrderServices{me->sec_db, *this, me->router}); + native_order->set_def(def); native_order->_key = r.order_key; native_order->_parent_key = null_order_key(); me->my_orders.emplace_back(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 17d2f3ee9..1c1bb4cad 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -178,8 +178,9 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec, } } -void NativeOrder::on_init_from_exe_report( - ExecutionReport const &er, const PreActivationOrderServices &os) { +api::orderman::OrderDefinition const& +NativeOrder::on_init_from_exe_report(ExecutionReport const &er, + const PreActivationOrderServices &os) { auto k = er.order_key; OrderRecord orecord; @@ -268,6 +269,7 @@ void NativeOrder::on_init_from_exe_report( rr.set_customer_or_firm(CustomerOrFirm(er.cfg->customer_or_firm())); on_init_recovered(orecord, os); + return orecord.def(); } NativeOrder::~NativeOrder() {} diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 3f07d7961..54b10ec3e 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -1,9 +1,9 @@ #pragma once -#include -#include "lib/orderman/orders/Order.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/orderman/orders/Order.h" #include "lib/tracing/PerfLog.h" +#include namespace bts { namespace orderman { @@ -13,45 +13,52 @@ class CancelRejectEvent; class GatewayStatusChangeEvent; class ExecutionReport; -class NativeOrder : public Order -{ -public: +class NativeOrder : public Order { + public: NativeOrder(); ~NativeOrder() override; - api::orderman::OrderDefinition const &definition() const ; - void on_init_new(api::orderman::OrderDefinition const&, - const PreActivationOrderServices&) override; - void on_init_recovered(api::orderman::OrderRecord const&, + api::orderman::OrderDefinition const &definition() const; + void on_init_new(api::orderman::OrderDefinition const &, + const PreActivationOrderServices &) override; + void on_init_recovered(api::orderman::OrderRecord const &, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price, Quantity, OrderServices &, + trace::CorID const &) override; + void on_update(Price, Quantity, trace::CorID const &) override; + void on_crack(trace::CorID const &) override; + void on_cancel(trace::CorID const &) override; - void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &); -private: + api::orderman::OrderDefinition const & + on_init_from_exe_report(ExecutionReport const &, + const PreActivationOrderServices &); + + private: struct PImpl; std::unique_ptr me; void on_exe_report(const NewExecutionReportEvent &); - void on_cancel_reject(const CancelRejectEvent&); - void on_gateway_status(const GatewayStatusChangeEvent&); - void report_state(trace::CorID const&trace = trace::CorID()); - + void on_cancel_reject(const CancelRejectEvent &); + void on_gateway_status(const GatewayStatusChangeEvent &); + void report_state(trace::CorID const &trace = trace::CorID()); + void init_fix(); void add_exchange_order_id_to_fix(); - - void transition(api::orderman::OrderStatus new_state,std::string const&msg); + + void transition(api::orderman::OrderStatus new_state, + std::string const &msg); void transition(api::orderman::OrderStatus new_state); void transition_to_error(api::orderman::NativeOrderState::SubError sub_error, - std::string const&msg); + std::string const &msg); void update_working_position(); - bool has_exchange_order_id() ; + bool has_exchange_order_id(); Quantity position_contribution(); - bool is_old_exe_report( api::orderman::NativeOrderState &, const NewExecutionReportEvent &) const; + bool is_old_exe_report(api::orderman::NativeOrderState &, + const NewExecutionReportEvent &) const; bool terminal_state(api::orderman::OrderStatus status) const; - api::orderman::NativeOrderState& get_native_state(api::orderman::OrderState &); + api::orderman::NativeOrderState & + get_native_state(api::orderman::OrderState &); }; -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index 8abb9185c..ff19cccc9 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -23,5 +23,15 @@ Order::~Order() {} void Order::on_update(api::orderman::Update const&, trace::CorID const&) {} +void Order::set_def(api::orderman::OrderDefinition const&def) +{ + _def = std::make_shared (def); +} + +std::shared_ptr const &Order::def() +{ + return _def; +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 54734a947..77886dabd 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -56,10 +56,16 @@ class Order { OrderKey _key; OrderKey _parent_key; std::unique_ptr _services; + std::shared_ptr _def; + + void set_def(api::orderman::OrderDefinition const&); + std::shared_ptr const& def(); + void init_order_services(OrderServicesData &); void init_order_services(OrderServicesData &,OrderServices &parent); friend class OrderFactory; friend class OrderManager; + friend class OrderServices; }; } } From abc2e556108d6fc82e74507bea631f3a9c69c888 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 2 Jan 2019 14:37:23 +0000 Subject: [PATCH 003/218] Added assert. --- src/lib/orderman/actors/OrderStore.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/orderman/actors/OrderStore.cpp b/src/lib/orderman/actors/OrderStore.cpp index 4e4cd2936..154476e32 100644 --- a/src/lib/orderman/actors/OrderStore.cpp +++ b/src/lib/orderman/actors/OrderStore.cpp @@ -125,6 +125,7 @@ void OrderStore::on_order_state_update( for (auto const &ev : *u.events) { auto &rec = me->known_orders[ev.key]; + bts_assert(rec.has_def()); rec.set_key(ev.key.value()); rec.set_parent_key(ev.parent_key.value()); modified_orders.insert(ev.key); From 8be8a67f183917a1ecf9f01f2ac5c221fbf24fd2 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Jan 2019 16:48:29 -0500 Subject: [PATCH 004/218] Adding results to order operations. --- src/lib/api/services/OrderService.proto | 2 + src/lib/orderman/actors/ServiceBridge.cpp | 131 ++++++++---------- src/lib/orderman/actors/ServiceBridge.h | 16 ++- .../actors/order_manager/ChildOrder.h | 8 +- .../actors/order_manager/OrderManager.cpp | 32 +++-- .../actors/order_manager/OrderServices.h | 31 +++-- .../actors/order_manager/OrderServicesData.h | 9 +- src/lib/orderman/events/ActivateOrderEvent.h | 27 ++-- src/lib/orderman/events/CancelOrderEvent.h | 24 ++-- src/lib/orderman/events/CrackOrderEvent.h | 13 +- src/lib/orderman/events/OrderOpResultEvent.h | 30 ++++ src/lib/orderman/events/UpdateOrderEvent.h | 7 +- src/lib/orderman/orders/DynamicOrder.cpp | 8 +- src/lib/orderman/orders/DynamicOrder.h | 7 +- src/lib/orderman/orders/IcebergOrder.cpp | 26 +++- src/lib/orderman/orders/IcebergOrder.h | 9 +- src/lib/orderman/orders/NativeOrder.cpp | 25 ++-- src/lib/orderman/orders/NativeOrder.h | 11 +- src/lib/orderman/orders/Order.cpp | 36 +++-- src/lib/orderman/orders/Order.h | 12 +- src/lib/orderman/orders/OrderOpResult.h | 22 +++ src/lib/orderman/orders/TimeBoxOrder.cpp | 17 ++- src/lib/orderman/orders/TimeBoxOrder.h | 8 +- src/lib/orderman/orders/TriggerOrder.cpp | 19 +-- src/lib/orderman/orders/TriggerOrder.h | 7 +- .../orderman/orders/book_algos/BookAlgo.cpp | 13 +- src/lib/orderman/orders/book_algos/BookAlgo.h | 7 +- .../orders/spreader_orders/SpreaderOrder.cpp | 21 ++- .../orders/spreader_orders/SpreaderOrder.h | 9 +- .../orderman/server/OrderServiceServer.cpp | 92 ++++++++---- src/lib/orderman/server/OrderServiceServer.h | 2 + src/sdk/examples/order_plugin_example.cpp | 2 +- src/web/CMakeDeps.cmake | 2 +- 33 files changed, 408 insertions(+), 277 deletions(-) create mode 100644 src/lib/orderman/events/OrderOpResultEvent.h create mode 100644 src/lib/orderman/orders/OrderOpResult.h diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 5e396c5d4..4d98fc74b 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -430,6 +430,8 @@ enum OrderError ORDER_ERROR_ORDER_NOT_ACK = 7; ORDER_ERROR_SERVER_NOT_READY = 8; ORDER_ERROR_OK = 9; + ORDER_ERROR_OP_NOT_SUPPORTED = 10; + ORDER_ERROR_INVALID_OP = 11; } // Trigger Condition ///////////////////////////////// diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index d067406bf..ec70cef17 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -8,14 +8,15 @@ #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" +#include "lib/orderman/events/OrderOpResultEvent.h" #include "lib/orderman/events/StoredFillEvent.h" #include "lib/orderman/events/StoredOrderEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" -#include "lib/utils/PBUtils.h" #include "lib/tracing/PerfLog.h" +#include "lib/utils/PBUtils.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -27,18 +28,20 @@ namespace orderman { struct ServiceBridge::PImpl { PImpl(OnReady const &on_ready, OnOrders const &on_orders, - OnFills const &on_fills, + OnFills const &on_fills, OnOrderOpResult const &on_order_op_result, DynamicOrderRegistry const &dyn_order_registry, mercury::BrokerProxy &service_call_marshaller) : on_ready(on_ready), on_orders(on_orders), on_fills(on_fills), - have_orders(false), have_securities(false), order_manager_ready(false), - sec_db(), order_router(), + on_order_op_result(on_order_op_result), have_orders(false), + have_securities(false), order_manager_ready(false), sec_db(), + order_router(), order_factory(sec_db, order_router, dyn_order_registry), known_orders(), service_call_marshaller(service_call_marshaller) {} OnReady on_ready; OnOrders on_orders; OnFills on_fills; + OnOrderOpResult on_order_op_result; bool have_orders; bool have_securities; bool order_manager_ready; @@ -58,10 +61,11 @@ struct ServiceBridge::PImpl { ServiceBridge::ServiceBridge(OnReady const &on_ready, OnOrders const &on_orders, OnFills const &on_fills, + OnOrderOpResult const &on_order_op_result, DynamicOrderRegistry const &dyn_order_registry, mercury::BrokerProxy &service_call_marshaller) - : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, - service_call_marshaller)) {} + : me(new PImpl(on_ready, on_orders, on_fills, on_order_op_result, + dyn_order_registry, service_call_marshaller)) {} ServiceBridge::~ServiceBridge() {} @@ -73,6 +77,7 @@ void ServiceBridge::init() { subscribe([this](auto const &u) { this->on(u); }); subscribe([this](auto const &u) { this->on(u); }); subscribe([this](auto const &u) { this->on(u); }); + subscribe([this](auto const &u) { this->on(u); }); me->activate_order_pub = make_stream(); me->update_order_pub = make_stream(); @@ -136,105 +141,85 @@ void ServiceBridge::on(mercury::Update const &update) { me->order_router.update(*ev.admin_data); } -api::orderman::Response -ServiceBridge::create_order(api::orderman::Create const &c) { +void ServiceBridge::on(mercury::Update const &update) { + if (update.events) + for (auto ev : *(update.events)) + me->on_order_op_result(ev); +} + +void ServiceBridge::create_order(uint32_t rid, api::orderman::Create const &c) { + LOG(OrderMan, Info, "Received new order from client: {}", utils::pb::to_string(c)); - std::promise p; - auto f = p.get_future(); - - me->service_call_marshaller.schedule_action([this, &c, &p]() { - api::orderman::Response r; - + me->service_call_marshaller.schedule_action([this, c, rid]() { if (is_ready()) { auto &order = me->order_factory.create(null_order_key(), c.new_order()); me->known_orders.insert(order.key()); - publish(me->activate_order_pub, order, Price(c.price()), + publish(me->activate_order_pub, rid, order, Price(c.price()), Quantity(c.quantity()), trace::CorID()); - r.set_order_key(order.key().value()); - r.set_error_code(api::orderman::ORDER_ERROR_OK); } else - r.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); - p.set_value(r); + me->on_order_op_result(OrderOpResultEvent( + null_order_key(), rid, + OrderOpResult(api::orderman::ORDER_ERROR_SERVER_NOT_READY))); }); - return f.get(); } -api::orderman::Response -ServiceBridge::update_order(api::orderman::Update const &c) { +void ServiceBridge::update_order(uint32_t rid, api::orderman::Update const &c) { LOG(OrderMan, Info, "Received order update from client: {}", utils::pb::to_string(c)); - std::promise p; - auto f = p.get_future(); - - me->service_call_marshaller.schedule_action([this, &c, &p]() { - api::orderman::Response r; - + me->service_call_marshaller.schedule_action([this, c, rid]() { + auto ok = OrderKey(c.order_key()); if (is_ready()) { - auto ok = OrderKey(c.order_key()); - r.set_order_key(c.order_key()); - if (me->known_orders.count(ok)) { - publish(me->update_order_pub,c); - r.set_error_code(api::orderman::ORDER_ERROR_OK); - } else - r.set_error_code(api::orderman::ORDER_ERROR_UNKNOWN_ORDER); + if (me->known_orders.count(ok)) + publish(me->update_order_pub, rid, c); + else + me->on_order_op_result(OrderOpResultEvent( + ok, rid, + OrderOpResult(api::orderman::ORDER_ERROR_UNKNOWN_ORDER))); } else - r.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); - p.set_value(r); + me->on_order_op_result(OrderOpResultEvent( + ok, rid, + OrderOpResult(api::orderman::ORDER_ERROR_SERVER_NOT_READY))); }); - return f.get(); } -api::orderman::Response -ServiceBridge::cancel_order(api::orderman::Cancel const &c) { +void ServiceBridge::cancel_order(uint32_t rid, api::orderman::Cancel const &c) { LOG(OrderMan, Info, "Received order cancel from client: {}", utils::pb::to_string(c)); - std::promise p; - auto f = p.get_future(); - - me->service_call_marshaller.schedule_action([this, &c, &p]() { - api::orderman::Response r; - + me->service_call_marshaller.schedule_action([this, c, rid]() { + auto ok = OrderKey(c.order_key()); if (is_ready()) { - auto ok = OrderKey(c.order_key()); - r.set_order_key(c.order_key()); - if (me->known_orders.count(ok)) { - publish(me->cancel_order_pub, ok); - r.set_error_code(api::orderman::ORDER_ERROR_OK); - } else - r.set_error_code(api::orderman::ORDER_ERROR_UNKNOWN_ORDER); + if (me->known_orders.count(ok)) + publish(me->cancel_order_pub, rid, ok); + else + me->on_order_op_result(OrderOpResultEvent( + ok, rid, + OrderOpResult(api::orderman::ORDER_ERROR_UNKNOWN_ORDER))); } else - r.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); - p.set_value(r); + me->on_order_op_result(OrderOpResultEvent( + ok, rid, + OrderOpResult(api::orderman::ORDER_ERROR_SERVER_NOT_READY))); }); - return f.get(); } -api::orderman::Response -ServiceBridge::crack_order(api::orderman::Crack const &c) { - std::promise p; - auto f = p.get_future(); - - me->service_call_marshaller.schedule_action([this, &c, &p]() { - api::orderman::Response r; +void ServiceBridge::crack_order(uint32_t rid, api::orderman::Crack const &c) { + me->service_call_marshaller.schedule_action([this, c, rid]() { + auto ok = OrderKey(c.order_key()); if (is_ready()) { - auto ok = OrderKey(c.order_key()); - r.set_order_key(c.order_key()); - if (me->known_orders.count(ok)) { - publish(me->crack_order_pub, ok); - r.set_error_code(api::orderman::ORDER_ERROR_OK); - } else - r.set_error_code(api::orderman::ORDER_ERROR_UNKNOWN_ORDER); + if (me->known_orders.count(ok)) + publish(me->crack_order_pub, rid, ok); + else + me->on_order_op_result(OrderOpResultEvent(ok, + rid, OrderOpResult(api::orderman::ORDER_ERROR_UNKNOWN_ORDER))); } else - r.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); - p.set_value(r); + me->on_order_op_result(OrderOpResultEvent(ok, + rid, OrderOpResult(api::orderman::ORDER_ERROR_SERVER_NOT_READY))); }); - return f.get(); } void ServiceBridge::update_admin_data( diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index f78f0a6c6..c1d8b6f6c 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -28,6 +28,7 @@ class StoredOrderEvent; class NewSecuritiesEvent; class OrderManagerReadyEvent; class NewAdminDataEvent; +class OrderOpResultEvent; class DynamicOrderRegistry; } // namespace orderman } // namespace bts @@ -48,9 +49,12 @@ class ServiceBridge : public mercury::Actor { using OnFills = std::function const &)>; + using OnOrderOpResult = + std::function; + ServiceBridge(OnReady const &, OnOrders const &, OnFills const &, + OnOrderOpResult const&, DynamicOrderRegistry const &, - mercury::BrokerProxy &service_call_marshaller); void init() override; ~ServiceBridge(); @@ -59,10 +63,11 @@ class ServiceBridge : public mercury::Actor { void block_until_ready(); // these can be called from any thread, after block_until_ready() returns - api::orderman::Response create_order(api::orderman::Create const &c); - api::orderman::Response update_order(api::orderman::Update const &c); - api::orderman::Response cancel_order(api::orderman::Cancel const &c); - api::orderman::Response crack_order(api::orderman::Crack const &c); + void create_order(uint32_t rid, api::orderman::Create const &c); + void update_order(uint32_t rid, api::orderman::Update const &c); + void cancel_order(uint32_t rid, api::orderman::Cancel const &c); + void crack_order(uint32_t rid, api::orderman::Crack const &c); + void update_admin_data(std::shared_ptr const &admin); @@ -77,6 +82,7 @@ class ServiceBridge : public mercury::Actor { void on(mercury::Update const &); void on(mercury::Update const &); void on(mercury::Update const &); + void on(mercury::Update const &); }; } // namespace orderman diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index ed506a3d2..8e1a49ec1 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -47,19 +47,21 @@ class ChildOrder { &_parent_order_services->activate_child(*_order, p, q, trace); _active = true; } - void update(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); _child_order_services->update(p, q, trace); } - + void update(api::orderman::Update const&update, trace::CorID const& trace = trace::CorID()) { + bts_assert(_order); + bts_assert(_active); + _child_order_services->update(update,trace); + } void crack(trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); _child_order_services->crack(trace); } - void cancel(trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index e634a072f..77405d0d5 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -149,7 +149,7 @@ void OrderManager::on_order_recovery( auto &order = me->services_data.order_factory.recover(ev.order_record); auto const &def = order.def(); - publish_order_def_update(OrderKey(ev.key()),def); + publish_order_def_update(OrderKey(ev.key()), def); order.init_order_services(me->services_data); auto r = me->orders.emplace(order.key(), &order); @@ -188,7 +188,7 @@ void OrderManager::on_execution_report( &me->services_data.order_factory.recreate_from_exe_report( *report.data); auto const &def = order->def(); - publish_order_def_update(OrderKey(k),def); + publish_order_def_update(OrderKey(k), def); order->init_order_services(me->services_data); auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); @@ -204,11 +204,12 @@ void OrderManager::on_activate_order( for (auto const &ev : *m.events) { auto order = ev.order; auto const &def = order->def(); - publish_order_def_update(order->key(),def); + publish_order_def_update(order->key(), def); order->init_order_services(me->services_data); auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); - order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); + auto op_r = order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); + publish(me->services_data.report_order_op_result_pub,order->key(),ev.req_id,op_r); } } @@ -217,18 +218,21 @@ void OrderManager::on_update_order(const mercury::Update &m) { for (auto const &ev : *m.events) { auto k = ev.key(); auto it = me->orders.find(k); + OrderOpResult op_r; if (it != me->orders.end()) { if (ev.is_full_update()) - it->second->on_update(ev.full_update(), trace::CorID{}); + op_r = it->second->on_update(ev.full_update(), trace::CorID{}); else - it->second->on_update(Price(ev.price()), Quantity(ev.quantity()), + op_r = it->second->on_update(Price(ev.price()), Quantity(ev.quantity()), trace::CorID{}); } else { + op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; LOG(OrderMan, Error, "Received an update request for an unknown order {}. " "This should not happen and likely indicates a serious bug. ", ev.key().value()); } + publish(me->services_data.report_order_op_result_pub,k,ev.req_id(),op_r); } } @@ -237,14 +241,17 @@ void OrderManager::on_cancel_order(const mercury::Update &m) { for (auto const &ev : *m.events) { auto k = ev.key(); auto it = me->orders.find(k); + OrderOpResult op_r; if (it != me->orders.end()) - it->second->on_cancel(ev.trace); + op_r = it->second->on_cancel(ev.trace); else { + op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; LOG(OrderMan, Error, "Received a cancel request for an unknown order {}. " "This should not happen and likely indicates a serious bug. ", ev.key().value()); } + publish(me->services_data.report_order_op_result_pub,k,ev.req_id,op_r); } } @@ -253,14 +260,17 @@ void OrderManager::on_crack_order(const mercury::Update &m) { for (auto const &ev : *m.events) { auto k = ev.key(); auto it = me->orders.find(k); + OrderOpResult op_r; if (it != me->orders.end()) - it->second->on_crack(ev.trace); + it->second->on_crack(trace::CorID{}); else { + op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; LOG(OrderMan, Error, "Received a crack request for an unknown order {}. " "This should not happen and likely indicates a serious bug. ", ev.key().value()); } + publish(me->services_data.report_order_op_result_pub,k,ev.req_id,op_r); } } @@ -277,7 +287,7 @@ OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, Price p, Quantity q, trace::CorID const &trace) { auto const &def = order.def(); - publish_order_def_update(order.key(),def); + publish_order_def_update(order.key(), def); order.init_order_services(me->services_data, parent); auto r = me->orders.emplace(order.key(), &order); @@ -418,6 +428,8 @@ void OrderManager::init_order_services() { me->services_data.report_order_definition_pub = make_stream(); me->pub_ready = make_stream(); + me->services_data.report_order_op_result_pub = + make_stream(); // md subs are peculiar in that we try to make them on demand, so // we publish an event announcing the subscription @@ -472,7 +484,7 @@ void OrderManager::on_poll() { void OrderManager::publish_order_def_update( OrderKey k, std::shared_ptr const &def) { - publish(me->services_data.report_order_definition_pub,k,def); + publish(me->services_data.report_order_definition_pub, k, def); } } // namespace orderman diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index ecd01559b..df0ff5914 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -147,27 +147,29 @@ class OrderServices { ss.queue_fix(mt, f, trace); } - void log(trace::CorID cid, const char *entry_kind, - uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0) { + void log(trace::CorID cid, const char *entry_kind, uint64_t uint64_1 = 0, + const char *txt_1 = "", uint32_t uint32_1 = 0) { _data->log.log(cid, entry_kind, uint64_1, txt_1, uint32_1); } trace::ScopedPerfLogEntry log_scope(trace::CorID cid, const char *entry_kind, - uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0) - { - return trace::ScopedPerfLogEntry(_data->log,cid,entry_kind,uint64_1,txt_1,uint32_1); + uint64_t uint64_1 = 0, + const char *txt_1 = "", + uint32_t uint32_1 = 0) { + return trace::ScopedPerfLogEntry(_data->log, cid, entry_kind, uint64_1, + txt_1, uint32_1); } void report_definition(const api::orderman::OrderDefinition &def) { _owner->set_def(def); - _data->owner.publish(_data->report_order_definition_pub, _owner->key(),_owner->def()); + _data->owner.publish(_data->report_order_definition_pub, _owner->key(), + _owner->def()); } - void report_state(const api::orderman::OrderState &state, trace::CorID const &trace = trace::CorID()) { - OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), - state, trace); + OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), state, + trace); _data->owner.publish(_data->report_order_state_pub, ev); if (orderman::in_terminal_state(state.status())) { @@ -201,11 +203,7 @@ class OrderServices { using BookSubID = EventStream::SubID; template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { return _book_updates.sub( - k, [this, cb](auto const &ev) { - - this->on_external_event(ev, cb); - - }); + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); } void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } @@ -337,6 +335,11 @@ class OrderServices { self._owner->on_update(p, q, trace); }); } + void update(api::orderman::Update const &update, trace::CorID const &trace) { + on_inter_order_call([update, trace](OrderServices &self) { + self._owner->on_update(update, trace); + }); + } void crack(trace::CorID const &trace) { on_inter_order_call( [trace](OrderServices &self) { self._owner->on_crack(trace); }); diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 20728b34d..3280d4934 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -22,6 +22,8 @@ #include "lib/orderman/events/MDRequestEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" +#include "lib/orderman/events/OrderOpResultEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" #include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/SettlementUpdateEvent.h" @@ -30,7 +32,6 @@ #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/utils/datetime.h" -#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" #include @@ -45,7 +46,8 @@ struct ParentKey { }; struct SessionServicesData { - SessionServicesData(config::JetFIX::Connection const &cfg, trace::PerfLog &log) + SessionServicesData(config::JetFIX::Connection const &cfg, + trace::PerfLog &log) : session(cfg.name()), gw_connected(false), cfg(cfg), governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), gw(cfg, log) {} @@ -73,7 +75,6 @@ struct SessionServicesData { class OrderServicesData { public: - OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l); @@ -98,7 +99,7 @@ class OrderServicesData { mercury::Stream settlement_request_pub; mercury::Stream report_order_state_pub; mercury::Stream report_order_definition_pub; - + mercury::Stream report_order_op_result_pub; mercury::TimerEvent last_timer_ev; std::vector> sessions; diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib/orderman/events/ActivateOrderEvent.h index 91f0f5f46..c53592fed 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib/orderman/events/ActivateOrderEvent.h @@ -2,32 +2,31 @@ #include -#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { class Order; -class ActivateOrderEvent : public mercury::Event -{ -public: +class ActivateOrderEvent : public mercury::Event { + public: using SynopsisPolicy = mercury::NoSynopsis; - - ActivateOrderEvent (Order &o,Price p, Quantity q) : - order (&o),price(p),quantity(q), trace() - {} - ActivateOrderEvent (Order &o,Price p, Quantity q,trace::CorID trace) : - order (&o),price(p),quantity(q), trace(trace) - {} + ActivateOrderEvent(uint32_t req_id, Order &o, Price p, Quantity q) + : req_id(req_id),order(&o), price(p), quantity(q), trace() {} - Order* order; + ActivateOrderEvent(uint32_t req_id, Order &o, Price p, Quantity q, + trace::CorID trace) + : req_id(req_id), order(&o), price(p), quantity(q), trace(trace) {} + + uint32_t req_id; + Order *order; Price price; Quantity quantity; trace::CorID trace; }; -}} - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/CancelOrderEvent.h b/src/lib/orderman/events/CancelOrderEvent.h index cdc2fa563..ae85d1e44 100644 --- a/src/lib/orderman/events/CancelOrderEvent.h +++ b/src/lib/orderman/events/CancelOrderEvent.h @@ -2,26 +2,28 @@ #include -#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { -class CancelOrderEvent : public mercury::Event -{ -public: +class CancelOrderEvent : public mercury::Event { + public: using SynopsisPolicy = mercury::NoSynopsis; - - CancelOrderEvent (OrderKey k) : k (k), trace() {} - CancelOrderEvent (OrderKey k,trace::CorID const&trace) : k (k), trace(trace) {} -// used by ContentSubscription - OrderKey key() const {return k;} + CancelOrderEvent(uint32_t req_id, OrderKey k) + : req_id(req_id), k(k), trace() {} + CancelOrderEvent(uint32_t req_id, OrderKey k, trace::CorID const &trace) + : req_id(req_id), k(k), trace(trace) {} + + uint32_t req_id; + // used by ContentSubscription + OrderKey key() const { return k; } OrderKey k; trace::CorID trace; }; -}} - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/CrackOrderEvent.h b/src/lib/orderman/events/CrackOrderEvent.h index 115826241..1cd171e63 100644 --- a/src/lib/orderman/events/CrackOrderEvent.h +++ b/src/lib/orderman/events/CrackOrderEvent.h @@ -13,16 +13,13 @@ class CrackOrderEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; - CrackOrderEvent(OrderKey k) - : k(k), trace() {} - - CrackOrderEvent(OrderKey k, trace::CorID const &trace) - : k(k), trace(trace) {} + CrackOrderEvent(uint32_t req_id, OrderKey k) + : req_id(req_id), k(k) {} + uint32_t req_id; // used by ContentSubscription OrderKey key() const { return k; } OrderKey k; - trace::CorID trace; }; -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/OrderOpResultEvent.h b/src/lib/orderman/events/OrderOpResultEvent.h new file mode 100644 index 000000000..3db99532b --- /dev/null +++ b/src/lib/orderman/events/OrderOpResultEvent.h @@ -0,0 +1,30 @@ +#pragma once + +#include + +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/mercury/events/Event.h" +#include "lib/orderman/orders/Order.h" + +namespace bts { +namespace orderman { +class Order; + +class OrderOpResultEvent : public mercury::Event +{ +public: + using SynopsisPolicy = mercury::NoSynopsis; + + OrderOpResultEvent (OrderKey k, uint32_t req_id,OrderOpResult const &r ) : + ok(k), + req_id(req_id), + result (r) + {} + + OrderKey ok; + uint32_t req_id; + OrderOpResult result; +}; + +}} + diff --git a/src/lib/orderman/events/UpdateOrderEvent.h b/src/lib/orderman/events/UpdateOrderEvent.h index f2037d80a..210ee00d4 100644 --- a/src/lib/orderman/events/UpdateOrderEvent.h +++ b/src/lib/orderman/events/UpdateOrderEvent.h @@ -14,8 +14,8 @@ class UpdateOrderEvent : public mercury::Event public: using SynopsisPolicy = mercury::NoSynopsis; - UpdateOrderEvent (api::orderman::Update const&update) : - _update(update) + UpdateOrderEvent (uint32_t rid,api::orderman::Update const&update) : + _req_id(rid), _update(update) {} // used by ContentSubscription @@ -24,8 +24,9 @@ public: Quantity quantity() const {return Quantity(_update.quantity());} bool is_full_update() const {return _update.has_custom();} api::orderman::Update const &full_update() const {return _update;} - + uint32_t req_id() const {return _req_id;} private: + uint32_t _req_id; api::orderman::Update _update; }; diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index 1bad1d602..c0e5efbea 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -44,14 +44,14 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec, me->state.set_last_msg(msg); } -void DynamicOrder::on_activate(Price, Quantity, OrderServices &services, +OrderOpResult DynamicOrder::on_activate(Price, Quantity, OrderServices &services, trace::CorID const &) { services.report_state(me->state); + return OrderOpResult{}; } -void DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {} -void DynamicOrder::on_crack(trace::CorID const &) {} -void DynamicOrder::on_cancel(trace::CorID const &) {} +OrderOpResult DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {return OrderOpResult{};} +OrderOpResult DynamicOrder::on_cancel(trace::CorID const &) {return OrderOpResult{};} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib/orderman/orders/DynamicOrder.h index d9abcd130..e608cdcea 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib/orderman/orders/DynamicOrder.h @@ -18,10 +18,9 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ; + OrderOpResult on_cancel(trace::CorID const&) override ; private: struct PImpl; diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index df72b6911..79a0c1ce7 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -103,8 +103,9 @@ void IcebergOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } } -void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { +OrderOpResult IcebergOrder::on_activate(Price p, Quantity q, + OrderServices &services, + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -143,9 +144,11 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, break; } report_state(); + return OrderOpResult{}; } -void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { +OrderOpResult IcebergOrder::on_update(Price p, Quantity q, + trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -169,11 +172,20 @@ void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { break; } report_state(); + return OrderOpResult{}; } -void IcebergOrder::on_crack(trace::CorID const &) {} +OrderOpResult IcebergOrder::on_update(api::orderman::Update const &, + trace::CorID const &) { -void IcebergOrder::on_cancel(trace::CorID const &) { + return OrderOpResult{}; +} + +OrderOpResult IcebergOrder::on_crack(trace::CorID const &) { + return OrderOpResult{}; +} + +OrderOpResult IcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value()); @@ -196,6 +208,7 @@ void IcebergOrder::on_cancel(trace::CorID const &) { break; } report_state(); + return OrderOpResult{}; } void IcebergOrder::transition(api::orderman::OrderStatus new_status, @@ -255,7 +268,8 @@ void IcebergOrder::send_next_child_order() { key().value(), me->child.order.key().value(), to_send, me->state.price(), me->state.filled_quantity(), me->state.quantity()); - me->child.order.activate(Price(me->state.price()), Quantity(to_send), trace::CorID()); + me->child.order.activate(Price(me->state.price()), Quantity(to_send), + trace::CorID()); } void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index 1c4772f44..1b76af68d 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -20,10 +20,11 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ; + OrderOpResult on_update(api::orderman::Update const&update, trace::CorID const&trace) override; + OrderOpResult on_crack(trace::CorID const&) override ; + OrderOpResult on_cancel(trace::CorID const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 1c1bb4cad..2676bc96d 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -178,7 +178,7 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec, } } -api::orderman::OrderDefinition const& +api::orderman::OrderDefinition const & NativeOrder::on_init_from_exe_report(ExecutionReport const &er, const PreActivationOrderServices &os) { auto k = er.order_key; @@ -274,9 +274,10 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er, NativeOrder::~NativeOrder() {} -void NativeOrder::on_activate(Price p, Quantity q, - bts::orderman::OrderServices &services, - trace::CorID const &trace) { +OrderOpResult +NativeOrder::on_activate(Price p, Quantity q, + bts::orderman::OrderServices &services, + trace::CorID const &trace) { auto scoped_log = services.log_scope(trace, "NativeOrder::on_activate", key().value()); @@ -401,7 +402,7 @@ void NativeOrder::on_activate(Price p, Quantity q, LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call - return; + return OrderOpResult{}; } // all cases below are for orders recovered from disk @@ -465,9 +466,11 @@ void NativeOrder::on_activate(Price p, Quantity q, break; } report_state(); + return OrderOpResult{}; } -void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { +OrderOpResult NativeOrder::on_update(Price p, Quantity q, + trace::CorID const &trace) { auto scoped_log = me->services->log_scope(trace, "NativeOrder::on_update", key().value()); @@ -544,7 +547,7 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { me->state.set_last_msg(""); // early return so we skip report_state (for speed) - return; + return OrderOpResult{}; } case ORDER_STATUS_DISCONNECTED: @@ -563,11 +566,14 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { break; } report_state(); + return OrderOpResult{}; } -void NativeOrder::on_crack(trace::CorID const &) {} +OrderOpResult NativeOrder::on_crack(trace::CorID const &) { + return OrderOpResult{}; +} -void NativeOrder::on_cancel(trace::CorID const &trace) { +OrderOpResult NativeOrder::on_cancel(trace::CorID const &trace) { auto scoped_log = me->services->log_scope(trace, "NativeOrder::on_cancel", key().value()); switch (me->state.status()) { @@ -601,6 +607,7 @@ void NativeOrder::on_cancel(trace::CorID const &trace) { break; } report_state(); + return OrderOpResult{}; } bool NativeOrder::is_old_exe_report( diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 54b10ec3e..0a5b93c4e 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -23,11 +23,12 @@ class NativeOrder : public Order { const PreActivationOrderServices &) override; void on_init_recovered(api::orderman::OrderRecord const &, const PreActivationOrderServices &) override; - void on_activate(Price, Quantity, OrderServices &, - trace::CorID const &) override; - void on_update(Price, Quantity, trace::CorID const &) override; - void on_crack(trace::CorID const &) override; - void on_cancel(trace::CorID const &) override; + + OrderOpResult on_activate(Price, Quantity, OrderServices &, + trace::CorID const &) override; + OrderOpResult on_update(Price, Quantity, trace::CorID const &) override; + OrderOpResult on_crack(trace::CorID const &) override; + OrderOpResult on_cancel(trace::CorID const &) override; api::orderman::OrderDefinition const & on_init_from_exe_report(ExecutionReport const &, diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index ff19cccc9..70559ca09 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -4,32 +4,38 @@ namespace bts { namespace orderman { -Order::Order() -{ - _services = std::make_unique(*this); -} +Order::Order() { _services = std::make_unique(*this); } -void Order::init_order_services(OrderServicesData &osd) -{ +void Order::init_order_services(OrderServicesData &osd) { _services->init(osd); } -void Order::init_order_services(OrderServicesData &osd,OrderServices &parent) -{ - _services->init(osd,parent); +void Order::init_order_services(OrderServicesData &osd, OrderServices &parent) { + _services->init(osd, parent); } Order::~Order() {} -void Order::on_update(api::orderman::Update const&, trace::CorID const&) {} +OrderOpResult Order::on_update(api::orderman::Update const &, + trace::CorID const &) { + return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED, + "The update operation is not supported by this order type" -void Order::set_def(api::orderman::OrderDefinition const&def) -{ - _def = std::make_shared (def); + }; } -std::shared_ptr const &Order::def() -{ +OrderOpResult Order::on_crack(trace::CorID const&) { + return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED, + "The crack operation is not supported by this order type" + + }; +} + +void Order::set_def(api::orderman::OrderDefinition const &def) { + _def = std::make_shared(def); +} + +std::shared_ptr const &Order::def() { return _def; } diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 77886dabd..798913bf5 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -1,6 +1,8 @@ #pragma once #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/orders/OrderOpResult.h" + #include // fwd @@ -44,13 +46,13 @@ class Order { const PreActivationOrderServices &) = 0; // activation - cannot be slow - virtual void on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0; + virtual OrderOpResult on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0; // order is running, maintenance - virtual void on_update(Price, Quantity, trace::CorID const&) = 0; - virtual void on_update(api::orderman::Update const&, trace::CorID const&) ; - virtual void on_crack(trace::CorID const&) = 0; - virtual void on_cancel(trace::CorID const&) = 0; + virtual OrderOpResult on_update(Price, Quantity, trace::CorID const&) = 0; + virtual OrderOpResult on_update(api::orderman::Update const&, trace::CorID const&) ; + virtual OrderOpResult on_crack(trace::CorID const&); + virtual OrderOpResult on_cancel(trace::CorID const&) = 0; private: OrderKey _key; diff --git a/src/lib/orderman/orders/OrderOpResult.h b/src/lib/orderman/orders/OrderOpResult.h new file mode 100644 index 000000000..4032dc161 --- /dev/null +++ b/src/lib/orderman/orders/OrderOpResult.h @@ -0,0 +1,22 @@ +#pragma once + +#include "lib/api/services/OrderService.pb.h" +#include + +namespace bts { +namespace orderman { + +struct OrderOpResult { + OrderOpResult() : error(api::orderman::ORDER_ERROR_OK), error_msg() {} + + OrderOpResult(api::orderman::OrderError e, std::string const &error_msg) + : error(e), error_msg(error_msg) {} + + OrderOpResult(api::orderman::OrderError e) : error(e), error_msg() {} + + api::orderman::OrderError error; + std::string error_msg; +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index 8ad686489..fa4580295 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -84,8 +84,9 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } } -void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { +OrderOpResult TimeBoxOrder::on_activate(Price p, Quantity q, + OrderServices &services, + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -121,9 +122,11 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, break; } report_state(); + return OrderOpResult{}; } -void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { +OrderOpResult TimeBoxOrder::on_update(Price p, Quantity q, + trace::CorID const &) { LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -181,11 +184,14 @@ void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { break; } report_state(); + return OrderOpResult{}; } -void TimeBoxOrder::on_crack(trace::CorID const &) {} +OrderOpResult TimeBoxOrder::on_crack(trace::CorID const &) { + return OrderOpResult{}; +} -void TimeBoxOrder::on_cancel(trace::CorID const &) { +OrderOpResult TimeBoxOrder::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -240,6 +246,7 @@ void TimeBoxOrder::on_cancel(trace::CorID const &) { break; } report_state(); + return OrderOpResult{}; } void TimeBoxOrder::transition(api::orderman::OrderStatus new_status, diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index 0546f4900..acfef59f2 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ; + OrderOpResult on_crack(trace::CorID const&) override ; + OrderOpResult on_cancel(trace::CorID const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 5b8f2cc5f..bab05ca4f 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -100,7 +100,7 @@ void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec, break; } } -void TriggerOrder::on_activate(Price price, Quantity qty, +OrderOpResult TriggerOrder::on_activate(Price price, Quantity qty, OrderServices &services, trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), @@ -116,9 +116,9 @@ void TriggerOrder::on_activate(Price price, Quantity qty, me->order_builder.activate(services); me->child_order = me->order_builder.build(); services.subscribe_to_child_updates( - [this](const OrderStateUpdateEvent &os) { - this->_on_child_order_update(os); - }); + [this](const OrderStateUpdateEvent &os) { + this->_on_child_order_update(os); + }); services.subscribe_to_book(SecurityKey(me->order_def.security_key()), [this](const BookUpdateEvent &bk_event) { this->_on_book_update(bk_event); @@ -138,9 +138,11 @@ void TriggerOrder::on_activate(Price price, Quantity qty, break; } } + return OrderOpResult{}; } // order price, qty change -void TriggerOrder::on_update(Price price, Quantity qty, trace::CorID const &) { +OrderOpResult TriggerOrder::on_update(Price price, Quantity qty, + trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, price, qty); @@ -165,11 +167,9 @@ void TriggerOrder::on_update(Price price, Quantity qty, trace::CorID const &) { case State::END: break; } + return OrderOpResult{}; } -void TriggerOrder::on_crack(trace::CorID const &) { - // not supported -} -void TriggerOrder::on_cancel(trace::CorID const &) { +OrderOpResult TriggerOrder::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), _state); me->cancel_mode = CancelMode::external; @@ -193,6 +193,7 @@ void TriggerOrder::on_cancel(trace::CorID const &) { case State::END: break; } + return OrderOpResult{}; } void TriggerOrder::_on_book_update(const BookUpdateEvent &b_event) { switch (_state) { diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index 263d42d99..34cba264d 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -54,12 +54,11 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price, Quantity, + OrderOpResult on_activate(Price, Quantity, OrderServices&, trace::CorID const&) override ; - void on_update(Price, Quantity, trace::CorID const&) override; - void on_crack(trace::CorID const&) override; - void on_cancel(trace::CorID const&) override; + OrderOpResult on_update(Price, Quantity, trace::CorID const&) override; + OrderOpResult on_cancel(trace::CorID const&) override; private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 5298aa9d0..92a7223d1 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -139,8 +139,8 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, } } -void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { +OrderOpResult BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, + trace::CorID const &) { bts_assert(!me->services); me->services = &services; switch (this_state().status()) { @@ -179,9 +179,10 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, break; } report_state(); + return OrderOpResult{}; } -void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { +OrderOpResult BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); switch (this_state().status()) { case ORDER_STATUS_WORKING: @@ -233,11 +234,10 @@ void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { break; } report_state(); + return OrderOpResult{}; } -void BookAlgo::on_crack(trace::CorID const &) {} - -void BookAlgo::on_cancel(trace::CorID const &) { +OrderOpResult BookAlgo::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); switch (this_state().status()) { @@ -287,6 +287,7 @@ void BookAlgo::on_cancel(trace::CorID const &) { break; } report_state(); + return OrderOpResult{}; } void BookAlgo::transition(api::orderman::OrderStatus new_status, diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 49e58d496..5edadb6a3 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -24,10 +24,9 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ; + OrderOpResult on_cancel(trace::CorID const&) override ; protected: virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 1edfc90cd..13e1d007b 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -54,31 +54,28 @@ void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& ord SpreaderPreActivationOrderServices(&pao_services)); _report_state(); } -void SpreaderOrder::on_activate(Price price, Quantity quantity, +OrderOpResult SpreaderOrder::on_activate(Price price, Quantity quantity, OrderServices& services, const trace::CorID&){ - if (!_active) return; + if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"}; SpreaderOrderServices spreader_order_services (&services); _on_activate(price, quantity, spreader_order_services); _report_state(); + return OrderOpResult{}; } -void SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){ - if (!_active) return; +OrderOpResult SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){ + if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"}; LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); _state_worker->on_update(price, quantity); _report_state(); + return OrderOpResult{}; } -void SpreaderOrder::on_cancel(trace::CorID const&){ - if (!_active) return; +OrderOpResult SpreaderOrder::on_cancel(trace::CorID const&){ + if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"}; LOG(OrderMan, Info, "SpreaderOrder.on_cancel key:{}", key().value()); _state_worker->on_cancel(); _report_state(); -} -void SpreaderOrder::on_crack(trace::CorID const&){ - if (!_active) return; - LOG(OrderMan, Info, "SpreaderOrder.on_crack key: {}", key().value()); - _state_worker->on_crack(); - _report_state(); + return OrderOpResult{}; } // ISpreaderManager //////////////////// //////////////////////////////////////// diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 7b94d671c..5976a996e 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -100,15 +100,12 @@ public: const PreActivationOrderServices&) override; // this is in the critical path, orders can be submitted now // (this is only called once and after the on_init_new) - void on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override; + OrderOpResult on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override; // called when the user (or a higher level order) // updates the order's price or quantity - void on_update(Price, Quantity,trace::CorID const&) override; + OrderOpResult on_update(Price, Quantity,trace::CorID const&) override; // called when the user (or higher level order) cancels an order - void on_cancel(trace::CorID const&) override; - // crack means to let the lower level orders lose from the higher - // level order and cancel the higher level order - void on_crack(trace::CorID const&) override; + OrderOpResult on_cancel(trace::CorID const&) override; // ISpreaderManager //////////////////// //////////////////////////////////////// public: diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 9259a2a7c..400518c57 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -16,6 +16,7 @@ #include "lib/orderman/actors/SecuritySrc.h" #include "lib/orderman/actors/ServiceBridge.h" #include "lib/orderman/actors/order_manager/OrderManager.h" +#include "lib/orderman/events/OrderOpResultEvent.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/plugin/SparkServices.h" #include "lib/plugin/plugin.h" @@ -89,11 +90,13 @@ ActorThread *find_thread_for_actor( struct OrderServiceServer::PImpl { PImpl(bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, trace::PerfLog &log) + DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, + trace::PerfLog &log) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), md_consumer(ss), - stats(stats), dyn_order_registry(d),log(log) {} + stats(stats), dyn_order_registry(d), log(log), in_flight_order_ops(), + current_req_op_id(0) {} ServiceBridge *service_bridge; @@ -110,6 +113,9 @@ struct OrderServiceServer::PImpl { metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; trace::PerfLog &log; + std::unordered_map> + in_flight_order_ops; + uint32_t current_req_op_id; }; OrderServiceServer::OrderServiceServer( @@ -117,7 +123,8 @@ OrderServiceServer::OrderServiceServer( std::shared_ptr &ss, DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, trace::PerfLog &log) - : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats,log)) { + : api::orderman::OrderServiceBase(ctx), + me(new PImpl(ctx, ss, d, stats, log)) { me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); @@ -137,14 +144,14 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for MDSource. See the " "OrdermanCfg key"); - thread->executor.spawn(me->md_consumer, me->stats,log); + thread->executor.spawn(me->md_consumer, me->stats, log); // OrderManager thread = find_thread_for_actor("OrderManager", me->actor_threads); bts_assert_msg(thread, "Could not find a configured thread for OrderManager. See " "the OrdermanCfg key"); - thread->executor.spawn(d,me->log); + thread->executor.spawn(d, me->log); // Timer thread = find_thread_for_actor("Timer", me->actor_threads); @@ -204,6 +211,13 @@ OrderServiceServer::OrderServiceServer( [this, &ctx](auto const &fill) { ctx.post([this, fill] { this->on_fills(fill); }); }, + + [this, &ctx](auto const &order_op_result) { + ctx.post([this, order_op_result] { + this->on_order_op_result(order_op_result); + }); + }, + me->dyn_order_registry, thread->executor.make_proxy()); thread->executor.activate(me->service_bridge); @@ -275,51 +289,60 @@ void OrderServiceServer::on_fills( void OrderServiceServer::create_order( const api::orderman::Create &c, const api::Response &r) { - api::orderman::Response response; - if (!me->service_ready) + + if (!me->service_ready) { + api::orderman::Response response; response.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); - else - response = me->service_bridge->create_order(c); - r(response); + r(response); + } else { + me->in_flight_order_ops[++me->current_req_op_id] = r; + me->service_bridge->create_order(me->current_req_op_id, c); + } } void OrderServiceServer::cancel_order( const api::orderman::Cancel &cancel, const api::Response &r) { - api::orderman::Response response; - response.set_order_key(cancel.order_key()); - if (!me->service_ready) + if (!me->service_ready) { + api::orderman::Response response; + response.set_order_key(cancel.order_key()); response.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); - else - response = me->service_bridge->cancel_order(cancel); - r(response); + r(response); + } else { + me->in_flight_order_ops[++me->current_req_op_id] = r; + me->service_bridge->cancel_order(me->current_req_op_id, cancel); + } } void OrderServiceServer::update_order( const api::orderman::Update &update, const api::Response &r) { - api::orderman::Response response; - response.set_order_key(update.order_key()); - if (!me->service_ready) + if (!me->service_ready) { + api::orderman::Response response; + response.set_order_key(update.order_key()); response.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); - else - response = me->service_bridge->update_order(update); - r(response); + r(response); + } else { + me->in_flight_order_ops[++me->current_req_op_id] = r; + me->service_bridge->update_order(me->current_req_op_id, update); + } } void OrderServiceServer::crack_order( const api::orderman::Crack &crack, const api::Response &r) { - api::orderman::Response response; - response.set_order_key(crack.order_key()); - if (!me->service_ready) + if (!me->service_ready) { + api::orderman::Response response; + response.set_order_key(crack.order_key()); response.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); - else - response = me->service_bridge->crack_order(crack); - r(response); + r(response); + } else { + me->in_flight_order_ops[++me->current_req_op_id] = r; + me->service_bridge->crack_order(me->current_req_op_id, crack); + } } void OrderServiceServer::get_registered_dynamic_order_types( @@ -333,5 +356,18 @@ void OrderServiceServer::get_registered_dynamic_order_types( r(response); } +void OrderServiceServer::on_order_op_result( + OrderOpResultEvent const &op_result) { + auto it = me->in_flight_order_ops.find(op_result.req_id); + bts_assert(it!=me->in_flight_order_ops.end()); + auto &responder = it->second; + api::orderman::Response r; + r.set_order_key(0); + r.set_error_code(op_result.result.error); + r.set_msg(op_result.result.error_msg); + responder(r); + me->in_flight_order_ops.erase(it); +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index 4c23c13f9..3801f6440 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -15,6 +15,7 @@ class MetricsContainer; } namespace orderman { class DynamicOrderRegistry; +class OrderOpResultEvent; class OrderServiceServer : public api::orderman::OrderServiceBase { public: @@ -43,6 +44,7 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { std::unique_ptr me; void on_orders(std::vector const &); void on_fills(std::vector const &); + void on_order_op_result(OrderOpResultEvent const&); }; } // namespace orderman diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 3202d102a..65fc7dba0 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -18,7 +18,7 @@ class DynamicIcebergOrder : public DynamicOrder { public: DynamicIcebergOrder(); ~DynamicIcebergOrder(); - OrderDefinition const &definition() const override; + OrderDefinition const &definition() const; void on_init_new(OrderDefinition const &, const PreActivationOrderServices &) override; void on_init_recovered(OrderRecord const &, diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 43b6e0513..3e95f485d 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From a469da5cc68535072cd3223a2b9def7e96c5b230 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 14:45:35 -0500 Subject: [PATCH 005/218] Fixed race condition when obtaining thread name of perf log thread. --- src/lib/tracing/PerfLog.cpp | 14 +++++++++++--- src/lib/tracing/PerfLog.h | 16 ++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/lib/tracing/PerfLog.cpp b/src/lib/tracing/PerfLog.cpp index e6cf9a37d..18f45a7c4 100644 --- a/src/lib/tracing/PerfLog.cpp +++ b/src/lib/tracing/PerfLog.cpp @@ -22,6 +22,16 @@ namespace bts { namespace trace { + +const char* PerfLog::get_thread_name() +{ + char *thread_name_buffer = new char[17]; + pthread_getname_np(pthread_self(), thread_name_buffer,16); + return thread_name_buffer; +} + +thread_local char const * PerfLog::_thread_name_ptr = get_thread_name(); + auto insert_trace = "insert into trace (" "session_start," "ts," @@ -275,9 +285,7 @@ size_t PerfLog::flush_current_batch_to_disk() { me->insert_trace_statement->bind(":uint64_1", (long long)ev.uint64_1); me->insert_trace_statement->bind(":cor_event", (long long)ev.cor_event.to_uint64()); - char tn[17]; - pthread_getname_np(ev.thread_id, tn, BTS_ARRAYSIZE(tn)-1); - me->insert_trace_statement->bind(":thread", tn); + me->insert_trace_statement->bind(":thread", ev.thread_name); me->insert_trace_statement->exec(); count++; me->insert_trace_statement->reset(); diff --git a/src/lib/tracing/PerfLog.h b/src/lib/tracing/PerfLog.h index 4f2906b34..697543ec7 100644 --- a/src/lib/tracing/PerfLog.h +++ b/src/lib/tracing/PerfLog.h @@ -19,7 +19,7 @@ struct PerfLogEntry { const char *entry_kind; const char *txt_1; uint64_t uint64_1; - pthread_t thread_id; + const char* thread_name; utils::TimeStamp cor_event; uint32_t sn; uint32_t uint32_1; @@ -27,6 +27,8 @@ struct PerfLogEntry { class PerfLog { tbb::concurrent_queue _pending; + static thread_local const char* _thread_name_ptr; + bool _disabled; struct PImpl; std::unique_ptr me; @@ -39,7 +41,7 @@ class PerfLog { void log(CorID cid, const char *entry_kind, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { _pending.push({utils::TimeStamp::now(), cid.channel, entry_kind, txt_1, - uint64_1, pthread_self(), utils::TimeStamp(), cid.sn, + uint64_1, _thread_name_ptr, utils::TimeStamp(), cid.sn, uint32_1}); } @@ -47,19 +49,19 @@ class PerfLog { uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { _pending.push({ts, cid.channel, entry_kind, txt_1, uint64_1, - pthread_self(), utils::TimeStamp(), cid.sn, uint32_1}); + _thread_name_ptr,utils::TimeStamp(), cid.sn, uint32_1}); } void log(CorID cid, utils::TimeStamp ts, utils::TimeStamp ts2, const char *entry_kind, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { _pending.push({ts, cid.channel, entry_kind, txt_1, uint64_1, - pthread_self(), ts2, cid.sn, uint32_1}); + _thread_name_ptr,ts2, cid.sn, uint32_1}); } void flush() { _pending.push({utils::TimeStamp(), nullptr, nullptr, nullptr, 0, - pthread_self(), utils::TimeStamp(), 0, 0}); + _thread_name_ptr,utils::TimeStamp(), 0, 0}); } void log(PerfLogEntry const &e) { _pending.push(e); } @@ -77,6 +79,8 @@ class PerfLog { size_t flush_current_batch_to_disk() ; bool is_flush_signal(PerfLogEntry const&); void init_db(); + static const char*get_thread_name(); + friend class ScopedPerfLogEntry; }; class ScopedPerfLogEntry { @@ -91,7 +95,7 @@ class ScopedPerfLogEntry { entry_kind, txt_1, uint64_1, - pthread_self(), + l._thread_name_ptr, utils::TimeStamp(), cid.sn, uint32_1} {} From 34350fd469838199813c8077054e56d6682f1021 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 15:11:53 -0500 Subject: [PATCH 006/218] Fixed utterly broken recovery of orders from execution reports. --- src/lib/config/protos/jetfix.proto | 2 +- src/lib/jetfix/gateway/CoreGateway.cpp | 4 ++- src/lib/jetfix/store/FIXFileStore.cpp | 5 ++-- .../orderman/orderman_utils/orderman_common.h | 18 ++++++++---- src/lib/orderman/orders/NativeOrder.cpp | 28 +++++++++---------- .../exchange_sim/ExchangeSimApplication.cpp | 19 ++++++++++++- 6 files changed, 50 insertions(+), 26 deletions(-) diff --git a/src/lib/config/protos/jetfix.proto b/src/lib/config/protos/jetfix.proto index 93bbe6977..6e3cfbc56 100644 --- a/src/lib/config/protos/jetfix.proto +++ b/src/lib/config/protos/jetfix.proto @@ -68,7 +68,7 @@ message JetFIX { optional uint32 msg_buffer_sz = 230 [default = 10000000]; optional uint32 msg_high_water_mark = 240 [default = 2048]; - optional uint32 seconds_to_replay = 250 [default = 30]; + optional uint32 seconds_to_replay = 250 [default = 600]; optional bool log_fix_stream = 260 [default=false]; optional bool use_persisted_quote_ids = 270 [default=true]; optional uint32 quote_id_reservation_size = 290 [default=100000]; diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index 4ef84d41b..8b014898c 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -442,7 +442,9 @@ void CoreGateway::sync_time(EventData const &ev) { me->connection_attempts++; if (!me->has_replayed) { - me->observer.replay(me->session_info->store->replay()); + auto msgs_to_replay = me->session_info->store->replay(); + LOG(Jetfix, Warn, "Replaying {} FIX msgs", msgs_to_replay.size()); + me->observer.replay(msgs_to_replay); me->has_replayed = true; } diff --git a/src/lib/jetfix/store/FIXFileStore.cpp b/src/lib/jetfix/store/FIXFileStore.cpp index 8b6825a73..58059c956 100644 --- a/src/lib/jetfix/store/FIXFileStore.cpp +++ b/src/lib/jetfix/store/FIXFileStore.cpp @@ -115,7 +115,7 @@ std::string store_path(std::string base_path, std::map load_replay(config::JetFIX::Connection const &cfg, std::string const &path, - uint32_t max_sn) { + uint32_t ) { std::map result; if (boost::filesystem::exists(path)) { @@ -136,8 +136,7 @@ load_replay(config::JetFIX::Connection const &cfg, std::string const &path, cfg.seconds_to_replay())) { InMsgBuffer msg(line_buffer.substr(24)); auto sn = msg.get_seq_num(); - if (sn <= max_sn) - result[sn] = msg; + result[sn] = msg; } } } else diff --git a/src/lib/orderman/orderman_utils/orderman_common.h b/src/lib/orderman/orderman_utils/orderman_common.h index 4fa5f145b..14fe0aec1 100644 --- a/src/lib/orderman/orderman_utils/orderman_common.h +++ b/src/lib/orderman/orderman_utils/orderman_common.h @@ -67,11 +67,19 @@ template inline std::string to_str(T const &t) { } template -std::pair to_trim_str(std::array const &in) { - for (auto i = (size_t)0; i < N; i++) - if (in[i] == ' ') - return std::make_pair(&in[0], i); - return std::make_pair(&in[0], N); +std::pair find_trim_str(std::array const &in) { + auto i = N; + for (; i!= 0; i--) + if (in[i-1] != ' ') + break; + + return std::make_pair(&in[0], i); +} + +template +std::string to_trim_str(T const&t) { + auto ts = find_trim_str(t.value()); + return std::string(ts.first,ts.second); } inline bool in_terminal_state(bts::api::orderman::OrderStatus order_status) { diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 2676bc96d..82ddb4da4 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -178,7 +178,7 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec, } } -api::orderman::OrderDefinition const & +api::orderman::OrderDefinition NativeOrder::on_init_from_exe_report(ExecutionReport const &er, const PreActivationOrderServices &os) { auto k = er.order_key; @@ -193,7 +193,8 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er, auto sec = os.sec_db.resolve(SecurityKey(def.security_key())); auto rev_rec = os.order_router.get_reverse_routing_record( - er.cfg->name(), to_str(er.operator_id), to_str(er.account_name), sec); + er.cfg->name(), to_trim_str(er.operator_id), + to_trim_str(er.account_name), sec); if (rev_rec.ok) { def.set_user(rev_rec.user); @@ -203,7 +204,7 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er, } else { LOG(OrderMan, Error, "Could not recover account and user information from order {}" - "The following information is available: {}. ", + ". The following information is available: {}. ", k.value(), rev_rec.error_msg); def.set_user(""); def.set_user_id(0); @@ -256,28 +257,26 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er, } auto &native_state = get_native_state(state); - auto ts = to_trim_str(er.exchange_order_id.value()); - native_state.set_exchange_order_id(std::string(ts.first, ts.second)); + native_state.set_exchange_order_id(to_trim_str(er.exchange_order_id)); native_state.set_last_msg_seq_num(er.msg_seq_num); native_state.set_native_type(er.order_type); auto &rr = *native_state.mutable_routing_record(); rr.set_session(er.cfg->name()); - rr.set_account(to_str(er.account_name)); - rr.set_operator_id(to_str(er.operator_id)); + rr.set_account(to_trim_str(er.account_name)); + rr.set_operator_id(to_trim_str(er.operator_id)); rr.set_cti_code(CTICode(er.cfg->cti_code()[0])); rr.set_customer_or_firm(CustomerOrFirm(er.cfg->customer_or_firm())); - + rr.set_location(er.cfg->sender_locationid()); on_init_recovered(orecord, os); return orecord.def(); } NativeOrder::~NativeOrder() {} -OrderOpResult -NativeOrder::on_activate(Price p, Quantity q, - bts::orderman::OrderServices &services, - trace::CorID const &trace) { +OrderOpResult NativeOrder::on_activate(Price p, Quantity q, + bts::orderman::OrderServices &services, + trace::CorID const &trace) { auto scoped_log = services.log_scope(trace, "NativeOrder::on_activate", key().value()); @@ -470,7 +469,7 @@ NativeOrder::on_activate(Price p, Quantity q, } OrderOpResult NativeOrder::on_update(Price p, Quantity q, - trace::CorID const &trace) { + trace::CorID const &trace) { auto scoped_log = me->services->log_scope(trace, "NativeOrder::on_update", key().value()); @@ -688,8 +687,7 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { native_state.set_native_type(er.data->order_type); bool got_first_exchange_order_id = !me->received_exchanged_order_id; if (got_first_exchange_order_id) { - auto ts = to_trim_str(er.data->exchange_order_id.value()); - native_state.set_exchange_order_id(std::string(ts.first, ts.second)); + native_state.set_exchange_order_id(to_trim_str(er.data->exchange_order_id)); add_exchange_order_id_to_fix(); } diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp index 2a36f53f6..cbea8c309 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -22,6 +22,8 @@ #include #include #include +#include + #include namespace bts { @@ -316,7 +318,13 @@ void ExchangeSimApplication::onMessage(const FIX42::OrderCancelRequest &message, FIX::OrigClOrdID origClOrdID; FIX::SecurityDesc sec_desc; FIX::Side side; + FIX::SenderCompID senderCompID; + FIX::TargetCompID targetCompID; + FIX::SenderSubID senderSubID; + message.getHeader().get(senderCompID); + message.getHeader().get(senderSubID); + message.getHeader().get(targetCompID); message.get(origClOrdID); message.get(sec_desc); message.get(side); @@ -328,7 +336,16 @@ void ExchangeSimApplication::onMessage(const FIX42::OrderCancelRequest &message, if (!order) { LOG(ExSim, Info, "Receive cancel for unknown order {}", origClOrdID.getString()); - throw std::logic_error("Unknown order"); + + + FIX42::OrderCancelReject rej; + rej.set(FIX::ClOrdID(origClOrdID.getString())); + rej.set(FIX::Text("Unknown order")); + rej.getHeader().set(FIX::TargetSubID(senderSubID.getValue())); + try { + FIX::Session::sendToTarget(rej, targetCompID, senderCompID); + LOG(ExSim, Info, "Rejected cancel for order {}", origClOrdID.getString()); + } catch (FIX::SessionNotFound &) {} } else { auto order_cpy = *order; order_cpy.set_open_quantity(0); From b84a63819929aedca670017289cf37abdfef43e9 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 15:17:50 -0500 Subject: [PATCH 007/218] Fixed life time bug when retuerning a def from an execution report. --- src/lib/orderman/orders/NativeOrder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 0a5b93c4e..4aac5f696 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -30,7 +30,7 @@ class NativeOrder : public Order { OrderOpResult on_crack(trace::CorID const &) override; OrderOpResult on_cancel(trace::CorID const &) override; - api::orderman::OrderDefinition const & + api::orderman::OrderDefinition on_init_from_exe_report(ExecutionReport const &, const PreActivationOrderServices &); From 601eb4ece195a519479ff7cca0da4ce87aba12a2 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 15:18:34 -0500 Subject: [PATCH 008/218] key needs to be setup before we can call on_init_from_exe_report --- src/lib/orderman/order_factory/OrderFactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index a03ff8ce4..bf4b960f6 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -98,11 +98,11 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const &r) { case NATIVE_ORDER_TYPE_STOP: case NATIVE_ORDER_TYPE_STOP_LIMIT: { auto native_order = std::make_unique(); + native_order->_key = r.order_key; + native_order->_parent_key = null_order_key(); auto def = native_order->on_init_from_exe_report( r, PreActivationOrderServices{me->sec_db, *this, me->router}); native_order->set_def(def); - native_order->_key = r.order_key; - native_order->_parent_key = null_order_key(); me->my_orders.emplace_back(); auto &order_ptr = me->my_orders.back(); order_ptr.reset(native_order.release()); From 0c4e22537dc1c900fc250d1711c5510ddecc26a5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 15:19:37 -0500 Subject: [PATCH 009/218] Upgraded SDK example to support op result of order.activate() --- src/sdk/examples/order_plugin_example.cpp | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 65fc7dba0..cfe922a8f 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -1,12 +1,11 @@ +#include "lib/config/config.h" +#include "lib/config/protos/system.pb.h" #include "spark/lib/logging/logging.h" -#include "spark/lib/orderman/orders/DynamicOrder.h" -#include "spark/lib/plugin/SparkServices.h" #include "spark/lib/orderman/actors/order_manager/ChildOrder.h" #include "spark/lib/orderman/actors/order_manager/OrderBuilder.h" #include "spark/lib/orderman/orders/DynamicOrder.h" +#include "spark/lib/plugin/SparkServices.h" #include "spark/lib/utils/PBUtils.h" -#include "lib/config/protos/system.pb.h" -#include "lib/config/config.h" using namespace bts::api::orderman; using namespace bts::orderman; @@ -18,16 +17,15 @@ class DynamicIcebergOrder : public DynamicOrder { public: DynamicIcebergOrder(); ~DynamicIcebergOrder(); - OrderDefinition const &definition() const; + OrderDefinition const &definition() const; void on_init_new(OrderDefinition const &, const PreActivationOrderServices &) override; void on_init_recovered(OrderRecord const &, const PreActivationOrderServices &) override; - void on_activate(Price, Quantity, OrderServices &, - trace::CorID const&) override; - void on_update(Price, Quantity, trace::CorID const&) override; - void on_crack(trace::CorID const &) override; - void on_cancel(trace::CorID const &) override; + OrderOpResult on_activate(Price, Quantity, OrderServices &, + trace::CorID const &) override; + OrderOpResult on_update(Price, Quantity, trace::CorID const &) override; + OrderOpResult on_cancel(trace::CorID const &) override; private: void report_state(); @@ -125,9 +123,9 @@ void DynamicIcebergOrder::on_init_recovered( } } -void DynamicIcebergOrder::on_activate(Price p, Quantity q, - OrderServices &services, - trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_activate(Price p, Quantity q, + OrderServices &services, + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -162,9 +160,11 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, break; } report_state(); + return OrderOpResult(); } -void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_update(Price p, Quantity q, + trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -189,11 +189,10 @@ void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { break; } report_state(); + return OrderOpResult(); } -void DynamicIcebergOrder::on_crack(trace::CorID const &) {} - -void DynamicIcebergOrder::on_cancel(trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); @@ -216,6 +215,7 @@ void DynamicIcebergOrder::on_cancel(trace::CorID const &) { break; } report_state(); + return OrderOpResult(); } void DynamicIcebergOrder::report_state() { @@ -354,12 +354,10 @@ void DynamicIcebergOrder::transition(api::orderman::OrderStatus new_status) { me->state.set_status(new_status); } - } // namespace order_example } // namespace bts -DynamicOrderDescriptor get_dynamic_iceberg_order_desc() -{ +DynamicOrderDescriptor get_dynamic_iceberg_order_desc() { DynamicOrderDescriptor desc; // order type name @@ -373,7 +371,8 @@ DynamicOrderDescriptor get_dynamic_iceberg_order_desc() // child order param = desc.add_param_desc(); param->set_param_name("child"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); + param->mutable_param_type()->set_primitive( + DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); return desc; } @@ -382,8 +381,9 @@ extern "C" void init_spark_plugin(bts::SparkServices &serv) { using namespace bts; if (config::get().type() == "dev") { - serv.register_dynamic_order(get_dynamic_iceberg_order_desc(), - []() { return std::make_unique(); }); - LOG(Plugin,Info, "Initialized order_plugin_example.so"); + serv.register_dynamic_order(get_dynamic_iceberg_order_desc(), []() { + return std::make_unique(); + }); + LOG(Plugin, Info, "Initialized order_plugin_example.so"); } } From 0ec955cc90da687b3f995e0afed97cc72ca182cd Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 15:21:07 -0500 Subject: [PATCH 010/218] Possibly fixed persistence failure when trying to duplicate fill. --- src/lib/orderman/actors/FillStore.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index 5bf53fc5c..1e1f7bf85 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -73,16 +73,17 @@ void FillStore::init() { LOG(persist, Info, "Loading load all fills"); auto all = me->store->retrieve_all()[fills_ns]; LOG(persist, Info, "Finished loading all {} fills", all.size()); - for (auto const &kvp : all) + for (auto const &kvp : all) { + auto fk = kvp.first; + me->known_fills.insert(fk); + if (utils::pb::from_string(kvp.second, &fill)) { auto sec = sec_idx[SecurityKey(fill.security_key())]; if (sec) { - auto fk = kvp.first; if (!me->sod_pos_map.add_fill_to_sod_pos(fill)) stored_batch.emplace_back(fill, *sec); - me->known_fills.insert(fk); } else LOG(persist, Diag, "Stored fill {} contains unresolved security {}. ", @@ -92,6 +93,7 @@ void FillStore::init() { "Could not recover fill {} from storage. " "This should be investigated", kvp.first); + } me->fill_stream = make_stream(); LOG(OrderMan, Info, "Fill Store published {} fills recoved from disk out of {} " From 2c865c123adac8400247b8297de706bf6ab6016d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 17:43:41 -0500 Subject: [PATCH 011/218] Fixed broken persistence of orders. --- src/lib/orderman/actors/OrderStore.cpp | 35 ++++++++++++++++++-------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/src/lib/orderman/actors/OrderStore.cpp b/src/lib/orderman/actors/OrderStore.cpp index 154476e32..ca139a1ad 100644 --- a/src/lib/orderman/actors/OrderStore.cpp +++ b/src/lib/orderman/actors/OrderStore.cpp @@ -30,7 +30,11 @@ struct OrderStore::PImpl { State state; const GatewayName gw_name; - std::unordered_map known_orders; + struct ORInfo { + api::orderman::OrderRecord rec; + bool is_saved; + }; + std::unordered_map known_orders; std::unique_ptr store; mercury::Stream order_stream; mercury::Actor::SubHandle stored_sec_sub; @@ -97,7 +101,7 @@ void OrderStore::init() { } else { if (!_order_cutoff(rec)) stored_batch.emplace_back(rec); - me->known_orders[ok] = rec; + me->known_orders[ok] = PImpl::ORInfo {rec,true}; } } else LOG(OrderMan, Error, @@ -124,7 +128,8 @@ void OrderStore::on_order_state_update( if (u.events) for (auto const &ev : *u.events) { - auto &rec = me->known_orders[ev.key]; + auto &rec_info = me->known_orders[ev.key]; + auto &rec = rec_info.rec; bts_assert(rec.has_def()); rec.set_key(ev.key.value()); rec.set_parent_key(ev.parent_key.value()); @@ -132,8 +137,8 @@ void OrderStore::on_order_state_update( if (rec.has_state()) rec.mutable_state()->MergeFrom(ev.rebuild_state()); else { - *rec.mutable_state()->mutable_created() = utils::pb::pb_now(); *rec.mutable_state() = ev.rebuild_state(); + *rec.mutable_state()->mutable_created() = utils::pb::pb_now(); } *rec.mutable_state()->mutable_last_change() = utils::pb::pb_now(); } @@ -146,8 +151,10 @@ void OrderStore::on_order_definition_update( std::set modified_orders; if (u.events) for (auto const &ev : *u.events) { - auto &rec = me->known_orders[ev.key]; + auto &rec_info = me->known_orders[ev.key]; + auto &rec = rec_info.rec; rec.set_key(ev.key.value()); + rec_info.is_saved = rec.has_def(); *rec.mutable_def() = *ev.def; modified_orders.insert(ev.key); } @@ -156,13 +163,21 @@ void OrderStore::on_order_definition_update( void OrderStore::store_and_publish_if_complete(std::set const&changed) { - std::vector stored_batch; for (auto k : changed) { - auto &rec = me->known_orders[k]; - if (rec.has_def() && rec.has_state()) - stored_batch.emplace_back(rec); + auto &rec_info = me->known_orders[k]; + auto &rec = rec_info.rec; + if (rec.has_def() && rec.has_state()) { + publish(me->order_stream,rec); + if (rec_info.is_saved) + me->store->update(orders_ns, std::to_string(k.value()), + utils::pb::to_string(rec)); + else { + me->store->insert(orders_ns, std::to_string(k.value()), + utils::pb::to_string(rec)); + rec_info.is_saved = true; + } + } } - publish_batch(me->order_stream,stored_batch); } bool OrderStore::_order_cutoff(const api::orderman::OrderRecord &rec) { From 69155162ca38475a2e0078de45e4741e803b0da4 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 17:44:17 -0500 Subject: [PATCH 012/218] Improved replay of fix messages to be more robust. --- src/lib/jetfix/store/FIXFileStore.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/jetfix/store/FIXFileStore.cpp b/src/lib/jetfix/store/FIXFileStore.cpp index 58059c956..25c4d05cd 100644 --- a/src/lib/jetfix/store/FIXFileStore.cpp +++ b/src/lib/jetfix/store/FIXFileStore.cpp @@ -192,15 +192,13 @@ FIXFileStore::FIXFileStore(config::JetFIX::Connection const &cfg, auto fix_log_p = fix_log_path(path); auto replay_messages = load_replay(cfg, fix_log_p, me->last_seq_num_processed); - uint32_t previous_sn = 0; + auto max_sn = 0u; for (auto &p : replay_messages) { auto sn = p.first; auto &m = p.second; - if (!(m.has_poss_dup_flag_flag() && m.get_poss_dup_flag())) { - if (previous_sn != 0) - bts_assert(sn == (previous_sn + 1)); - previous_sn = sn; + if (sn > max_sn) { me->replay_messages.emplace_back(m); + max_sn = sn; } } me->fix_store.open(fix_log_p, std::ofstream::app); From d0e32911ad3dfd61fb746895f78f3fe013f5e89e Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 10 Jan 2019 11:23:20 -0500 Subject: [PATCH 013/218] Made recovery of lost order use case insensitive op id and account. Turns out CME upper cases operator id and clearing account when it sends them back. --- src/lib/api/service_helpers/AdminServiceUtils.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index ca30f9f61..0c86f2a7f 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -8,6 +8,7 @@ #include #include +#include namespace bts{ namespace admin{ @@ -814,9 +815,13 @@ AdminServiceUtils::find_user_account_matches (const bts::api::admin::AdminData& auto user_ptrs = users(admin_data, false); for(const bts::api::admin::BTSAccount* account_ptr : account_ptrs){ if (account_has_connection(*account_ptr, connection)){ - if (exchange_account == find_account_exchange_account(admin_data,*account_ptr,exchange,find_account_result) && find_account_result.is_success()){ + if (boost::algorithm::iequals(exchange_account, + find_account_exchange_account(admin_data,*account_ptr,exchange,find_account_result)) && + find_account_result.is_success()){ for(const bts::api::admin::BTSUser* user_ptr : user_ptrs){ - if (exchange_user == find_user_exchange_id(admin_data,*user_ptr,exchange,find_user_result) && find_user_result.is_success()) + if (boost::algorithm::iequals(exchange_user, + find_user_exchange_id(admin_data,*user_ptr,exchange,find_user_result)) && + find_user_result.is_success()) return std::pair(account_ptr,user_ptr); } } From dcd2cc22e1422eb3d6457f52eec8f87e46ed54c8 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 12 Jan 2019 15:45:08 -0500 Subject: [PATCH 014/218] Removed trace::CorID from most of the order code. --- .../actors/order_manager/ChildOrder.h | 20 ++--- .../actors/order_manager/OrderManager.cpp | 21 +++-- .../actors/order_manager/OrderManager.h | 2 +- .../actors/order_manager/OrderServices.h | 77 ++++++++++--------- src/lib/orderman/events/BookUpdateEvent.h | 2 + src/lib/orderman/orders/DynamicOrder.cpp | 7 +- src/lib/orderman/orders/DynamicOrder.h | 6 +- src/lib/orderman/orders/IcebergOrder.cpp | 16 ++-- src/lib/orderman/orders/IcebergOrder.h | 10 +-- src/lib/orderman/orders/NativeOrder.cpp | 36 ++++----- src/lib/orderman/orders/NativeOrder.h | 11 ++- src/lib/orderman/orders/Order.cpp | 5 +- src/lib/orderman/orders/Order.h | 10 +-- src/lib/orderman/orders/TimeBoxOrder.cpp | 10 +-- src/lib/orderman/orders/TimeBoxOrder.h | 8 +- src/lib/orderman/orders/TriggerOrder.cpp | 7 +- src/lib/orderman/orders/TriggerOrder.h | 7 +- .../orderman/orders/book_algos/BookAlgo.cpp | 7 +- src/lib/orderman/orders/book_algos/BookAlgo.h | 6 +- .../spreader_orders/ISpreaderStateWorker.h | 5 +- .../orders/spreader_orders/SpreaderOrder.cpp | 23 +++--- .../orders/spreader_orders/SpreaderOrder.h | 13 ++-- .../spreader/SingleFillHedger.cpp | 7 +- .../spreader/SingleFillHedger.h | 7 +- .../spreader/SingleLegQuoter.cpp | 4 +- .../spreader/SingleLegQuoter.h | 12 ++- .../spreader/SpreaderBookkeepingData.cpp | 8 +- .../spreader/SpreaderBookkeepingData.h | 3 +- .../spreader/SpreaderChildOrderState.h | 15 ++-- .../SpreaderOrderBuilder.h | 4 +- .../SpreaderOrderServices.cpp | 10 +-- .../spreader/hedger/IHedgerStateWorker.h | 2 +- .../hedger_states/HedgerEndStateWorker.cpp | 2 +- .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 2 +- .../hedger_states/HedgerStartStateWorker.h | 2 +- .../HedgerWaitingForCancelAckStateWorker.cpp | 2 +- .../HedgerWaitingForCancelAckStateWorker.h | 2 +- ...WaitingForFirstAckCancelledStateWorker.cpp | 2 +- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 2 +- .../HedgerWaitingForFirstAckStateWorker.h | 2 +- .../HedgerWorkingStateWorker.cpp | 2 +- .../hedger_states/HedgerWorkingStateWorker.h | 2 +- .../spreader/quoter/IQuoterStateWorker.h | 2 +- .../quoter_states/QuoterEndStateWorker.cpp | 2 +- .../quoter_states/QuoterEndStateWorker.h | 2 +- .../quoter_states/QuoterStartStateWorker.cpp | 2 +- .../quoter_states/QuoterStartStateWorker.h | 2 +- .../QuoterWaitingForCancelAckStateWorker.cpp | 3 +- .../QuoterWaitingForCancelAckStateWorker.h | 2 +- ...uoterWaitingForFirstAckCancelledWorker.cpp | 2 +- .../QuoterWaitingForFirstAckCancelledWorker.h | 2 +- .../QuoterWaitingForFirstAckWorker.cpp | 2 +- .../QuoterWaitingForFirstAckWorker.h | 2 +- .../QuoterWaitingForIOCWorker.cpp | 2 +- .../quoter_states/QuoterWaitingForIOCWorker.h | 2 +- .../QuoterWaitingForSizeStateWorker.cpp | 11 +-- .../QuoterWaitingForSizeStateWorker.h | 3 +- .../QuoterWorkingStateWorker.cpp | 18 ++--- .../quoter_states/QuoterWorkingStateWorker.h | 5 +- .../SpreaderEndStateWorker.cpp | 5 +- .../spreader_states/SpreaderEndStateWorker.h | 5 +- .../SpreaderStartStateWorker.cpp | 5 +- .../SpreaderStartStateWorker.h | 5 +- ...SpreaderWaitingForCancelAllStateWorker.cpp | 5 +- .../SpreaderWaitingForCancelAllStateWorker.h | 5 +- ...readerWaitingForInitialDataStateWorker.cpp | 6 +- ...SpreaderWaitingForInitialDataStateWorker.h | 5 +- .../SpreaderWorkingStateWorker.cpp | 14 ++-- .../SpreaderWorkingStateWorker.h | 5 +- .../spreader_orders/tests/tests_common.h | 10 +-- src/web/CMakeDeps.cmake | 2 +- 73 files changed, 237 insertions(+), 304 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 8e1a49ec1..643d9c701 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -39,33 +39,33 @@ class ChildOrder { bool is_active() const { return _active; } - void activate(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { + void activate(Price p, Quantity q) { bts_assert(_order); bts_assert(!_active); _child_order_services = - &_parent_order_services->activate_child(*_order, p, q, trace); + &_parent_order_services->activate_child(*_order, p, q); _active = true; } - void update(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { + void update(Price p, Quantity q) { bts_assert(_order); bts_assert(_active); - _child_order_services->update(p, q, trace); + _child_order_services->update(p, q); } - void update(api::orderman::Update const&update, trace::CorID const& trace = trace::CorID()) { + void update(api::orderman::Update const&update) { bts_assert(_order); bts_assert(_active); - _child_order_services->update(update,trace); + _child_order_services->update(update); } - void crack(trace::CorID const &trace = trace::CorID()) { + void crack() { bts_assert(_order); bts_assert(_active); - _child_order_services->crack(trace); + _child_order_services->crack(); } - void cancel(trace::CorID const &trace = trace::CorID()) { + void cancel() { bts_assert(_order); bts_assert(_active); - _child_order_services->cancel(trace); + _child_order_services->cancel(); } private: diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 77405d0d5..8d0069975 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -156,8 +156,7 @@ void OrderManager::on_order_recovery( bts_assert(r.second); auto const &ostate = ev.order_record.state(); order.on_activate(Price(ostate.price()), - Quantity(ostate.quantity()), *order._services, - trace::CorID()); + Quantity(ostate.quantity()), *order._services); } // signal that we are ready @@ -193,7 +192,7 @@ void OrderManager::on_execution_report( auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); order->on_activate(report.data->price, report.data->quantity, - *order->_services, trace::CorID()); + *order->_services); } } } @@ -208,7 +207,7 @@ void OrderManager::on_activate_order( order->init_order_services(me->services_data); auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); - auto op_r = order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); + auto op_r = order->on_activate(ev.price, ev.quantity, *order->_services); publish(me->services_data.report_order_op_result_pub,order->key(),ev.req_id,op_r); } } @@ -221,10 +220,9 @@ void OrderManager::on_update_order(const mercury::Update &m) { OrderOpResult op_r; if (it != me->orders.end()) { if (ev.is_full_update()) - op_r = it->second->on_update(ev.full_update(), trace::CorID{}); + op_r = it->second->on_update(ev.full_update()); else - op_r = it->second->on_update(Price(ev.price()), Quantity(ev.quantity()), - trace::CorID{}); + op_r = it->second->on_update(Price(ev.price()), Quantity(ev.quantity())); } else { op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; LOG(OrderMan, Error, @@ -243,7 +241,7 @@ void OrderManager::on_cancel_order(const mercury::Update &m) { auto it = me->orders.find(k); OrderOpResult op_r; if (it != me->orders.end()) - op_r = it->second->on_cancel(ev.trace); + op_r = it->second->on_cancel(); else { op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; LOG(OrderMan, Error, @@ -262,7 +260,7 @@ void OrderManager::on_crack_order(const mercury::Update &m) { auto it = me->orders.find(k); OrderOpResult op_r; if (it != me->orders.end()) - it->second->on_crack(trace::CorID{}); + it->second->on_crack(); else { op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; LOG(OrderMan, Error, @@ -284,15 +282,14 @@ void OrderManager::on_gateway_state( } OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, - Price p, Quantity q, - trace::CorID const &trace) { + Price p, Quantity q) { auto const &def = order.def(); publish_order_def_update(order.key(), def); order.init_order_services(me->services_data, parent); auto r = me->orders.emplace(order.key(), &order); bts_assert(r.second); - order.on_activate(p, q, *order._services, trace); + order.on_activate(p, q, *order._services); return *order._services; } diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index db9fabbcf..e0df8de83 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -92,7 +92,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void after_event() override; OrderServices &activate_child(OrderServices &parent, Order &, Price, - Quantity, trace::CorID const &); + Quantity); void publish_order_def_update( OrderKey k, diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index df0ff5914..cee3693b4 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -64,12 +64,12 @@ class SessionServices { } void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, - trace::CorID const &trace) { + trace::CorID const &corid) { auto &stream = _session_data->current_buffer->first_stream(); stream.new_msg(mt).append(f); if (stream.n_msgs() == 1) - _session_data->current_trace = trace; + _session_data->current_trace = corid; } bool is_gateway_connected() const { return _session_data->gw_connected; } @@ -143,33 +143,34 @@ class OrderServices { Governor &governor(SessionServices &ss) { return ss.governor(); } void queue_fix(SessionServices &ss, jetfix::MessageTypes mt, - jetfix::FIXFragment const &f, trace::CorID const &trace) { - ss.queue_fix(mt, f, trace); + jetfix::FIXFragment const &f) { + ss.queue_fix(mt, f, _corid); } - void log(trace::CorID cid, const char *entry_kind, uint64_t uint64_1 = 0, + void log(const char *entry_kind, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { - _data->log.log(cid, entry_kind, uint64_1, txt_1, uint32_1); + _data->log.log(_corid, entry_kind, uint64_1, txt_1, uint32_1); } - trace::ScopedPerfLogEntry log_scope(trace::CorID cid, const char *entry_kind, + trace::ScopedPerfLogEntry log_scope(const char *entry_kind, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { - return trace::ScopedPerfLogEntry(_data->log, cid, entry_kind, uint64_1, + return trace::ScopedPerfLogEntry(_data->log, _corid, entry_kind, uint64_1, txt_1, uint32_1); } - void report_definition(const api::orderman::OrderDefinition &def) { - _owner->set_def(def); + void report_definition(const api::orderman::CustomOrderDefinition &cdef) { + auto new_def = *_owner->def(); + *new_def.mutable_custom_def() = cdef; + _owner->set_def(new_def); _data->owner.publish(_data->report_order_definition_pub, _owner->key(), _owner->def()); } - void report_state(const api::orderman::OrderState &state, - trace::CorID const &trace = trace::CorID()) { + void report_state(const api::orderman::OrderState &state) { OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), state, - trace); + _corid); _data->owner.publish(_data->report_order_state_pub, ev); if (orderman::in_terminal_state(state.status())) { @@ -202,8 +203,10 @@ class OrderServices { // Book using BookSubID = EventStream::SubID; template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { - return _book_updates.sub( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); + return _book_updates.sub(k, [this, cb](auto const &ev) { + _corid = ev.trace; + this->on_external_event(ev, cb); + }); } void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } @@ -231,8 +234,10 @@ class OrderServices { using ExeReportSubID = EventStream::SubID; template void subscribe_to_exe_report(SessionServices &ss, OrderKey k, CB &&cb) { - ss.subscribe_to_exe_report( - k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); + ss.subscribe_to_exe_report(k, [this, cb](auto const &ev) { + _corid = ev.trace; + this->on_external_event(ev, cb); + }); } void unsubscribe_from_exe_report(SessionServices &ss, ExeReportSubID sid) { ss.unsubscribe_from_exe_report(sid); @@ -287,9 +292,10 @@ class OrderServices { } _pending_calls.clear(); _busy = false; + _corid = trace::CorID{}; } - template void on_inter_order_call(C const &c) { + template void call_with_reentrancy_guard(C const &c) { if (_busy) _pending_calls.emplace_back(c); else { @@ -326,36 +332,33 @@ class OrderServices { friend class ChildOrder; - OrderServices &activate_child(Order &o, Price p, Quantity q, - trace::CorID const &trace) { - return _data->owner.activate_child(*this, o, p, q, trace); + OrderServices &activate_child(Order &o, Price p, Quantity q) { + return _data->owner.activate_child(*this, o, p, q); } - void update(Price p, Quantity q, trace::CorID const &trace) { - on_inter_order_call([p, q, trace](OrderServices &self) { - self._owner->on_update(p, q, trace); - }); + void update(Price p, Quantity q) { + call_with_reentrancy_guard( + [p, q](OrderServices &self) { self._owner->on_update(p, q); }); } - void update(api::orderman::Update const &update, trace::CorID const &trace) { - on_inter_order_call([update, trace](OrderServices &self) { - self._owner->on_update(update, trace); - }); + void update(api::orderman::Update const &update) { + call_with_reentrancy_guard( + [update](OrderServices &self) { self._owner->on_update(update); }); } - void crack(trace::CorID const &trace) { - on_inter_order_call( - [trace](OrderServices &self) { self._owner->on_crack(trace); }); + void crack() { + call_with_reentrancy_guard( + [](OrderServices &self) { self._owner->on_crack(); }); } - void cancel(trace::CorID const &trace) { - on_inter_order_call( - [trace](OrderServices &self) { self._owner->on_cancel(trace); }); + void cancel() { + call_with_reentrancy_guard( + [](OrderServices &self) { self._owner->on_cancel(); }); } void on_child_update(OrderStateUpdateEvent const &ev) { - on_inter_order_call( + call_with_reentrancy_guard( [ev](OrderServices &self) { self._child_update_cb(ev); }); } bool _busy; - trace::CorID corid; + trace::CorID _corid; boost::container::small_vector, 10> _pending_calls; Order *_owner; diff --git a/src/lib/orderman/events/BookUpdateEvent.h b/src/lib/orderman/events/BookUpdateEvent.h index bf71357a8..1dea8f25d 100644 --- a/src/lib/orderman/events/BookUpdateEvent.h +++ b/src/lib/orderman/events/BookUpdateEvent.h @@ -17,6 +17,8 @@ class BookUpdateEvent : public mercury::Event { trace::CorID trace; SecurityKey key() const { return book.security_key(); } + BookUpdateEvent(const Book &b) + : book(b), trace() {} BookUpdateEvent(const Book &b, trace::CorID const &trace) : book(b), trace(trace) {} }; diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index c0e5efbea..c2a651506 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -44,14 +44,13 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec, me->state.set_last_msg(msg); } -OrderOpResult DynamicOrder::on_activate(Price, Quantity, OrderServices &services, - trace::CorID const &) { +OrderOpResult DynamicOrder::on_activate(Price, Quantity, OrderServices &services) { services.report_state(me->state); return OrderOpResult{}; } -OrderOpResult DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {return OrderOpResult{};} -OrderOpResult DynamicOrder::on_cancel(trace::CorID const &) {return OrderOpResult{};} +OrderOpResult DynamicOrder::on_update(Price, Quantity) {return OrderOpResult{};} +OrderOpResult DynamicOrder::on_cancel() {return OrderOpResult{};} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib/orderman/orders/DynamicOrder.h index e608cdcea..a1b9de7a5 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib/orderman/orders/DynamicOrder.h @@ -18,9 +18,9 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ; - OrderOpResult on_cancel(trace::CorID const&) override ; + OrderOpResult on_activate(Price,Quantity,OrderServices &) override ; + OrderOpResult on_update(Price , Quantity) override ; + OrderOpResult on_cancel() override ; private: struct PImpl; diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index 79a0c1ce7..0eb278917 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -104,8 +104,7 @@ void IcebergOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } OrderOpResult IcebergOrder::on_activate(Price p, Quantity q, - OrderServices &services, - trace::CorID const &) { + OrderServices &services) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -147,8 +146,7 @@ OrderOpResult IcebergOrder::on_activate(Price p, Quantity q, return OrderOpResult{}; } -OrderOpResult IcebergOrder::on_update(Price p, Quantity q, - trace::CorID const &) { +OrderOpResult IcebergOrder::on_update(Price p, Quantity q) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -175,17 +173,16 @@ OrderOpResult IcebergOrder::on_update(Price p, Quantity q, return OrderOpResult{}; } -OrderOpResult IcebergOrder::on_update(api::orderman::Update const &, - trace::CorID const &) { +OrderOpResult IcebergOrder::on_update(api::orderman::Update const &) { return OrderOpResult{}; } -OrderOpResult IcebergOrder::on_crack(trace::CorID const &) { +OrderOpResult IcebergOrder::on_crack() { return OrderOpResult{}; } -OrderOpResult IcebergOrder::on_cancel(trace::CorID const &) { +OrderOpResult IcebergOrder::on_cancel() { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value()); @@ -268,8 +265,7 @@ void IcebergOrder::send_next_child_order() { key().value(), me->child.order.key().value(), to_send, me->state.price(), me->state.filled_quantity(), me->state.quantity()); - me->child.order.activate(Price(me->state.price()), Quantity(to_send), - trace::CorID()); + me->child.order.activate(Price(me->state.price()), Quantity(to_send)); } void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index 1b76af68d..6281d350f 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -20,11 +20,11 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ; - OrderOpResult on_update(api::orderman::Update const&update, trace::CorID const&trace) override; - OrderOpResult on_crack(trace::CorID const&) override ; - OrderOpResult on_cancel(trace::CorID const&) override ; + OrderOpResult on_activate(Price,Quantity,OrderServices &) override ; + OrderOpResult on_update(Price , Quantity) override ; + OrderOpResult on_update(api::orderman::Update const&update) override; + OrderOpResult on_crack() override ; + OrderOpResult on_cancel() override ; private: void report_state(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 82ddb4da4..492e97357 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -10,7 +10,6 @@ #include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/securities/ISecurityDB.h" -#include "lib/tracing/bts_trace.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" @@ -275,10 +274,9 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er, NativeOrder::~NativeOrder() {} OrderOpResult NativeOrder::on_activate(Price p, Quantity q, - bts::orderman::OrderServices &services, - trace::CorID const &trace) { + bts::orderman::OrderServices &services) { auto scoped_log = - services.log_scope(trace, "NativeOrder::on_activate", key().value()); + services.log_scope("NativeOrder::on_activate", key().value()); bts_assert(!me->services); me->services = &services; @@ -393,7 +391,7 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, me->services->queue_fix(*me->session_services, jetfix::MessageTypes::NewOrderSingle, - me->create_encoding, trace); + me->create_encoding); me->services->governor(*me->session_services).record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); @@ -468,10 +466,9 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, return OrderOpResult{}; } -OrderOpResult NativeOrder::on_update(Price p, Quantity q, - trace::CorID const &trace) { +OrderOpResult NativeOrder::on_update(Price p, Quantity q) { auto scoped_log = - me->services->log_scope(trace, "NativeOrder::on_update", key().value()); + me->services->log_scope("NativeOrder::on_update", key().value()); switch (me->state.status()) { @@ -503,7 +500,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q, transition(me->state.status(), msg); else { me->state.set_last_msg(msg); - on_cancel(trace); + on_cancel(); } break; } @@ -518,7 +515,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q, transition(me->state.status(), msg); else { me->state.set_last_msg(msg); - on_cancel(trace); + on_cancel(); } break; } @@ -538,7 +535,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q, me->services->queue_fix(*me->session_services, jetfix::MessageTypes::CancelReplace, - me->update_encoding, trace); + me->update_encoding); me->services->governor(*me->session_services).record_sent(); update_working_position(); @@ -568,13 +565,13 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q, return OrderOpResult{}; } -OrderOpResult NativeOrder::on_crack(trace::CorID const &) { +OrderOpResult NativeOrder::on_crack() { return OrderOpResult{}; } -OrderOpResult NativeOrder::on_cancel(trace::CorID const &trace) { +OrderOpResult NativeOrder::on_cancel() { auto scoped_log = - me->services->log_scope(trace, "NativeOrder::on_cancel", key().value()); + me->services->log_scope("NativeOrder::on_cancel", key().value()); switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -584,8 +581,7 @@ OrderOpResult NativeOrder::on_cancel(trace::CorID const &trace) { me->cancel_transact_time_bm, &ts.value()[0], ts.value().size()); me->services->queue_fix(*me->session_services, - jetfix::MessageTypes::Cancel, me->cancel_encoding, - trace); + jetfix::MessageTypes::Cancel, me->cancel_encoding); break; } @@ -633,7 +629,7 @@ bool NativeOrder::is_old_exe_report( void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { auto scoped_log = me->services->log_scope( - er.trace, "NativeOrder::on_exe_report", key().value()); + "NativeOrder::on_exe_report", key().value()); auto &state = me->state; auto &native_state = get_native_state(state); @@ -727,7 +723,7 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { bts_assert(false); break; } - report_state(er.trace); + report_state(); // we only need the exhange order id and the routing record // reported once, since they are both immutable, so we clear them @@ -829,9 +825,9 @@ void NativeOrder::update_working_position() { key().value(), me->definition.security_key()); } -void NativeOrder::report_state(trace::CorID const &trace) { +void NativeOrder::report_state() { update_working_position(); - me->services->report_state(me->state, trace); + me->services->report_state(me->state); } void NativeOrder::init_fix() { diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 4aac5f696..5b6edcb28 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -24,11 +24,10 @@ class NativeOrder : public Order { void on_init_recovered(api::orderman::OrderRecord const &, const PreActivationOrderServices &) override; - OrderOpResult on_activate(Price, Quantity, OrderServices &, - trace::CorID const &) override; - OrderOpResult on_update(Price, Quantity, trace::CorID const &) override; - OrderOpResult on_crack(trace::CorID const &) override; - OrderOpResult on_cancel(trace::CorID const &) override; + OrderOpResult on_activate(Price, Quantity, OrderServices &) override; + OrderOpResult on_update(Price, Quantity) override; + OrderOpResult on_crack() override; + OrderOpResult on_cancel() override; api::orderman::OrderDefinition on_init_from_exe_report(ExecutionReport const &, @@ -40,7 +39,7 @@ class NativeOrder : public Order { void on_exe_report(const NewExecutionReportEvent &); void on_cancel_reject(const CancelRejectEvent &); void on_gateway_status(const GatewayStatusChangeEvent &); - void report_state(trace::CorID const &trace = trace::CorID()); + void report_state(); void init_fix(); void add_exchange_order_id_to_fix(); diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index 70559ca09..408f740b7 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -16,15 +16,14 @@ void Order::init_order_services(OrderServicesData &osd, OrderServices &parent) { Order::~Order() {} -OrderOpResult Order::on_update(api::orderman::Update const &, - trace::CorID const &) { +OrderOpResult Order::on_update(api::orderman::Update const &) { return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED, "The update operation is not supported by this order type" }; } -OrderOpResult Order::on_crack(trace::CorID const&) { +OrderOpResult Order::on_crack() { return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED, "The crack operation is not supported by this order type" diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 798913bf5..6ec45ded4 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -46,13 +46,13 @@ class Order { const PreActivationOrderServices &) = 0; // activation - cannot be slow - virtual OrderOpResult on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0; + virtual OrderOpResult on_activate(Price, Quantity, OrderServices &) = 0; // order is running, maintenance - virtual OrderOpResult on_update(Price, Quantity, trace::CorID const&) = 0; - virtual OrderOpResult on_update(api::orderman::Update const&, trace::CorID const&) ; - virtual OrderOpResult on_crack(trace::CorID const&); - virtual OrderOpResult on_cancel(trace::CorID const&) = 0; + virtual OrderOpResult on_update(Price, Quantity) = 0; + virtual OrderOpResult on_update(api::orderman::Update const&) ; + virtual OrderOpResult on_crack(); + virtual OrderOpResult on_cancel() = 0; private: OrderKey _key; diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index fa4580295..ac37f5007 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -85,8 +85,7 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } OrderOpResult TimeBoxOrder::on_activate(Price p, Quantity q, - OrderServices &services, - trace::CorID const &) { + OrderServices &services) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -125,8 +124,7 @@ OrderOpResult TimeBoxOrder::on_activate(Price p, Quantity q, return OrderOpResult{}; } -OrderOpResult TimeBoxOrder::on_update(Price p, Quantity q, - trace::CorID const &) { +OrderOpResult TimeBoxOrder::on_update(Price p, Quantity q) { LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -187,11 +185,11 @@ OrderOpResult TimeBoxOrder::on_update(Price p, Quantity q, return OrderOpResult{}; } -OrderOpResult TimeBoxOrder::on_crack(trace::CorID const &) { +OrderOpResult TimeBoxOrder::on_crack() { return OrderOpResult{}; } -OrderOpResult TimeBoxOrder::on_cancel(trace::CorID const &) { +OrderOpResult TimeBoxOrder::on_cancel() { LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); switch (me->state.status()) { diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index acfef59f2..5de5c834a 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ; - OrderOpResult on_crack(trace::CorID const&) override ; - OrderOpResult on_cancel(trace::CorID const&) override ; + OrderOpResult on_activate(Price,Quantity,OrderServices &) override ; + OrderOpResult on_update(Price , Quantity) override ; + OrderOpResult on_crack() override ; + OrderOpResult on_cancel() override ; private: void report_state(); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index bab05ca4f..510864dde 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -101,7 +101,7 @@ void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec, } } OrderOpResult TriggerOrder::on_activate(Price price, Quantity qty, - OrderServices &services, trace::CorID const &) { + OrderServices &services) { LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), _state, price, qty); @@ -141,8 +141,7 @@ OrderOpResult TriggerOrder::on_activate(Price price, Quantity qty, return OrderOpResult{}; } // order price, qty change -OrderOpResult TriggerOrder::on_update(Price price, Quantity qty, - trace::CorID const &) { +OrderOpResult TriggerOrder::on_update(Price price, Quantity qty) { LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, price, qty); @@ -169,7 +168,7 @@ OrderOpResult TriggerOrder::on_update(Price price, Quantity qty, } return OrderOpResult{}; } -OrderOpResult TriggerOrder::on_cancel(trace::CorID const &) { +OrderOpResult TriggerOrder::on_cancel() { LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), _state); me->cancel_mode = CancelMode::external; diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index 34cba264d..6c4de23ed 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -55,10 +55,9 @@ public: void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; OrderOpResult on_activate(Price, Quantity, - OrderServices&, - trace::CorID const&) override ; - OrderOpResult on_update(Price, Quantity, trace::CorID const&) override; - OrderOpResult on_cancel(trace::CorID const&) override; + OrderServices&) override ; + OrderOpResult on_update(Price, Quantity) override; + OrderOpResult on_cancel() override; private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 92a7223d1..e89c69532 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -139,8 +139,7 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, } } -OrderOpResult BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { +OrderOpResult BookAlgo::on_activate(Price p, Quantity q, OrderServices &services) { bts_assert(!me->services); me->services = &services; switch (this_state().status()) { @@ -182,7 +181,7 @@ OrderOpResult BookAlgo::on_activate(Price p, Quantity q, OrderServices &services return OrderOpResult{}; } -OrderOpResult BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { +OrderOpResult BookAlgo::on_update(Price p, Quantity q) { LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); switch (this_state().status()) { case ORDER_STATUS_WORKING: @@ -237,7 +236,7 @@ OrderOpResult BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { return OrderOpResult{}; } -OrderOpResult BookAlgo::on_cancel(trace::CorID const &) { +OrderOpResult BookAlgo::on_cancel() { LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); switch (this_state().status()) { diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 5edadb6a3..0555f33ea 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -24,9 +24,9 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, const PreActivationOrderServices &) override; - OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ; - OrderOpResult on_cancel(trace::CorID const&) override ; + OrderOpResult on_activate(Price,Quantity,OrderServices &) override ; + OrderOpResult on_update(Price , Quantity) override ; + OrderOpResult on_cancel() override ; protected: virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index 07cefede3..664e00922 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -34,7 +34,7 @@ public: // 5. called when the user cancels an order virtual void on_cancel() = 0; // 6. on market data update (support late joiners) - virtual void on_book(const Book&,trace::CorID ) = 0; + virtual void on_book(const Book&) = 0; // 15. settlement price update virtual void on_settlement_price(const SettlementUpdateEvent&) = 0; // 7. time event called by the infrastructure @@ -42,8 +42,7 @@ public: // 8. when a quoter order ack from the exchange has an error virtual void on_quoter_order_error(SpreaderLegData& leg_data) = 0; // 9. on a quoter order fill - virtual void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) = 0; + virtual void on_quoter_order_fill(SpreaderLegData& leg_data) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 13e1d007b..3cae9024b 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -7,7 +7,6 @@ #include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h" #include "lib/orderman/events/SettlementUpdateEvent.h" -#include "lib/tracing/bts_trace.h" #include "lib/utils/helper_macros.h" namespace bts { @@ -55,14 +54,14 @@ void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& ord _report_state(); } OrderOpResult SpreaderOrder::on_activate(Price price, Quantity quantity, - OrderServices& services, const trace::CorID&){ + OrderServices& services){ if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"}; SpreaderOrderServices spreader_order_services (&services); _on_activate(price, quantity, spreader_order_services); _report_state(); return OrderOpResult{}; } -OrderOpResult SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){ +OrderOpResult SpreaderOrder::on_update(Price price, Quantity quantity){ if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"}; LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); @@ -70,7 +69,7 @@ OrderOpResult SpreaderOrder::on_update(Price price, Quantity quantity,trace::Cor _report_state(); return OrderOpResult{}; } -OrderOpResult SpreaderOrder::on_cancel(trace::CorID const&){ +OrderOpResult SpreaderOrder::on_cancel(){ if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"}; LOG(OrderMan, Info, "SpreaderOrder.on_cancel key:{}", key().value()); _state_worker->on_cancel(); @@ -98,9 +97,8 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; - auto scoped = _order_services->log_scope(book_event.trace, - "SpreaderOrder::_on_book_update", key().value()); - _state_worker->on_book (book_event.book,book_event.trace); + auto scoped = _order_services->log_scope("SpreaderOrder::_on_book_update", key().value()); + _state_worker->on_book (book_event.book); //_keep_hedging_path_hot (); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& @@ -119,8 +117,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ auto now = _perf_ts; char cb_type='q'; //q=quoter non fill, f=quoter fill, h=hedger auto scoped_log = - _order_services->log_scope(ord_ev.trace, - "SpreaderOrder::_on_child_order_update", + _order_services->log_scope("SpreaderOrder::_on_child_order_update", key().value()); OrderKey order_key = ord_ev.key; bts::api::orderman::OrderStatus status = ord_ev.status; @@ -153,7 +150,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0){ cb_type='f'; LOG(OrderMan,Info,"h_p f child update {0}",_diff_ns()); - _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); + _state_worker->on_quoter_order_fill (leg_data); } else{ cb_type='q'; @@ -324,14 +321,12 @@ bool SpreaderOrder::_quoters_can_accept_modification (){ } void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, - Quantity hedge_qty, - const trace::CorID trace){ + Quantity hedge_qty){ SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, hedge_leg_index, hedge_price, hedge_qty, - _order_services, - trace); + _order_services); hedger.init (); } void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 5976a996e..5ac01d079 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -100,12 +100,12 @@ public: const PreActivationOrderServices&) override; // this is in the critical path, orders can be submitted now // (this is only called once and after the on_init_new) - OrderOpResult on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override; + OrderOpResult on_activate(Price, Quantity, OrderServices&) override; // called when the user (or a higher level order) // updates the order's price or quantity - OrderOpResult on_update(Price, Quantity,trace::CorID const&) override; + OrderOpResult on_update(Price, Quantity) override; // called when the user (or higher level order) cancels an order - OrderOpResult on_cancel(trace::CorID const&) override; + OrderOpResult on_cancel() override; // ISpreaderManager //////////////////// //////////////////////////////////////// public: @@ -175,8 +175,7 @@ private: // quantity 'filled_quantity' void _send_hedge(size_t hedge_leg_index, Price hedge_price, - Quantity hedge_qty, - trace::CorID const); + Quantity hedge_qty); void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, @@ -257,7 +256,7 @@ public: SpreaderBookkeepingData& test_only_func_spreader_full_data () {return _bookkeeping_data();} int64_t test_cancel_timeout () {return _cancel_timeout;} void test_only_on_book_update(const bts::orderman::BookUpdateEvent& b) {_on_book_update(b);} - void test_only_on_book_update(const bts::orderman::Book& b, trace::CorID const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} + void test_only_on_book_update(const bts::orderman::Book& b) {_on_book_update(bts::orderman::BookUpdateEvent(b,trace::CorID{}));} void test_only_on_child_order_update (bts::orderman::OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, Price avg_price) { bts::api::orderman::OrderDefinition order_def; @@ -266,7 +265,7 @@ public: order_state.set_status(status); order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); - OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_state,trace::CorID()); + OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_state); _on_child_order_update (ord_ev); } void test_only_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& pao_services) {_on_init_new(order_def, pao_services);} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 2060e02fd..632b04d68 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -14,7 +14,6 @@ SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - trace::CorID const &fill_trace, bool is_live) : _spreader(spreader_manager), @@ -26,7 +25,6 @@ _child_order_state (child_order, _price_quantity_state(hedge_price, hedge_quantity, leg_property_data.trading_side()), -_fill_trace(fill_trace), _worker (nullptr), _start_state_worker (this), _waiting_for_first_ack_state_worker (this), @@ -46,7 +44,6 @@ _spreader (other._spreader), _leg_property_data (other._leg_property_data), _child_order_state (std::move(other._child_order_state)), _price_quantity_state (other._price_quantity_state), -_fill_trace(other._fill_trace), _worker(nullptr), _start_state_worker (this, other._start_state_worker), _waiting_for_first_ack_state_worker (this, other._waiting_for_first_ack_state_worker), @@ -94,8 +91,8 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ u.last_update_filled_quantity()); _worker->on_order_update (u); } -void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &trace){ - _worker->on_book (book,trace); +void SingleFillHedger::on_book(const bts::orderman::Book& book){ + _worker->on_book (book); } void SingleFillHedger::cancel_hedge(){ LOG(OrderMan, Info, "SingleFillHedger::cancel_order key:{} state:{}", diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 1e3bf495c..24df8395e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -30,7 +30,6 @@ private: const LegPropertyData& _leg_property_data; SpreaderChildOrderState _child_order_state; HedgePriceQuantityState _price_quantity_state; - trace::CorID _fill_trace; IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker; @@ -52,8 +51,7 @@ private: Quantity quantity) { _child_order_state.place_order(price, quantity, - _spreader.current_time(), - _fill_trace); + _spreader.current_time()); } void _modify_order (Price new_price){ _price_quantity_state.update_out_price (new_price); @@ -71,7 +69,6 @@ public: ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - trace::CorID const &trace, bool is_live); SingleFillHedger() = delete; SingleFillHedger (const SingleFillHedger&) = delete; @@ -88,7 +85,7 @@ public: void on_order_update(const SpreaderChildOrderState& order_update_message); //c. called when the market data associated // with this security is changed - void on_book(const bts::orderman::Book& book,trace::CorID &); + void on_book(const bts::orderman::Book& book); //d. called when the hedge order is cancelled, either // manually or automatically void cancel_hedge(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 4e199a647..9af8c915c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -108,9 +108,9 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ } } void SingleLegQuoter::on_book(size_t leg_index, - const bts::orderman::Book& book,trace::CorID trace){ + const bts::orderman::Book& book){ if (_active_quoting) - _worker->on_book (leg_index, book,trace); + _worker->on_book (leg_index, book); } void SingleLegQuoter::update_other_leg_fills(size_t leg_index, Quantity filled_quantity){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index c31199d21..4f38f2631 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -101,7 +101,7 @@ public: //c. called when the market data associated // with this security is changed void on_book(size_t leg_index, - const bts::orderman::Book&,trace::CorID ); + const bts::orderman::Book&); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); @@ -161,15 +161,13 @@ private: return _price_quantity_state.target_reached(); } void _place_order (Price price, - Quantity quantity, - const trace::CorID &trace) { + Quantity quantity) { _child_order_state.place_order(price, quantity, - _spreader.current_time(), - trace); + _spreader.current_time()); } - void _modify_order (Price price, Quantity quantity, trace::CorID &trace) { - _child_order_state.modify_order(price, quantity, trace); + void _modify_order (Price price, Quantity quantity) { + _child_order_state.modify_order(price, quantity); } void _cancel_order () {_child_order_state.cancel_order();} // this updates the hedge reduction in _price_quantity_state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 5fd8547f1..a97b4d1a8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -93,11 +93,10 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - SpreaderOrderServices* , - const trace::CorID &trace){ + SpreaderOrderServices* ){ LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " - "leg_index:{} price:{} quantity:{} cid:{}", - leg_index, hedge_price, hedge_quantity,trace.sn); + "leg_index:{} price:{} quantity:{} ", + leg_index, hedge_price, hedge_quantity); bts_assert(leg_index < _n_legs); SpreaderLegData& leg_data = _leg_data[leg_index]; std::vector& leg_hedgers = _hedgers[leg_index]; @@ -107,7 +106,6 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre hedge_order, hedge_price, hedge_quantity, - trace, _is_live); return leg_hedgers.back(); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 5971a8feb..1a37570ba 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -110,8 +110,7 @@ public: size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - SpreaderOrderServices *services, - trace::CorID const &); + SpreaderOrderServices *services); // finds the spreader fill, price (ie averages it out, using // the size and price ratio, across all legs) void total_fills (Quantity& out_quantity, Price& out_price) const; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 1f8f9c875..5ffbb9314 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -129,8 +129,7 @@ public: ///////////////////////////////////// void place_order(Price price, Quantity quantity, - bts::TimeStamp curr_time, - const trace::CorID& trace){ + bts::TimeStamp curr_time){ _out_price = price; _out_quantity = quantity; _order_place_time=curr_time; @@ -138,17 +137,13 @@ public: _n_place_orders++; LOG(OrderMan, Info, "SpreaderChildOrderState::place_order " "key:{} is_quoting:{} sec_key:{} live:{} " - "price:{} qty:{} cid:{}", + "price:{} qty:{}", order_key(), _is_quoting, _sec_key, - _is_live, price, quantity, trace.sn); + _is_live, price, quantity); if (_is_live) - _child_order.activate(price, quantity, trace); + _child_order.activate(price, quantity); } void modify_order(Price price, Quantity quantity){ - trace::CorID dont_care; - modify_order(price,quantity,dont_care); - } - void modify_order(Price price, Quantity quantity, trace::CorID &trace){ _out_price = price; _out_quantity = quantity; _n_modify_orders++; @@ -158,7 +153,7 @@ public: order_key(), _is_quoting, _sec_key, _is_live, price, quantity, _n_modify_orders); if (_is_live) { - _child_order.update(price, quantity, trace); + _child_order.update(price, quantity); } } void cancel_order(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h index 37556dac7..7d7b6d8e9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h @@ -55,9 +55,9 @@ public: SpreaderOrderServices (bts::orderman::OrderServices* order_services); bts::orderman::OrderServices& order_services(); void report_state(const api::orderman::OrderState &state); - trace::ScopedPerfLogEntry log_scope(trace::CorID cid, const char *entry_kind, + trace::ScopedPerfLogEntry log_scope(const char *entry_kind, uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0); - void log(trace::CorID cid, const char *entry_kind, + void log(const char *entry_kind, uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0); bool is_live(); }; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp index b9c26a0d5..c4da34827 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp @@ -16,24 +16,22 @@ void SpreaderOrderServices::report_state(const api::orderman::OrderState &state) if (is_live()) _order_services->report_state(state); } -trace::ScopedPerfLogEntry SpreaderOrderServices::log_scope(trace::CorID cid, - const char *entry_kind, +trace::ScopedPerfLogEntry SpreaderOrderServices::log_scope(const char *entry_kind, uint64_t uint64_1, const char *txt_1, uint32_t uint32_1){ if(_is_live) - return _order_services->log_scope(cid,entry_kind,uint64_1,txt_1,uint32_1); + return _order_services->log_scope(entry_kind,uint64_1,txt_1,uint32_1); else return trace::ScopedPerfLogEntry (); } -void SpreaderOrderServices::log(trace::CorID cid, - const char *entry_kind, +void SpreaderOrderServices::log(const char *entry_kind, uint64_t uint64_1, const char *txt_1, uint32_t uint32_1) { if(_is_live) - _order_services->log(cid, entry_kind, uint64_1, txt_1, uint32_1); + _order_services->log(entry_kind, uint64_1, txt_1, uint32_1); } bool SpreaderOrderServices::is_live() {return _is_live;} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index ff966a518..17669e014 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -25,7 +25,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on // has a market data update - virtual void on_book (const bts::orderman::Book& book,trace::CorID &) = 0; + virtual void on_book (const bts::orderman::Book& book) = 0; // when the spreader wants the hedger to cancel its order virtual void cancel() = 0; // on terminate, the hedger should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index 61ce32ef4..1362368c7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -9,7 +9,7 @@ void HedgerEndStateWorker::init(){ } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } -void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerEndStateWorker::on_book(const bts::orderman::Book&){ } void HedgerEndStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h index 549d67306..13cf84672 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -17,7 +17,7 @@ public: const std::string state_text () const override {return "END";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index 1ed919153..871d1a4a8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerStartStateWorker::init(){ void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ bts_assert_msg (false, "HedgerStartStateWorker::on_order_update illegal operation"); } -void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerStartStateWorker::on_book(const bts::orderman::Book&){ // market data will not be sent until out of start. bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 12757001b..2378f5541 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "START";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index c31a3a112..c78c9dc10 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -17,7 +17,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr _hedger->transform_to_END (); } } -void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&){ } void HedgerWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index d2be51786..17fa1f532 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp index 084b8c3de..fd23476cb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp @@ -23,7 +23,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade _hedger->transform_to_WAITING_FOR_CANCEL_ACK (); } } -void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&){ } void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h index 97383f885..5b8b2b780 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp index cb99478c4..3f0e62855 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrd // this means the first ack _hedger->transform_to_WORKING (); } -void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&){ } void HedgerWaitingForFirstAckStateWorker::cancel(){ _hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h index b1ca9c5f0..92be7037b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index aebb18a6a..724c7837b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -20,7 +20,7 @@ void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& or _hedger->transform_to_END (); } } -void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&){ double new_price; if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.out_quantity().value(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index 1e23979ff..f335b5c7f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -24,7 +24,7 @@ public: const std::string state_text () const override {return "WORKING";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h index a83697af0..ab37c9576 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h @@ -26,7 +26,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called when any of the legs in the spread has a book update //virtual void on_book (TickToTradeCorID corid, size_t leg_id, const Book& book) = 0; - virtual void on_book (size_t, const bts::orderman::Book&,trace::CorID &) = 0; + virtual void on_book (size_t, const bts::orderman::Book&) = 0; // when the spreader wants the quoter to cancel its order virtual void cancel() = 0; // on terminate, the quoter should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index 24c417c8f..f0e50057c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -29,7 +29,7 @@ void QuoterEndStateWorker::one_time_activate (Price, Quantity){ void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&) {} void QuoterEndStateWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &) + const bts::orderman::Book&) {} void QuoterEndStateWorker::cancel() {} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h index 2a52ee1a6..adb35e726 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -25,7 +25,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 38d3b9dea..f99df82d8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -24,7 +24,7 @@ void QuoterStartStateWorker::on_order_update (const SpreaderChildOrderState&){ bts_assert_msg (false, "QuoterStartStateWorker::on_order_update is an illegal operation, nothing can happen before one_time_activate"); } void QuoterStartStateWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&){ } void QuoterStartStateWorker::cancel(){ // since no order has been sent for this leg, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h index dae5ada02..4699dc319 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index bf493f55f..f37e45996 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -20,8 +20,7 @@ void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderChildO _quoter->_transform_to_END (); } void QuoterWaitingForCancelAckStateWorker::on_book (size_t, - const bts::orderman::Book&, - trace::CorID &){ + const bts::orderman::Book&){ } void QuoterWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index 9ef9d2409..5ca656321 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -24,7 +24,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index b674b1d3b..c18876ba4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -25,7 +25,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderChi _quoter->_transform_to_WAITING_FOR_CANCEL_ACK (); } } -void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,trace::CorID &) { +void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ) { } void QuoterWaitingForFirstAckCancelledWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index 085e9b919..9b39f9f4d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index cd5e845b2..44d3bc21b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -22,7 +22,7 @@ void QuoterWaitingForFirstAckWorker::on_order_update (const SpreaderChildOrderSt _quoter->_transform_to_WORKING (); } void QuoterWaitingForFirstAckWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&){ _analyze_and_act(); } void QuoterWaitingForFirstAckWorker::cancel(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index d4c8d0ed0..5515cd8ea 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -28,7 +28,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID & ) override; + void on_book (size_t leg_id, const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index 588761444..cd182d950 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -24,7 +24,7 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& } } void QuoterWaitingForIOCWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&){ } void QuoterWaitingForIOCWorker::cancel(){ _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h index 69ba40109..7c77266e5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -31,7 +31,7 @@ public: void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (size_t leg_id, - const bts::orderman::Book& book,trace::CorID &) override; + const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index b5588cd95..d1ec2af21 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -19,9 +19,8 @@ void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderS bts_assert_msg (false, "QuoterWaitingForSizeStateWorker::on_order_update " "is an illegal operation"); } -void QuoterWaitingForSizeStateWorker::on_book (size_t, - const Book&,trace::CorID &trace){ - _longpath_analyze_and_act (trace); +void QuoterWaitingForSizeStateWorker::on_book (size_t, const bts::orderman::Book& ){ + _longpath_analyze_and_act (); } void QuoterWaitingForSizeStateWorker::cancel(){ // since no order has been sent for this leg, cancel just takes @@ -45,10 +44,6 @@ void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, _longpath_analyze_and_act (); } void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(){ - trace::CorID trace; - _longpath_analyze_and_act(trace); -} -void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &){ if (_quoter->_price_quantity_state.target_reached()){ LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} " "target reached, transforming to end", @@ -65,7 +60,7 @@ void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &){ "key:{} price:{} quantity:{}", _quoter->_key(), out_price, out_quantity); // this is the only place where a quoter order is entered - _quoter->_place_order(out_price, out_quantity, trace::CorID {}); + _quoter->_place_order(out_price, out_quantity); if(_quoter->_hidden_order) _quoter->_transform_to_WAITING_FOR_IOC(); else _quoter->_transform_to_WAITING_FOR_FIRST_ACK (); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index 5cbad6abf..8f866e90f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -41,6 +41,5 @@ private: // if it has. otherwise computes the price, qty and if // its valid, places an order goes to waiting_for_first_ack void _longpath_analyze_and_act (); - void _longpath_analyze_and_act (trace::CorID &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 0c505d9b6..90fb967c2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -30,9 +30,8 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderChildOrderState& u _longpath_analyze_and_act (); } void QuoterWorkingStateWorker::on_book (size_t, - const bts::orderman::Book&, - trace::CorID &trace){ - _longpath_analyze_and_act (trace); + const bts::orderman::Book&){ + _longpath_analyze_and_act (); } void QuoterWorkingStateWorker::cancel(){ _quoter->_cancel_order(); @@ -54,11 +53,6 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price, _longpath_analyze_and_act (); } void QuoterWorkingStateWorker::_longpath_analyze_and_act () -{ - trace::CorID trace; - _longpath_analyze_and_act(trace); -} -void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) { if (_quoter->_price_quantity_state.target_reached()){ // this could happen if @@ -82,25 +76,25 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) if (order_quantity.value() != _quoter->_price_quantity_state.out_quantity().value()) // this is a size change, size changes always go through regardless of the // quoting parameters - _modify_order (computed_price, order_quantity,trace); + _modify_order (computed_price, order_quantity); else{ bool reprice = true; if (_quoter->_this_leg_data.leg_params().quote_params().has_quote_mute_zone()) reprice = SpreaderUtils::reprice_quote_mute_zone(_quoter->_price_quantity_state.out_price().value(), computed_price.value(), _quoter->_this_leg_data.trading_side(), _quoter->_this_leg_data.tick_size(), _quoter->_this_leg_data.leg_params().quote_params().quote_mute_zone()); if (reprice) - _modify_order (computed_price, order_quantity,trace); + _modify_order (computed_price, order_quantity); } } } } -void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,trace::CorID &trace ){ +void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity){ bool same_price_qty = _quoter->_price_quantity_state.out_quantity() == quantity && bts::securities::test_price_equality(_quoter->_price_quantity_state.out_price().value(), price.value(), _quoter->_this_leg_data.tick_size()); if (!same_price_qty){ _quoter->_commit_drivers (price); - _quoter->_modify_order(price, quantity,trace); + _quoter->_modify_order(price, quantity); } } }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h index e7f5ee612..33a5dc77f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -34,8 +34,7 @@ private: // i. if target reached => cxl order and go to waiting_for_cancel_ack_final // ii. if computed_qty = 0 => cxl order and go to waiting_for_cancel_ack_continue // iii. if reprice (ie qty changed or price changed beyond the threshold) => requote - void _longpath_analyze_and_act (trace::CorID &); void _longpath_analyze_and_act (); - void _modify_order (Price price, Quantity quantity,trace::CorID &); + void _modify_order (Price price, Quantity quantity); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index b0bc2c9dc..563215c4f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -34,7 +34,7 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(const Book&,trace::CorID){ +void SpreaderEndStateWorker::on_book(const Book&){ } void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -42,8 +42,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){ } void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } -void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ +void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index cdf791845..5546a5402 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,12 +20,11 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID) override; + void on_book(const Book&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; - void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID) override; + void on_quoter_order_fill(SpreaderLegData& leg_data) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index adc4108e2..6045afa07 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -117,7 +117,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID ){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){ @@ -130,8 +130,7 @@ void SpreaderStartStateWorker::on_time(const TimeStamp&){ void SpreaderStartStateWorker::on_quoter_order_error(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_error is an illegal operation"); } -void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ +void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index 78e92a3cd..80f299fbf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -25,12 +25,11 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&) override; void on_time(const TimeStamp&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; - void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + void on_quoter_order_fill(SpreaderLegData& leg_data) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index d58ea59d5..a47cf87c7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -33,7 +33,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_update(Price, } void SpreaderWaitingForCancelAllStateWorker::on_cancel(){ } -void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID ){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -47,8 +47,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_settlement_price(const Settlemen void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegData& leg_data){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } -void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ){ +void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index cf6f7ca0b..e046b202b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,12 +23,11 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; - void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + void on_quoter_order_fill(SpreaderLegData& leg_data) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index e69c0e62a..e9ab3e8a6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -45,8 +45,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_update(Price, void SpreaderWaitingForInitialDataStateWorker::on_cancel(){ _spreader->_transform_to_END(); } -void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book, - trace::CorID){ +void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); md_leg.update_book(book); @@ -70,8 +69,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_error is an illegal operation"); } -void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ +void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&){ bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_fill is an illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index c344a8542..f7bda3470 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -25,12 +25,11 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID) override; + void on_book(const Book&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; - void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + void on_quoter_order_fill(SpreaderLegData& leg_data) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 5ee7cab25..0db0a9116 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -42,7 +42,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){ +void SpreaderWorkingStateWorker::on_book(const Book& book){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -53,11 +53,11 @@ void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){ for (size_t q_idx = 0; q_idx < bookkeeping_data.n_legs(); q_idx++){ SpreaderLegData& d = bookkeeping_data.get_leg_data(q_idx); if (d.leg_property_data().is_active_quoting()) - d.quoter().on_book(md_leg.leg_property_data().leg_index(), book,trace); + d.quoter().on_book(md_leg.leg_property_data().leg_index(), book); } //send md to hedgers hedging this security only for (size_t h_idx = 0; h_idx < md_leg.n_hedgers(); h_idx++) - md_leg.get_hedger(h_idx).on_book(book,trace); + md_leg.get_hedger(h_idx).on_book(book); } void SpreaderWorkingStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -77,10 +77,9 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID trace){ +void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data){ LOG(OrderMan, Info,"h_p w start {0}",_spreader->_diff_ns()); - _spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); + _spreader->_order_services->log_scope("SpreaderWorkingStateWorker::on_quoter_order_fill"); // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) @@ -129,8 +128,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // a hedge is sent regardless _spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(), hedge_price, - Quantity(total_unhedged_qty), - trace); + Quantity(total_unhedged_qty)); LOG(OrderMan, Info,"h_p send hedge {0} {1}", q_idx, _spreader->_diff_ns()); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index 214e2eba1..fbe002964 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -22,12 +22,11 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; - void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + void on_quoter_order_fill(SpreaderLegData& leg_data) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index 01da5c649..eeb2869a2 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -390,8 +390,7 @@ void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t l bts::orderman::Book book; fill_book (book, prices, sizes, side); sm.set_book (book, leg_index); - trace::CorID trace; - quoter.on_book (leg_index, book,trace); + quoter.on_book (leg_index, book); } void verify_leg_data (SpreaderLegData& l, bts::orderman::OrderKey, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) { @@ -441,8 +440,7 @@ void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, S { bts::orderman::Book book; fill_book (book, prices, sizes, side); - trace::CorID trace; - hedger.on_book (book,trace); + hedger.on_book (book); } void verify_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity, Price out_price, Quantity, Quantity remaining_to_fill) @@ -525,11 +523,11 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin bts::orderman::Book book_leg_1 = get_book (SecurityKey (leg_1_id), 5, leg_1_bid_prices, leg_1_bid_sizes, leg_1_ask_prices, leg_1_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, trace::CorID())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1)); bts::orderman::Book book_leg_2 = get_book (SecurityKey (leg_2_id), 5, leg_2_bid_prices, leg_2_bid_sizes, leg_2_ask_prices, leg_2_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,trace::CorID())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2)); spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price)); spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price)); } diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 3e95f485d..43b6e0513 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From 9f1bb177b8d9de1985a9bd2d230ab0c77e2350e7 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 12 Jan 2019 15:56:01 -0500 Subject: [PATCH 015/218] Fixed build. --- .../spreader_orders/tests/spreader_tests.cpp | 89 ++++++++----------- src/sdk/examples/order_plugin_example.cpp | 15 ++-- 2 files changed, 41 insertions(+), 63 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 553641440..352aa7c1b 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -47,9 +47,8 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (0.0)); REQUIRE (s.out_quantity() == Quantity (0)); // set out price and quantity - trace::CorID dont_care; bts::TimeStamp ts; - order.place_order(Price (-0.35), Quantity (123),ts,dont_care); + order.place_order(Price (-0.35), Quantity (123),ts); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); @@ -102,9 +101,8 @@ TEST_CASE ("quoter price quantity state", "[spreader]") s.add_hedged_reduction (Quantity(5)); s.add_hedged_reduction (Quantity(15)); // set out values - trace::CorID dont_care; bts::TimeStamp ts; - order_2.place_order (Price(1), Quantity (50),ts,dont_care); + order_2.place_order (Price(1), Quantity (50),ts); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); REQUIRE (s.aggregated_filled_quantity() == Quantity (40)); @@ -125,7 +123,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") on_order_update (order_2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); s.add_hedged_reduction (Quantity(3)); s.add_hedged_reduction (Quantity(7)); - order_2.place_order (Price(0.75), Quantity (50),ts,dont_care); + order_2.place_order (Price(0.75), Quantity (50),ts); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); REQUIRE (s.aggregated_filled_quantity() == Quantity (10)); @@ -1250,8 +1248,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SECTION("0. transition_to_start") @@ -1301,8 +1298,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1361,8 +1357,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1423,8 +1418,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1496,8 +1490,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1554,8 +1547,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SpreaderChildOrderState& u = hedger.order_state(); @@ -1657,7 +1649,7 @@ TEST_CASE ("spreader_START", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(); REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); LOG(OrderMan, Diag, "spreader_START.on_cancel"); } @@ -1769,7 +1761,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // be as is spreader_price = Price (0); spreader_quantity = Quantity (200); - spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); + spreader.on_update (spreader_price, spreader_quantity); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); @@ -1779,7 +1771,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); @@ -1800,7 +1792,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2005, 2006, 2007, 2008, 2009}, new uint16_t[5] {0, 0, 0, 0, 0}, true); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WORKING, false); generic_validate_hedgers (HedgerState::WORKING); @@ -1814,8 +1806,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book,trace::CorID()); + //spreader.on_book (modified_book); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1830,8 +1822,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book,trace::CorID()); + //spreader.on_book (modified_book); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1844,8 +1836,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + //spreader.on_book (modified_book); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1859,8 +1851,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + //spreader.on_book (modified_book); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -2074,7 +2066,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // now cancel the spreader bts::TimeStamp cancel_timestamp = std::chrono::system_clock::now(); spreader.test_only_on_time (cancel_timestamp); - spreader.on_cancel (trace::CorID()); + spreader.on_cancel (); auto validate_state = [&]() -> void { verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); @@ -2097,7 +2089,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("4. on_update") { - spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); + spreader.on_update (Price(-0.05), Quantity(200)); validate_state(); // order changes dont go through validate_state(); @@ -2105,7 +2097,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(); // already in cancel state, no change validate_state(); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); @@ -2673,11 +2665,9 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") bts::TimeStamp t0=bts::Timer::now(); for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; @@ -2823,12 +2813,9 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") new double[5] {19.890,19.895,19.900,19.910,19.915}, new uint16_t[5] {100,50,50,125,125}, true); - spreader.test_only_on_book_update (BookUpdateEvent(book_1, - trace::CorID())); - spreader.test_only_on_book_update (BookUpdateEvent(book_2, - trace::CorID())); - spreader.test_only_on_book_update (BookUpdateEvent(book_3, - trace::CorID())); + spreader.test_only_on_book_update (BookUpdateEvent(book_1)); + spreader.test_only_on_book_update (BookUpdateEvent(book_2)); + spreader.test_only_on_book_update (BookUpdateEvent(book_3)); verify_complete_quoter_state (qleg_data_4.quoter(), QuoterState::WAITING_FOR_FIRST_ACK, false, @@ -2907,18 +2894,12 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") hedge_perfs.reserve(n_hedges); auto t0=utils::TimeStamp::now(); for (uint32_t b=0; bservices); me->services = &services; me->child_builder.activate(services); @@ -163,8 +161,7 @@ OrderOpResult DynamicIcebergOrder::on_activate(Price p, Quantity q, return OrderOpResult(); } -OrderOpResult DynamicIcebergOrder::on_update(Price p, Quantity q, - trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_update(Price p, Quantity q) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -192,7 +189,7 @@ OrderOpResult DynamicIcebergOrder::on_update(Price p, Quantity q, return OrderOpResult(); } -OrderOpResult DynamicIcebergOrder::on_cancel(trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_cancel() { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); From 21712711f7d1ebe009a8812a34565f9776fe3c41 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 14 Jan 2019 12:48:14 -0500 Subject: [PATCH 016/218] Added Order API support for return result of order ops. --- .../actors/order_manager/ChildOrder.h | 71 +++++++++++++++++- .../actors/order_manager/OrderManager.cpp | 73 +++++++++++++------ .../actors/order_manager/OrderManager.h | 4 +- .../actors/order_manager/OrderServices.h | 53 +++++++++++++- src/lib/orderman/orders/Order.h | 1 + src/web/CMakeDeps.cmake | 2 +- 6 files changed, 173 insertions(+), 31 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 643d9c701..6fd6bea8f 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -39,34 +39,99 @@ class ChildOrder { bool is_active() const { return _active; } + // Activate void activate(Price p, Quantity q) { bts_assert(_order); bts_assert(!_active); - _child_order_services = - &_parent_order_services->activate_child(*_order, p, q); + _parent_order_services->activate_child(*_order, p, q); + _child_order_services = _order->_services.get(); _active = true; } + template + void activate(Price p, Quantity q, CB const &on_activate_result) { + bts_assert(_order); + bts_assert(!_active); + + auto on_activate_result_wrapper = [this, on_activate_result]( + OrderOpResult const &r) { + _parent_order_services->call_with_reentrancy_guard( + [r, on_activate_result](auto const &) { on_activate_result(r); }); + }; + + _parent_order_services->activate_child(*_order, p, q, + on_activate_result_wrapper); + _child_order_services = _order->_services.get(); + _active = true; + } + // End Activate + + // Update void update(Price p, Quantity q) { bts_assert(_order); bts_assert(_active); _child_order_services->update(p, q); } - void update(api::orderman::Update const&update) { + template void update(Price p, Quantity q, CB const &on_result) { + bts_assert(_order); + bts_assert(_active); + + auto on_result_w = [this, on_result](OrderOpResult const &r) { + _parent_order_services->call_with_reentrancy_guard( + [r, on_result](auto const &) { on_result(r); }); + }; + _child_order_services->update(p, q, on_result_w); + } + void update(api::orderman::Update const &update) { bts_assert(_order); bts_assert(_active); _child_order_services->update(update); } + template + void update(api::orderman::Update const &update, CB const &on_result) { + bts_assert(_order); + bts_assert(_active); + auto on_result_w = [this, on_result](OrderOpResult const &r) { + _parent_order_services->call_with_reentrancy_guard( + [r, on_result](auto const &) { on_result(r); }); + }; + _child_order_services->update(update, on_result_w); + } + // End Update + + // Crack void crack() { bts_assert(_order); bts_assert(_active); _child_order_services->crack(); } + template void crack(CB const &on_result) { + bts_assert(_order); + bts_assert(_active); + auto on_result_w = [this, on_result](OrderOpResult const &r) { + _parent_order_services->call_with_reentrancy_guard( + [r, on_result](auto const &) { on_result(r); }); + }; + _child_order_services->crack(on_result); + } + // End Crack + + // Cancel void cancel() { bts_assert(_order); bts_assert(_active); _child_order_services->cancel(); } + template void cancel(CB const &on_result) { + bts_assert(_order); + bts_assert(_active); + auto on_result_w = [this, on_result](OrderOpResult const &r) { + _parent_order_services->call_with_reentrancy_guard( + [r, on_result](auto const &) { on_result(r); }); + }; + _child_order_services->cancel(on_result_w); + } + // End Cancel private: friend class OrderBuilder; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 8d0069975..7e734c5f3 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -202,13 +202,21 @@ void OrderManager::on_activate_order( if (m.events) for (auto const &ev : *m.events) { auto order = ev.order; + auto const &def = order->def(); publish_order_def_update(order->key(), def); order->init_order_services(me->services_data); auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); - auto op_r = order->on_activate(ev.price, ev.quantity, *order->_services); - publish(me->services_data.report_order_op_result_pub,order->key(),ev.req_id,op_r); + + auto rid = ev.req_id; + auto k = order->key(); + order->_services->activate( + ev.price, ev.quantity, + [this, rid, k](auto const &order_op_result) { + publish(me->services_data.report_order_op_result_pub, k, rid, + order_op_result); + }); } } @@ -217,20 +225,29 @@ void OrderManager::on_update_order(const mercury::Update &m) { for (auto const &ev : *m.events) { auto k = ev.key(); auto it = me->orders.find(k); - OrderOpResult op_r; + auto rid = ev.req_id(); + + auto on_order_op_result = [this, rid, k](auto const &order_op_result) { + publish(me->services_data.report_order_op_result_pub, k, rid, + order_op_result); + }; + if (it != me->orders.end()) { if (ev.is_full_update()) - op_r = it->second->on_update(ev.full_update()); + it->second->_services->update(ev.full_update(), + on_order_op_result); else - op_r = it->second->on_update(Price(ev.price()), Quantity(ev.quantity())); + it->second->_services->update(Price(ev.price()), + Quantity(ev.quantity()), + on_order_op_result); } else { - op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; + on_order_op_result(OrderOpResult{ + api::orderman::ORDER_ERROR_UNKNOWN_ORDER, "Unknown order"}); LOG(OrderMan, Error, "Received an update request for an unknown order {}. " "This should not happen and likely indicates a serious bug. ", ev.key().value()); } - publish(me->services_data.report_order_op_result_pub,k,ev.req_id(),op_r); } } @@ -239,17 +256,23 @@ void OrderManager::on_cancel_order(const mercury::Update &m) { for (auto const &ev : *m.events) { auto k = ev.key(); auto it = me->orders.find(k); - OrderOpResult op_r; + auto rid = ev.req_id; + + auto on_order_op_result = [this, rid, k](auto const &order_op_result) { + publish(me->services_data.report_order_op_result_pub, k, rid, + order_op_result); + }; + if (it != me->orders.end()) - op_r = it->second->on_cancel(); + it->second->_services->cancel(on_order_op_result); else { - op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; + on_order_op_result(OrderOpResult{ + api::orderman::ORDER_ERROR_UNKNOWN_ORDER, "Unknown order"}); LOG(OrderMan, Error, "Received a cancel request for an unknown order {}. " "This should not happen and likely indicates a serious bug. ", ev.key().value()); } - publish(me->services_data.report_order_op_result_pub,k,ev.req_id,op_r); } } @@ -258,17 +281,24 @@ void OrderManager::on_crack_order(const mercury::Update &m) { for (auto const &ev : *m.events) { auto k = ev.key(); auto it = me->orders.find(k); - OrderOpResult op_r; + auto rid = ev.req_id; + + auto on_order_op_result = [this, rid, k](auto const &order_op_result) { + publish(me->services_data.report_order_op_result_pub, k, rid, + order_op_result); + }; + if (it != me->orders.end()) - it->second->on_crack(); + it->second->_services->crack(on_order_op_result); else { - op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"}; + on_order_op_result(OrderOpResult{ + api::orderman::ORDER_ERROR_UNKNOWN_ORDER, "Unknown Order"}); + LOG(OrderMan, Error, "Received a crack request for an unknown order {}. " "This should not happen and likely indicates a serious bug. ", ev.key().value()); } - publish(me->services_data.report_order_op_result_pub,k,ev.req_id,op_r); } } @@ -281,16 +311,13 @@ void OrderManager::on_gateway_state( } } -OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, - Price p, Quantity q) { - auto const &def = order.def(); - publish_order_def_update(order.key(), def); +void OrderManager::add_child_order(OrderServices &parent, Order &child) { + auto const &def = child.def(); + publish_order_def_update(child.key(), def); - order.init_order_services(me->services_data, parent); - auto r = me->orders.emplace(order.key(), &order); + child.init_order_services(me->services_data, parent); + auto r = me->orders.emplace(child.key(), &child); bts_assert(r.second); - order.on_activate(p, q, *order._services); - return *order._services; } void OrderManager::on_new_fix_buffer( diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index e0df8de83..2489f5b11 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -91,8 +91,8 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void reload_fix_buffer(SessionServicesData &dt); void after_event() override; - OrderServices &activate_child(OrderServices &parent, Order &, Price, - Quantity); + + void add_child_order(OrderServices &parent, Order &child); void publish_order_def_update( OrderKey k, diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index cee3693b4..b4edf93a8 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -104,6 +104,8 @@ class SessionServices { }; class OrderServices { + friend class OrderManager; + public: OrderServices(Order &owner) : _busy(false), _pending_calls(), _owner(&owner), _data(), @@ -332,26 +334,73 @@ class OrderServices { friend class ChildOrder; - OrderServices &activate_child(Order &o, Price p, Quantity q) { - return _data->owner.activate_child(*this, o, p, q); + // Activate + void activate(Price p, Quantity q) { + call_with_reentrancy_guard([p, q](OrderServices &self) { + self._owner->on_activate(p, q, self); + }); } + template + void activate(Price p, Quantity q, CB const &on_order_op) { + call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { + on_order_op(self._owner->on_activate(p, q, self)); + }); + } + + // Update void update(Price p, Quantity q) { call_with_reentrancy_guard( [p, q](OrderServices &self) { self._owner->on_update(p, q); }); } + template void update(Price p, Quantity q, CB const &on_order_op) { + call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { + on_order_op(self._owner->on_update(p, q)); + }); + } void update(api::orderman::Update const &update) { call_with_reentrancy_guard( [update](OrderServices &self) { self._owner->on_update(update); }); } + template + void update(api::orderman::Update const &update, CB const &on_order_op) { + call_with_reentrancy_guard([update, on_order_op](OrderServices &self) { + on_order_op(self._owner->on_update(update)); + }); + } + + // Crack void crack() { call_with_reentrancy_guard( [](OrderServices &self) { self._owner->on_crack(); }); } + template void crack(CB const &on_order_op) { + call_with_reentrancy_guard([on_order_op](OrderServices &self) { + on_order_op(self._owner->on_crack()); + }); + } + + // Cancel void cancel() { call_with_reentrancy_guard( [](OrderServices &self) { self._owner->on_cancel(); }); } + template void cancel(CB const &on_order_op) { + call_with_reentrancy_guard([on_order_op](OrderServices &self) { + on_order_op(self._owner->on_cancel()); + }); + } + // Activate child + void activate_child(Order &o, Price p, Quantity q) { + _data->owner.add_child_order(*this, o); + o._services->activate(p,q); + } + template + void activate_child(Order &o, Price p, Quantity q, CB const&cb) { + _data->owner.add_child_order(*this, o); + o._services->activate(p,q,cb); + } + // Child state callbacks void on_child_update(OrderStateUpdateEvent const &ev) { call_with_reentrancy_guard( [ev](OrderServices &self) { self._child_update_cb(ev); }); diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 6ec45ded4..6896c1a73 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -68,6 +68,7 @@ class Order { friend class OrderFactory; friend class OrderManager; friend class OrderServices; + friend class ChildOrder; }; } } diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 43b6e0513..3e95f485d 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From c6b450f45c01b72b09c718237408a9d09a457da4 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 15 Jan 2019 13:58:15 -0500 Subject: [PATCH 017/218] Fixed broken perf traces. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/mercury/actors/ContentSubscription.h | 50 +++++++++++++++---- .../actors/order_manager/OrderManager.cpp | 24 ++++++++- .../actors/order_manager/OrderServices.h | 14 +++--- .../actors/order_manager/OrderServicesData.h | 1 + 5 files changed, 70 insertions(+), 21 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index afd768425..ec7dd860c 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/mercury/actors/ContentSubscription.h b/src/lib/mercury/actors/ContentSubscription.h index 92a6cccf5..1e06a6859 100644 --- a/src/lib/mercury/actors/ContentSubscription.h +++ b/src/lib/mercury/actors/ContentSubscription.h @@ -1,10 +1,10 @@ #pragma once #include "lib/mercury/actors/Actor.h" +#include #include #include #include -#include #include "lib/utils/bts_assert.h" @@ -32,7 +32,7 @@ template class ContentSubscription { struct SubID { SubID() : k(), sid(0) {} SubID(Key k, uint32_t sid) : k(k), sid(sid) {} - + Key k; uint32_t sid; bool operator==(SubID const &rhs) const { @@ -44,12 +44,20 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( [this](auto const &u) { this->on_update(u); })), _my_subs(), _dispatching(false), _current_sub_id(1), - _pre_sub([](auto) {}) {} + _pre_sub([](auto const &) {}), _pre_event([](auto const &) {}) {} ContentSubscription(Actor &actor, std::function const &pscb) : _actor(&actor), _sub(_actor->subscribe( [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub(pscb) {} + _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub(pscb), + _pre_event([](auto const &) {}) {} + + ContentSubscription(Actor &actor, std::function const &pscb, + std::function const &pre_ev) + : _actor(&actor), _sub(_actor->subscribe( + [this](auto const &u) { this->on_update(u); })), + _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub(pscb), + _pre_event(pre_ev) {} template ContentSubscription(Actor &actor, Tag const &tag) @@ -57,16 +65,35 @@ template class ContentSubscription { _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), _my_subs(), _dispatching(false), _current_sub_id(1), - _pre_sub([](auto) {}) {} + _pre_sub([](auto const &) {}), _pre_event([](auto const &) {}) {} template ContentSubscription(Actor &actor, Tag const &tag, std::function const &pscb) + : _actor(&actor), + _sub(_actor->subscribe( + tag, [this](auto const &u) { this->on_update(u); })), + _my_subs(), _dispatching(false), _current_sub_id(1), _pre_sub(pscb), + _pre_event([](auto const &) {}) {} + + template + ContentSubscription(Actor &actor, Tag const &tag, + std::function const &pre_ev) : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), _my_subs(), _dispatching(false), _current_sub_id(1), - _pre_sub(pscb) {} + _pre_sub([](auto const &) {}), _pre_event(pre_ev) {} + + template + ContentSubscription(Actor &actor, Tag const &tag, + std::function const &pscb, + std::function const &pre_ev) + : _actor(&actor), + _sub(_actor->subscribe( + tag, [this](auto const &u) { this->on_update(u); })), + _my_subs(), _dispatching(false), _current_sub_id(1), _pre_sub(pscb), + _pre_event(pre_ev) {} template SubID sub(Key k, CBT const &cb) { _pre_sub(k); @@ -101,7 +128,7 @@ template class ContentSubscription { CB cb; }; - using SubList = boost::container::small_vector; + using SubList = boost::container::small_vector; using Subscriptions = std::unordered_map; Actor *_actor; @@ -111,19 +138,22 @@ template class ContentSubscription { bool _dispatching; uint32_t _current_sub_id; std::function _pre_sub; + std::function _pre_event; void on_update(Update const &u) { KE ke; _dispatching = true; if (u.events) for (auto const &ev : *(u.events)) { + _pre_event(ev); auto k = ke(ev); - _aux_sub_list = _my_subs[k]; // we copy so we can allow for unsub/sub during dispatch + _aux_sub_list = _my_subs[k]; // we copy so we can allow for + // unsub/sub during dispatch for (auto const &sub : _aux_sub_list) sub.cb(ev); } _dispatching = false; } }; -} -} +} // namespace mercury +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 7e734c5f3..83a44102d 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -391,9 +391,17 @@ void OrderManager::init_order_services() { // can impose more fine-grained and light weight filtering on // top of those topic subscriptions through the // ContentSubscription helper class. + + // we intercept report event updates so that we can set the current + // trace object + std::function on_exe_r = + [this](NewExecutionReportEvent const &ev) { + me->services_data.cor_id = ev.trace; + }; s->exe_report_subs = std::make_unique>( - *this, gw_name); + *this, gw_name, on_exe_r); + s->cancel_reject_subs = std::make_unique>(*this, gw_name); @@ -463,8 +471,19 @@ void OrderManager::init_order_services() { std::function on_settlement_sub = [this](SecurityKey k) { publish(me->services_data.settlement_request_pub, k); }; + + // We need to intercept book updates before they are disseminated + // to orders so we can set the current trace object, which will be + // used to correlate activities triggered by the same market data + // event + std::function on_book_update = + [this](BookUpdateEvent const &ev) { + me->services_data.cor_id = ev.trace; + }; me->services_data.md_subs = - std::make_unique>(*this, on_md_sub); + std::make_unique>(*this, on_md_sub, + on_book_update); + me->services_data.settlement_subs = std::make_unique>( *this, on_settlement_sub); @@ -476,6 +495,7 @@ void OrderManager::init_order_services() { void OrderManager::after_event() { if (me->state == State::READY) { + me->services_data.cor_id = trace::CorID {}; for (auto &osd : me->services_data.sessions) { auto &fix_stream = osd->current_buffer->first_stream(); if (fix_stream.n_msgs()) { diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index b4edf93a8..e0aa74f0f 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -146,19 +146,19 @@ class OrderServices { void queue_fix(SessionServices &ss, jetfix::MessageTypes mt, jetfix::FIXFragment const &f) { - ss.queue_fix(mt, f, _corid); + ss.queue_fix(mt, f, corid()); } void log(const char *entry_kind, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { - _data->log.log(_corid, entry_kind, uint64_1, txt_1, uint32_1); + _data->log.log(corid(), entry_kind, uint64_1, txt_1, uint32_1); } trace::ScopedPerfLogEntry log_scope(const char *entry_kind, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { - return trace::ScopedPerfLogEntry(_data->log, _corid, entry_kind, uint64_1, + return trace::ScopedPerfLogEntry(_data->log, corid(), entry_kind, uint64_1, txt_1, uint32_1); } @@ -172,7 +172,7 @@ class OrderServices { void report_state(const api::orderman::OrderState &state) { OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), state, - _corid); + corid()); _data->owner.publish(_data->report_order_state_pub, ev); if (orderman::in_terminal_state(state.status())) { @@ -206,7 +206,6 @@ class OrderServices { using BookSubID = EventStream::SubID; template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { return _book_updates.sub(k, [this, cb](auto const &ev) { - _corid = ev.trace; this->on_external_event(ev, cb); }); } @@ -237,7 +236,6 @@ class OrderServices { template void subscribe_to_exe_report(SessionServices &ss, OrderKey k, CB &&cb) { ss.subscribe_to_exe_report(k, [this, cb](auto const &ev) { - _corid = ev.trace; this->on_external_event(ev, cb); }); } @@ -294,7 +292,6 @@ class OrderServices { } _pending_calls.clear(); _busy = false; - _corid = trace::CorID{}; } template void call_with_reentrancy_guard(C const &c) { @@ -406,8 +403,9 @@ class OrderServices { [ev](OrderServices &self) { self._child_update_cb(ev); }); } + trace::CorID corid() {return _data->cor_id;} + bool _busy; - trace::CorID _corid; boost::container::small_vector, 10> _pending_calls; Order *_owner; diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 3280d4934..70101d9bd 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -85,6 +85,7 @@ class OrderServicesData { Limiter limiter; OrderFactory order_factory; std::unique_ptr> md_subs; + trace::CorID cor_id; std::unique_ptr> settlement_subs; std::unique_ptr< From b4d18a62c9300d974cd0d31a6a02cd0a3c6d219b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 16 Jan 2019 09:41:06 -0500 Subject: [PATCH 018/218] Allowed async return out of order operations. --- .../actors/order_manager/OrderServices.h | 68 +++++++++-------- src/lib/orderman/orders/Order.cpp | 14 ---- src/lib/orderman/orders/Order.h | 74 ++++++++++++++----- 3 files changed, 91 insertions(+), 65 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index e0aa74f0f..0c37f4ed0 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -110,7 +110,8 @@ class OrderServices { OrderServices(Order &owner) : _busy(false), _pending_calls(), _owner(&owner), _data(), _parent(nullptr), _child_update_cb([](auto const &) {}), - _book_updates(), _settlement_updates(), _time_change(), _sessions(), + _do_nothing([](auto const &) {}), _book_updates(), + _settlement_updates(), _time_change(), _sessions(), _create_order_reply() {} void init(OrderServicesData &data, OrderServices &parent) { @@ -158,8 +159,8 @@ class OrderServices { uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { - return trace::ScopedPerfLogEntry(_data->log, corid(), entry_kind, uint64_1, - txt_1, uint32_1); + return trace::ScopedPerfLogEntry(_data->log, corid(), entry_kind, + uint64_1, txt_1, uint32_1); } void report_definition(const api::orderman::CustomOrderDefinition &cdef) { @@ -205,9 +206,8 @@ class OrderServices { // Book using BookSubID = EventStream::SubID; template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { - return _book_updates.sub(k, [this, cb](auto const &ev) { - this->on_external_event(ev, cb); - }); + return _book_updates.sub( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); } void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } @@ -235,9 +235,8 @@ class OrderServices { using ExeReportSubID = EventStream::SubID; template void subscribe_to_exe_report(SessionServices &ss, OrderKey k, CB &&cb) { - ss.subscribe_to_exe_report(k, [this, cb](auto const &ev) { - this->on_external_event(ev, cb); - }); + ss.subscribe_to_exe_report( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); } void unsubscribe_from_exe_report(SessionServices &ss, ExeReportSubID sid) { ss.unsubscribe_from_exe_report(sid); @@ -334,67 +333,70 @@ class OrderServices { // Activate void activate(Price p, Quantity q) { call_with_reentrancy_guard([p, q](OrderServices &self) { - self._owner->on_activate(p, q, self); + self._owner->on_activate(p, q, self, self._do_nothing); }); } template void activate(Price p, Quantity q, CB const &on_order_op) { call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { - on_order_op(self._owner->on_activate(p, q, self)); + self._owner->on_activate(p, q, self, on_order_op); }); } // Update void update(Price p, Quantity q) { - call_with_reentrancy_guard( - [p, q](OrderServices &self) { self._owner->on_update(p, q); }); + call_with_reentrancy_guard([p, q](OrderServices &self) { + self._owner->on_update(p, q, self._do_nothing); + }); } - template void update(Price p, Quantity q, CB const &on_order_op) { + void update(Price p, Quantity q, OrderOpCallback const &on_order_op) { call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { - on_order_op(self._owner->on_update(p, q)); + self._owner->on_update(p, q, on_order_op); }); } void update(api::orderman::Update const &update) { - call_with_reentrancy_guard( - [update](OrderServices &self) { self._owner->on_update(update); }); + call_with_reentrancy_guard([update](OrderServices &self) { + self._owner->on_update(update, self._do_nothing); + }); } - template - void update(api::orderman::Update const &update, CB const &on_order_op) { + void update(api::orderman::Update const &update, + OrderOpCallback const &on_order_op) { call_with_reentrancy_guard([update, on_order_op](OrderServices &self) { - on_order_op(self._owner->on_update(update)); + self._owner->on_update(update, on_order_op); }); } // Crack void crack() { call_with_reentrancy_guard( - [](OrderServices &self) { self._owner->on_crack(); }); + [](OrderServices &self) { self._owner->on_crack(self._do_nothing); }); } - template void crack(CB const &on_order_op) { + void crack(OrderOpCallback const &on_order_op) { call_with_reentrancy_guard([on_order_op](OrderServices &self) { - on_order_op(self._owner->on_crack()); + self._owner->on_crack(on_order_op); }); } // Cancel void cancel() { - call_with_reentrancy_guard( - [](OrderServices &self) { self._owner->on_cancel(); }); + call_with_reentrancy_guard([](OrderServices &self) { + self._owner->on_cancel(self._do_nothing); + }); } - template void cancel(CB const &on_order_op) { + void cancel(OrderOpCallback const &on_order_op) { call_with_reentrancy_guard([on_order_op](OrderServices &self) { - on_order_op(self._owner->on_cancel()); + self._owner->on_cancel(on_order_op); }); } // Activate child void activate_child(Order &o, Price p, Quantity q) { _data->owner.add_child_order(*this, o); - o._services->activate(p,q); + o._services->activate(p, q, _do_nothing); } - template - void activate_child(Order &o, Price p, Quantity q, CB const&cb) { + void activate_child(Order &o, Price p, Quantity q, + OrderOpCallback const &cb) { _data->owner.add_child_order(*this, o); - o._services->activate(p,q,cb); + o._services->activate(p, q, cb); } // Child state callbacks @@ -403,7 +405,7 @@ class OrderServices { [ev](OrderServices &self) { self._child_update_cb(ev); }); } - trace::CorID corid() {return _data->cor_id;} + trace::CorID corid() { return _data->cor_id; } bool _busy; boost::container::small_vector, 10> @@ -412,6 +414,8 @@ class OrderServices { OrderServicesData *_data; OrderServices *_parent; std::function _child_update_cb; + std::function _do_nothing; + EventStream _book_updates; EventStream _settlement_updates; EventStream _time_change; diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index 408f740b7..e0dcd3343 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -16,20 +16,6 @@ void Order::init_order_services(OrderServicesData &osd, OrderServices &parent) { Order::~Order() {} -OrderOpResult Order::on_update(api::orderman::Update const &) { - return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED, - "The update operation is not supported by this order type" - - }; -} - -OrderOpResult Order::on_crack() { - return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED, - "The crack operation is not supported by this order type" - - }; -} - void Order::set_def(api::orderman::OrderDefinition const &def) { _def = std::make_shared(def); } diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 6896c1a73..f106930b9 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -7,22 +7,24 @@ // fwd namespace bts { -namespace trace {struct CorID;} +namespace trace { +struct CorID; +} namespace securities { class ISecurityDB; } namespace orderman { class IOrderFactory; class OrderServicesData; -} +} // namespace orderman namespace api { namespace orderman { class OrderDefinition; class OrderRecord; class OrderState; -} -} -} +} // namespace orderman +} // namespace api +} // namespace bts // end fwd namespace bts { @@ -30,6 +32,7 @@ namespace orderman { class PreActivationOrderServices; class OrderServices; +using OrderOpCallback = std::function; class Order { public: @@ -39,20 +42,53 @@ class Order { OrderKey key() const { return _key; } OrderKey parent_key() const { return _parent_key; } - // construction - can be slow + // Construction, the order is not yet live and it may never + // be. This can be slow. virtual void on_init_new(api::orderman::OrderDefinition const &, const PreActivationOrderServices &) = 0; virtual void on_init_recovered(api::orderman::OrderRecord const &, const PreActivationOrderServices &) = 0; - // activation - cannot be slow - virtual OrderOpResult on_activate(Price, Quantity, OrderServices &) = 0; + // Activation, the order is now live, these should be fast + virtual void on_activate(Price p, Quantity q, OrderServices &s, + OrderOpCallback const &cb) { + cb(on_activate(p, q, s)); + } + virtual OrderOpResult on_activate(Price, Quantity, OrderServices &) { + return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Not implemented"}; + } - // order is running, maintenance - virtual OrderOpResult on_update(Price, Quantity) = 0; - virtual OrderOpResult on_update(api::orderman::Update const&) ; - virtual OrderOpResult on_crack(); - virtual OrderOpResult on_cancel() = 0; + // Update + virtual void on_update(Price p, Quantity q, OrderOpCallback const &cb) { + cb(on_update(p, q)); + } + virtual OrderOpResult on_update(Price, Quantity) { + return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Not implemented"}; + } + virtual void on_update(api::orderman::Update const &u, + OrderOpCallback const &cb) { + cb(on_update(u)); + } + virtual OrderOpResult on_update(api::orderman::Update const &) { + return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Not implemented"}; + } + + // Crack + virtual void on_crack(OrderOpCallback const &cb) { cb(on_crack()); } + virtual OrderOpResult on_crack() { + return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Not implemented"}; + } + + // Cancel + virtual void on_cancel(OrderOpCallback const &cb) { cb(on_cancel()); } + virtual OrderOpResult on_cancel() { + return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Not implemented"}; + } private: OrderKey _key; @@ -60,15 +96,15 @@ class Order { std::unique_ptr _services; std::shared_ptr _def; - void set_def(api::orderman::OrderDefinition const&); - std::shared_ptr const& def(); - + void set_def(api::orderman::OrderDefinition const &); + std::shared_ptr const &def(); + void init_order_services(OrderServicesData &); - void init_order_services(OrderServicesData &,OrderServices &parent); + void init_order_services(OrderServicesData &, OrderServices &parent); friend class OrderFactory; friend class OrderManager; friend class OrderServices; friend class ChildOrder; }; -} -} +} // namespace orderman +} // namespace bts From b7897fc7ac7552f429df7475d7f69bcd3b16430c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 16 Jan 2019 14:00:16 -0500 Subject: [PATCH 019/218] Documenting the iceberg design. --- src/lib/orderman/doc/order_man_notes.org | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/lib/orderman/doc/order_man_notes.org b/src/lib/orderman/doc/order_man_notes.org index ac97e466f..aa0d8df99 100644 --- a/src/lib/orderman/doc/order_man_notes.org +++ b/src/lib/orderman/doc/order_man_notes.org @@ -1,3 +1,12 @@ +* Iceberg specification +| | paused | synched | pending_w | in_flight_update | +| pending_w | X | | | | +| working | X | | | | +| completed | O | | | | +| canceled | canceled | | | | +| error | X | | | | +| disconnected | | | | | +| rejected by spark | X | | | | * References ** To Exchange - [[https://www.cmegroup.com/confluence/display/EPICSANDBOX/New+Order][NewOrderSingle]] @@ -394,23 +403,15 @@ ExecRefID * Open Issues - Re-Connection is done on the fast thread, slowing everything down -- Consider multiple gateways for MSGW -- Need to quiesce orders when they are done - Need to make sure there are no duplicate order state update events -- We need to decouple OM from fix gateway, so that we can have a slow - OM and a fast OM going against the same gateway - Once we have multiple OM's we will need to guarantee that they can see each others order, which means we need to use some sort of synopsis or other mechanism to ensure that they are synchronized -- Self match protection - fill mitigation - should cancel on disconnect be on -- handling of business reject - handling of reject - garbage collection of orders - garbage collection of fills -- need spread leg fills for limits -- need to get a handle on transact time - consider including restatement reason - see if handling of cancel rejects is any good - impossible to shutdown orderservice at the moment @@ -547,8 +548,6 @@ digraph G { - maybe an enum can be used to distinguish the subscription features: SINGLETON| SEE_ADV -* Check with taha on wheter there is overlap between his merging of the book and the one that eric needs -* Run a burn test for the shell, see memory usage * Mistakes - Needed one single normalized DB - Orders should be persisted always so we don't have to do crazy stuff From fc2f85b842218a2e14100aec3d03aaa61e2bbc9d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 28 Jan 2019 08:52:34 -0500 Subject: [PATCH 020/218] Refactored a bit. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/orderman2/orderman_utils/Book.h | 72 ------------------- .../orderman2/orderman_utils/orderman_utils.h | 10 --- src/lib/orderman2/orders/NativeOrder.cpp | 2 - src/lib/orderman2/orders/NativeOrder.h | 57 --------------- src/lib/orderman2/orders/Order.cpp | 2 - src/lib/orderman2/orders/Order.h | 70 ------------------ 7 files changed, 1 insertion(+), 214 deletions(-) delete mode 100644 src/lib/orderman2/orderman_utils/Book.h delete mode 100644 src/lib/orderman2/orderman_utils/orderman_utils.h delete mode 100644 src/lib/orderman2/orders/NativeOrder.cpp delete mode 100644 src/lib/orderman2/orders/NativeOrder.h delete mode 100644 src/lib/orderman2/orders/Order.cpp delete mode 100644 src/lib/orderman2/orders/Order.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index ec7dd860c..2cc2d5f54 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman2/orderman_utils/Book.h b/src/lib/orderman2/orderman_utils/Book.h deleted file mode 100644 index 3e505b38a..000000000 --- a/src/lib/orderman2/orderman_utils/Book.h +++ /dev/null @@ -1,72 +0,0 @@ -#pragma once - -#include -#include "lib/domain_model/common.h" -#include "lib/config/protos/MarketData.pb.h" -#include "lib/md/PriceSize.h" - - -namespace bts { -namespace orderman2 { - -using BookSide = std::array ; - -class Book { -public: - Book () : - _security_key(), - _book() - {} - - Book (SecurityKey key) : - _security_key(key), - _book() - {} - - Book (SecurityKey key, - BookSide const&bid, - BookSide const&ask) : - _security_key(key), - _book {bid,ask} - {} - - Book (Book const&rhs) - : _security_key(rhs._security_key), - _book(rhs._book) - {} - - Book &operator=(Book const &rhs) - { - _security_key = rhs._security_key; - _book = rhs._book; - return *this; - } - - SecurityKey security_key() const {return _security_key;} ; - - BookSide const &bid () const {return _book[0];} - BookSide const &ask () const {return _book[1];} - BookSide &bid () {return _book[0];} - BookSide &ask () {return _book[1];} - - size_t n_levels() const {return std::tuple_size();} - - BookSide const& side(api::Side bs) const - { - bts_assert_d(bs != api::SIDE_UNDEFINED); - return _book[bs - api::SIDE_BUY]; - } - - BookSide & side(api::Side bs) - { - bts_assert_d(bs != api::SIDE_UNDEFINED); - return _book[bs - api::SIDE_BUY]; - } - -private: - friend class MDSource; - SecurityKey _security_key; - std::array _book; -}; - -}} diff --git a/src/lib/orderman2/orderman_utils/orderman_utils.h b/src/lib/orderman2/orderman_utils/orderman_utils.h deleted file mode 100644 index 540f6a9a3..000000000 --- a/src/lib/orderman2/orderman_utils/orderman_utils.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "lib/utils/ValueWrapper.h" - -namespace bts { -namespace orderman2 { -using Price = utils::ValueWrapper; -using Quantity = utils::ValueWrapper; -using OrderKey = utils::ValueWrapper; -}} diff --git a/src/lib/orderman2/orders/NativeOrder.cpp b/src/lib/orderman2/orders/NativeOrder.cpp deleted file mode 100644 index 96e505504..000000000 --- a/src/lib/orderman2/orders/NativeOrder.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "NativeOrder.h" - diff --git a/src/lib/orderman2/orders/NativeOrder.h b/src/lib/orderman2/orders/NativeOrder.h deleted file mode 100644 index 3e03df4de..000000000 --- a/src/lib/orderman2/orders/NativeOrder.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once -#include "Order.h" - - -namespace bts { -namespace orderman { - - -struct PermissionQueryResult { - bool can_send; - std::string error_msg; -}; - -struct RouteQueryResult { - bool has_route; - std::string error_msg; - api::orderman::RoutingRecord routing_record; -}; - -class NativeOrder2 : public Order2 { -public: - virtual void on_execution_report(std::string const &, OrderKey, - ExecutionReport const &){}; - virtual void on_cancel_reject(std::string const &, OrderKey, - std::string const & /*msg*/){}; - virtual void on_gateway_status(std::string const &, bool /*is_connected*/){}; - - void subscribe_execution_report(std::string const &gw, OrderKey k); - void unsubscribe_execution_report(std::string const &gw, OrderKey k); - void subscribe_cancel_reject(std::string const &gw, OrderKey k); - void unsubscribe_cancel_reject(std::string const &gw, OrderKey k); - void subscribe_gateway_status(std::string const &); - void unsubscribe_gateway_status(std::string const &); - - RouteQueryResult get_route(AccountID, UserID, api::Security const &); - PermissionRec - get_permission_record(api::orderman::RoutingRecord const &routing, AccountID, - UserID, api::Security const &, api::Side); - - PermissionQueryResult can_send_new_order(PermissionRec const &, Quantity, - Price); - - PermissionQueryResult can_update_order(PermissionRec const &, Quantity from, - Quantity to, Price p); - - bool is_route_connected(api::orderman::RoutingRecord const &); - void send_fix(api::orderman::RoutingRecord const &rr, - jetfix::MessageTypes mt, jetfix::FIXFragment const &f); - - TimeStamp time() const; - mercury::TimeStampStr time_str() const; - private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/lib/orderman2/orders/Order.cpp b/src/lib/orderman2/orders/Order.cpp deleted file mode 100644 index a14ec8bed..000000000 --- a/src/lib/orderman2/orders/Order.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "Order.h" - diff --git a/src/lib/orderman2/orders/Order.h b/src/lib/orderman2/orders/Order.h deleted file mode 100644 index 24c10b533..000000000 --- a/src/lib/orderman2/orders/Order.h +++ /dev/null @@ -1,70 +0,0 @@ -#pragma once - -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" - -#include - -namespace bts { -namespace api { -namespace orderman { -class OrderDefinition; -class OrderRecord; -} // namespace orderman -} // namespace api -} // namespace bts - -namespace bts { -namespace orderman { - -struct ChildOrderDescriptor {}; -struct ChildOrder {}; - -class PermissionRec {}; - -class Order2 { - public: - virtual ~Order2(); - - virtual void on_init_new(api::orderman::OrderDefinition const &) = 0; - virtual void on_init_recovered(api::orderman::OrderRecord const &) = 0; - - virtual void on_activate(Price, Quantity) = 0; - virtual void on_update(Price, Quantity) = 0; - virtual void on_cancel() = 0; - virtual void on_child_order_update(OrderKey, api::orderman::OrderState const &){}; - virtual void on_book(SecurityKey, Book const &) {} - virtual void on_settlement(SecurityKey, Book const &) {} - virtual void on_time(TimeStamp const &) {} - - void subscribe_child_updates(OrderKey child); - void unsubscribe_child_updates(OrderKey child); - void subscribe_book(SecurityKey); - void unsubscribe_book(SecurityKey); - void subscribe_settlement(SecurityKey); - void unsubscribe_settlement(SecurityKey); - void subscribe_time(); - void unsubscribe_time(); - - api::Security const *resolve_security(SecurityKey const &k) const; - void report_state(const api::orderman::OrderState &state); - - ChildOrderDescriptor const & - make_child_order_descriptor(api::orderman::OrderDefinition const &, - size_t hint = 1); - ChildOrder make_child_order(ChildOrderDescriptor const &desc); - void send_child(ChildOrder ch, Price, Quantity); - void update_child(ChildOrder ch, Price, Quantity); - void cancel_child(ChildOrder ch); - - private: - struct PImpl; - std::unique_ptr me; -}; -} // namespace orderman -} // namespace bts From 5529e80e17e2b9c96225c24a29692caecf4bfa48 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 29 Jan 2019 18:07:27 -0500 Subject: [PATCH 021/218] Tentative new order services interface. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/orderman/core/IOrderServices.cpp | 1 + src/lib/orderman/core/IOrderServices.h | 66 ++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 src/lib/orderman/core/IOrderServices.cpp create mode 100644 src/lib/orderman/core/IOrderServices.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index b4aede308..e3785a74c 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/core/IOrderServices.cpp b/src/lib/orderman/core/IOrderServices.cpp new file mode 100644 index 000000000..47bb48912 --- /dev/null +++ b/src/lib/orderman/core/IOrderServices.cpp @@ -0,0 +1 @@ +#include "lib/orderman/core/IOrderServices.h" diff --git a/src/lib/orderman/core/IOrderServices.h b/src/lib/orderman/core/IOrderServices.h new file mode 100644 index 000000000..c1fc54127 --- /dev/null +++ b/src/lib/orderman/core/IOrderServices.h @@ -0,0 +1,66 @@ +#pragma once + +#include +#include "lib/domain_model/common.h" + +// fwds +namespace bts { +namespace api {namespace orderman { +class OrderDefinition; +class CustomOrderDefinition; +class OrderState; +class Update; +}} +namespace mercury {class TimerEvent;} +namespace orderman { +class ChildOrder; +class OrderOpResult; +class BookUpdateEvent; +class TickerUpdateEvent; +class SettlementUpdateEvent; +class OrderStateUpdateEvent; +}} + + +namespace bts { +namespace orderman { + +template +using Callback = std::function; + +class IOrderServices { +public: + // reporting state and definition changes + virtual void report_definition(const api::orderman::CustomOrderDefinition &) = 0; + virtual void report_state(const api::orderman::OrderState &) = 0; + + // Child order creation/control + virtual void make_child_orders(api::orderman::OrderDefinition const&, size_t how_many, + Callback const&>) = 0; + virtual std::vector make_child_orders(api::orderman::OrderDefinition const&, size_t how_many) = 0; + virtual void activate(ChildOrder&, Price, Quantity,Callback const&) = 0; + virtual void activate(ChildOrder&, Price, Quantity) = 0; + virtual void update(ChildOrder&,Price, Quantity) = 0; + virtual void update(ChildOrder&,Price, Quantity,Callback const&) = 0; + virtual void update(api::orderman::Update const &) = 0; + virtual void update(api::orderman::Update const &,Callback const&) = 0; + virtual void crack(ChildOrder&, Callback const&) = 0; + virtual void crack(ChildOrder&) = 0; + virtual void cancel(ChildOrder&, Callback const&) = 0; + virtual void cancel(ChildOrder&) = 0; + // End child control + + // Events + virtual void subscribe_to_book(SecurityKey,Callback const&) = 0; + virtual void unsubscribe_from_book(SecurityKey) = 0; + virtual void subscribe_to_ticker(SecurityKey,Callback const&) = 0; + virtual void unsubscribe_from_ticker(SecurityKey) = 0; + virtual void subscribe_to_settlement(SecurityKey, Callback const&) = 0; + virtual void unsubscribe_from_settlement(SecurityKey) = 0; + virtual void subscribe_to_time(Callback const&) = 0; + virtual void unsubscribe_from_time() = 0; + virtual void subscribe_to_child_updates(Callback const&) = 0; + virtual void unsubscribe_from_child_updates() = 0; + // End events +}; +}} From a0bf0e93f4de3fce9f6b15463ab89335c5b70589 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 30 Jan 2019 14:48:00 -0500 Subject: [PATCH 022/218] Fixed comment. --- src/lib/orderman/order_factory/OrderFactory.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index d1103fe16..9b75093ab 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -75,9 +75,10 @@ Order &OrderFactory::create(OrderKey parent, api::orderman::OrderDefinition const *def_ptr = &def; api::orderman::OrderDefinition corrected_def; - // For non native orders we force the ManalOrderIndicator to be 'N' - // since all non native order are algos and we would rather not - // depend on the shell and every algo getting this right + // For non native orders we force the ManualOrderIndicator to be + // 'N' since anything that is not a native orders is an algo and we + // would rather not depend on the shell and every algo setting this + // field correctly if (dynamic_cast(&order) == nullptr && def.manual_order_indicator() == api::orderman::MANUAL_ORDER_INDICATOR_YES) { From 8dcf41e9cf2df653ecde7b06ab520f93bb340048 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 1 Feb 2019 10:08:08 -0500 Subject: [PATCH 023/218] Added attach/detach interface proposal. --- src/lib/api/services/OrderService.proto | 1 + src/lib/orderman/core/IOrderServices.h | 105 +++++++++++++++++------- src/lib/orderman/doc/attach_detach.org | 32 ++++++++ 3 files changed, 109 insertions(+), 29 deletions(-) create mode 100644 src/lib/orderman/doc/attach_detach.org diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 4d98fc74b..ee6acddbf 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -68,6 +68,7 @@ message OrderDefinition { CTICode cti_code = 9; CustomerOrFirm customer_or_firm = 10; OrderSubType sub_type = 12; + repeated uint32 attach_order = 15; CustomOrderDefinition custom_def = 11; } diff --git a/src/lib/orderman/core/IOrderServices.h b/src/lib/orderman/core/IOrderServices.h index c1fc54127..8aaad79de 100644 --- a/src/lib/orderman/core/IOrderServices.h +++ b/src/lib/orderman/core/IOrderServices.h @@ -1,66 +1,113 @@ #pragma once -#include +#include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/common.h" +#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/orders/OrderOpResult.h" +#include // fwds namespace bts { -namespace api {namespace orderman { +namespace api { +namespace orderman { class OrderDefinition; class CustomOrderDefinition; class OrderState; class Update; -}} -namespace mercury {class TimerEvent;} +class OrderRecord; +} // namespace orderman +} // namespace api +namespace mercury { +class TimerEvent; +} namespace orderman { class ChildOrder; -class OrderOpResult; +class ISecurityDB; +class IAlgoServices; +class IOrderFactory; class BookUpdateEvent; class TickerUpdateEvent; class SettlementUpdateEvent; class OrderStateUpdateEvent; -}} - +} // namespace orderman +} // namespace bts namespace bts { namespace orderman { template -using Callback = std::function; +using Callback = std::function; +using OrderOpCB = Callback; +OrderOpCB ignore() { + return [](auto &) {}; +}; + +struct AttachOpResult { + OrderOpResult result; + ChildOrder child; +}; + +class AlgoOrder { + public: + virtual void on_init_new(api::orderman::OrderDefinition const &, + ISecurityDB &, IOrderFactory &) = 0; + + virtual void on_activate(Price, Quantity, IAlgoServices &, + OrderOpCB const &) = 0; + + virtual void on_update(Price, Quantity, OrderOpCB const &) = 0; + virtual void on_update(api::orderman::Update const &, + OrderOpCB const &on_result) { + on_result(OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Operation not supported"}); + } + + virtual void on_cancel(OrderOpCB const &) = 0; + virtual void on_detach(OrderOpCB const &) = 0; + virtual void on_attached(OrderKey /*new_parent*/) {}; + virtual void on_detached() {} +}; class IOrderServices { -public: + public: // reporting state and definition changes - virtual void report_definition(const api::orderman::CustomOrderDefinition &) = 0; + virtual void + report_definition(const api::orderman::CustomOrderDefinition &) = 0; virtual void report_state(const api::orderman::OrderState &) = 0; // Child order creation/control - virtual void make_child_orders(api::orderman::OrderDefinition const&, size_t how_many, - Callback const&>) = 0; - virtual std::vector make_child_orders(api::orderman::OrderDefinition const&, size_t how_many) = 0; - virtual void activate(ChildOrder&, Price, Quantity,Callback const&) = 0; - virtual void activate(ChildOrder&, Price, Quantity) = 0; - virtual void update(ChildOrder&,Price, Quantity) = 0; - virtual void update(ChildOrder&,Price, Quantity,Callback const&) = 0; - virtual void update(api::orderman::Update const &) = 0; - virtual void update(api::orderman::Update const &,Callback const&) = 0; - virtual void crack(ChildOrder&, Callback const&) = 0; - virtual void crack(ChildOrder&) = 0; - virtual void cancel(ChildOrder&, Callback const&) = 0; - virtual void cancel(ChildOrder&) = 0; + virtual void + make_child_orders(api::orderman::OrderDefinition const &, size_t how_many, + Callback const &>) = 0; + virtual void activate(ChildOrder &, Price, Quantity, + OrderOpCB const & = ignore()) = 0; + virtual void update(ChildOrder &, Price, Quantity, + OrderOpCB const & = ignore()) = 0; + virtual void update(ChildOrder &, api::orderman::Update const &, + OrderOpCB const & = ignore()) = 0; + virtual void cancel(ChildOrder &, OrderOpCB const & = ignore()) = 0; + virtual void attach(OrderKey, Callback const &) = 0; + virtual void detach(ChildOrder const &, OrderOpCB const & = ignore()); // End child control // Events - virtual void subscribe_to_book(SecurityKey,Callback const&) = 0; + virtual void subscribe_to_book(SecurityKey, + Callback const &) = 0; virtual void unsubscribe_from_book(SecurityKey) = 0; - virtual void subscribe_to_ticker(SecurityKey,Callback const&) = 0; + virtual void subscribe_to_ticker(SecurityKey, + Callback const &) = 0; virtual void unsubscribe_from_ticker(SecurityKey) = 0; - virtual void subscribe_to_settlement(SecurityKey, Callback const&) = 0; + virtual void + subscribe_to_settlement(SecurityKey, + Callback const &) = 0; virtual void unsubscribe_from_settlement(SecurityKey) = 0; - virtual void subscribe_to_time(Callback const&) = 0; + virtual void + subscribe_to_time(Callback const &) = 0; virtual void unsubscribe_from_time() = 0; - virtual void subscribe_to_child_updates(Callback const&) = 0; + virtual void + subscribe_to_child_updates(Callback const &) = 0; virtual void unsubscribe_from_child_updates() = 0; // End events }; -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/doc/attach_detach.org b/src/lib/orderman/doc/attach_detach.org new file mode 100644 index 000000000..f8ffb58a9 --- /dev/null +++ b/src/lib/orderman/doc/attach_detach.org @@ -0,0 +1,32 @@ +** Attach/Detach semantics +*** Semantics +- An order base definition can include a list of running orders to attach + to +- Each custom definition can have parameters that allow configuration + of the specific order type with respect to the attachment + list. Obvious configuration alternatives are: + - Attach to each of the listed orders directly or + - Forward attachment list to children +- Only orders with no parent or parents in a terminal state can be + attached to +- a detach(order_key) message can be sent to any order, even if that + order was not started through attachment to an existing order. the + expected semantics is for the order in question to stop managing the + child order and transition to completed. + +*** API +- IOrderServices: + - attach_to_order(ok, std::function + on_attach_complete); + - detach(ChildOrder) +- Order + - on_detach(order_key) + - on_attached(); + - on_detached(); +message OrderDefinition { + CTICode cti_code = 9; + CustomerOrFirm customer_or_firm = 10; + OrderSubType sub_type = 12; ++ repeated uint32 attach_to_order = 13; + CustomOrderDefinition custom_def = 11; +} From 553ab7b858527984e4771acf9273ded8953d0a9a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 17 Jan 2019 15:59:55 -0600 Subject: [PATCH 024/218] in case my machine starts on fire --- .../MiniOrderBook/MiniOrderBookView.xaml | 158 ++++++++++++++++++ .../MiniOrderBook/MiniOrderBookView.xaml.cs | 28 ++++ .../Modules/Trading/OrderBook/OrderBookVM.cs | 7 +- .../OrderBook/OrderBookWindowFactory.cs | 20 ++- src/client/spark/Spark.csproj | 6 + .../DIYGrid/Settings/GridColumnSettings.cs | 37 +++- .../DIYGrid/Settings/GridSettingsManager.cs | 16 +- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 20 +++ .../view/Spark/Ladder/LadderOrdersHost.cs | 12 +- .../spark/view/Spark/Ladder/LadderView.xaml | 17 +- 10 files changed, 296 insertions(+), 25 deletions(-) create mode 100644 src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml create mode 100644 src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml new file mode 100644 index 000000000..c0490da15 --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs new file mode 100644 index 000000000..f1942eba1 --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs @@ -0,0 +1,28 @@ +using mbts.ui.controls; +using System.Windows.Controls; + +namespace mbts.spark { + internal partial class MiniOrderBookView : UserControl { + // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! + // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. + public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey } + public const string + SubTypeFilterTemplateKey = "SubTypeFilterTemplate", + ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", + RowStyleKey = "RowStyle", + RowTemplateKey = "RowTemplateKey", + CVRowStyleKey = "CVRowStyle", + CVRowTemplateKey = "CVRowTemplateKey"; + + public const double RowHeight = 17; + + public MiniOrderBookView(OrderBookVM vm) { + InitializeComponent(); + DataContext = vm; + } + } + + class MiniOrderBookRowView : DIYGrid.HighPerformanceRow { + public MiniOrderBookRowView() : base(OrderBookView.RowHeight) { } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index d86ea35bf..1a85e767e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -47,7 +47,6 @@ namespace mbts.spark { grid_settings_manager = _create_grid_settings_manager(owner_title, bus, notification_service, model, rows, columns); _resources = new List { model.on_order_tuples_table.OnDispatcher().Subscribe(_row_collection.update), - settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager), grid_settings_manager, Disposable.Create(() => { _columns.filter_changed -= on_filter_changed; @@ -55,6 +54,9 @@ namespace mbts.spark { }), _columns }; + if (settings_manager != null) { + _resources.Add(settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager)); + } void on_filter_changed() => _row_collection.filter = _columns.get_filter(); } @@ -187,7 +189,8 @@ namespace mbts.spark { return pvm; }, (gen, anims) => new OrderBookGridSettings(gen, anims.Select(a => new OrderRecordTuplePredicateAnimations(a.predicate_builder, a.cell_animations, a.row_animations, a.sound_notifications))), - notification_service.data_cache, col_settings_flags); + (notification_service == null) ? null : notification_service.data_cache, + col_settings_flags); } static OrderRecordTuplePredicate.PredicateTypeOneofCase _corresponding_predicate_type(Columns col) { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index 77f1a5b14..4392dca83 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -90,6 +90,8 @@ namespace bts.shell { public static OrderBookGridSettings DefaultGrid => new OrderBookGridSettings(_default_general_grid); static GridSettings _default_general_grid => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.sorting_criterion); + public static GridSettings default_mini_grid => GridSettings.Default.with(DefaultColumns.mini, DefaultColumns.sorting_criterion); + static class DefaultColumns { public static GridColumnSettings security => new GridColumnSettings(Columns.Security.ToString(), DIYGrid.DefaultColumnHeaders.Security, width: DIYGrid.DefaultColumnWidths.Security); @@ -145,7 +147,23 @@ namespace bts.shell { yield return parent_key; } } - } + + private static List _mini_mode_columns_to_hide = new List { + time_created, exchange, sub_type, avg_price, last_price, status, last_message, security_key, order_key, parent_key + }; + + public static IEnumerable mini { + get { + foreach (var col_setting in all) { + if (_mini_mode_columns_to_hide.Contains(col_setting)) { + yield return col_setting.with(is_visible: false); + } else { + yield return col_setting; + } + } + } + } + } } [ProtoContract] diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index f3579dcd9..300144396 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -76,6 +76,12 @@ + + MSBuild:Compile + + + MSBuild:Compile + MSBuild:Compile diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridColumnSettings.cs b/src/client/spark/view/Controls/DIYGrid/Settings/GridColumnSettings.cs index e6ed6953f..539389e71 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridColumnSettings.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridColumnSettings.cs @@ -1,4 +1,5 @@ using bts.proto; +using bts.utils; using ProtoBuf; using System; using System.ComponentModel; @@ -18,7 +19,7 @@ namespace mbts.ui.settings { } [ProtoContract] - class GridColumnSettings { + class GridColumnSettings : IEquatable { const bool _default_is_visible = true, _default_is_collapsed = false; @@ -103,5 +104,39 @@ namespace mbts.ui.settings { width ?? this.width, horizontal_alignment ?? this.horizontal_alignment, horizontal_offset ?? this.horizontal_offset); + + public bool Equals(GridColumnSettings other) => + other != null && + id == other.id && + display_name == other.display_name && + is_visible == other.is_visible && + is_collapsed == other.is_collapsed && + font_weight_override.Equals(other.font_weight_override) && + font_color_override.Equals(other.font_color_override) && + width == other.width && + horizontal_alignment == other.horizontal_alignment && + horizontal_offset == other.horizontal_offset && + display_name == other.display_name; + + public override bool Equals(object obj) => + Equals(obj as GridColumnSettings); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash( + id.GetHashCode(), + display_name.GetHashCode(), + is_visible.GetHashCode(), + is_collapsed.GetHashCode(), + font_weight_override.GetHashCode(), + font_color_override.GetHashCode(), + width.GetHashCode(), + horizontal_alignment.GetHashCode(), + horizontal_offset.GetHashCode(), + display_name.GetHashCode() + ); + + + } + } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs index e4eccfc55..8c3a7f20c 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs @@ -126,13 +126,15 @@ namespace mbts.ui { col.set_fallback_font_params(new FontFamily(grid.font_family), grid.font_size, grid.font_color.rgb_color(), grid.font_weight); _predicate_animations_data = value.predicate_animations; _animation_defs.clear(); - foreach (var pa in _predicate_animations_data) { - var predicate = pa.predicate_builder.create_predicate(_arg); - foreach (var s in pa.sound_notifications) { - _notification_subs.Add(_notification_service.link(predicate, s)); - } - if (pa.predicate_builder is INotificationPredicateBuilder tpb && tpb.is_toast_enabled) { - _notification_subs.Add(_notification_service.link(tpb.create_notification_predicate(_arg))); + if (_notification_service != null && _arg != null) { + foreach (var pa in _predicate_animations_data) { + var predicate = pa.predicate_builder.create_predicate(_arg); + foreach (var s in pa.sound_notifications) { + _notification_subs.Add(_notification_service.link(predicate, s)); + } + if (pa.predicate_builder is INotificationPredicateBuilder tpb && tpb.is_toast_enabled) { + _notification_subs.Add(_notification_service.link(tpb.create_notification_predicate(_arg))); + } } } // ** in the unfortunate event that we botch backwards compatability, and the columns don't bear a 1:1 relationship with the column-settings diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 73dcf147b..47c78289d 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -38,6 +38,7 @@ namespace mbts.spark { readonly Property _is_exchange_order, _has_multiple_orders_at_same_level, _is_hedge_order; readonly Property _parent_algo_type; readonly Property _summary, _description; + readonly Property _orderbook_vm; IObservable _bs; LadderSettings.BadgeStyle _current_badge_style; int _n_active_price_change_ops = 0; @@ -75,6 +76,24 @@ namespace mbts.spark { Brush get_foreground(LadderSettings s) => s.orders_column.foreground.rgb_brush(); // add_order(o); + + var price_filter = new filters.DoubleMinMaxState(); + price_filter.minimum.value = real_price; + price_filter.maximum.value = real_price; + + var obvm = new OrderBookVM(null, parent.bus, null, parent.model.order_gateway, null); + var state = new bts.shell.OrderBookWindowFactory.OrderBookStartupData( + new bts.shell.OrderBookWindowFactory.FilterStates { + security_criteria = new SecurityCriteria(_parent.security), + price = price_filter, + statuses = new[] { OrderStatus.Working } + }, + bts.shell.OrderBookWindowFactory.OrderBookStartupData.default_mini_grid, + use_defaults: false + ); + obvm.load_from(state); + _orderbook_vm = backing(nameof(orderbook_vm), obvm); + _dispose = Disposable.Create( _bs.Subscribe(badge => { _current_badge_style = badge; @@ -190,6 +209,7 @@ namespace mbts.spark { public bool has_multiple_orders_at_same_level { get => _has_multiple_orders_at_same_level.Value; private set => _has_multiple_orders_at_same_level.Value = value; } public bool is_hedge_order { get => _is_hedge_order.Value; private set => _is_hedge_order.Value = value; } public Brush parent_algo_type_brush { get => _parent_algo_type_brush.Value; private set => _parent_algo_type_brush.Value = value; } + public OrderBookVM orderbook_vm { get => _orderbook_vm.Value; private set => _orderbook_vm.Value = value; } // the setter is public so that the LadderVM can set this field public CustomOrderDefinition.CustomOneofCase parent_algo_type { get => _parent_algo_type.Value; set => _parent_algo_type.Value = value; } diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index 46b776e68..d25322f56 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -116,12 +116,18 @@ namespace mbts.spark { b.MouseUp += (s, e) => { var curr_order = b.DataContext as LadderOrderVM; if (e.ChangedButton == MouseButton.Middle) { - b.ContextMenu.DataContext = b.DataContext; - b.ContextMenu.IsOpen = true; + // create the new popup window in here + + b.ContextMenu.DataContext = order.orderbook_vm; + var view = new MiniOrderBookView(order.orderbook_vm); + var w = new Window(); + w.Content = view; + w.Show(); // close context menu after command executed if (curr_order != null) { Action command_executed = null; - command_executed = () => { + command_executed = () => + { try { b.ContextMenu.IsOpen = false; curr_order.command_executed -= command_executed; diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 65b738d80..08b0c089d 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -542,17 +542,12 @@ - - - - - - - - - - - + + + + + + From 70fcb30c672bac7aea468c8e47edfce086bf8d73 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 22 Jan 2019 12:23:00 -0600 Subject: [PATCH 025/218] DIYGrid - adding dep prop to allow rows horizontal scrollbar to be strictly collapsed --- .../OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 1 + src/client/spark/view/Controls/DIYGrid/DIYGrid.cs | 9 +++++++++ .../spark/view/Controls/DIYGrid/DIYGridResources.xaml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index c0490da15..1ea742a44 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -76,6 +76,7 @@ RowStyle="{StaticResource {x:Static sp:OrderBookView.RowStyleKey}}" RowTemplate="{StaticResource {x:Static sp:OrderBookView.RowTemplateKey}}" SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}" + RowsHorizontalScrollBarVisibility="Collapsed" > diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs index 50bd4cb93..93c209fd4 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs +++ b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs @@ -139,6 +139,7 @@ namespace mbts.ui.controls { public static readonly Thickness DefaultCellPadding = new Thickness(4, 2, 4, 2), AnimatableCellPadding = new Thickness(8, 2, 4, 2); + public static readonly Visibility DefaultRowsHorizontalScrollBarVisibility = Visibility.Visible; #region RoutedCommands public static readonly RoutedCommand SortCommand = new RoutedCommand(), DefaultRowCommand = new RoutedCommand(); @@ -695,6 +696,14 @@ namespace mbts.ui.controls { public static readonly DependencyProperty SelectionModeProperty = ListBox.SelectionModeProperty.AddOwner(typeof(DIYGrid)); + public Visibility RowsHorizontalScrollBarVisibility { + get { return (Visibility)GetValue(RowsHorizontalScrollBarVisibilityProperty); } + set { SetValue(RowsHorizontalScrollBarVisibilityProperty, value); } + } + + public static readonly DependencyProperty RowsHorizontalScrollBarVisibilityProperty = DependencyProperty.Register( + nameof(RowsHorizontalScrollBarVisibility), typeof(Visibility), typeof(DIYGrid), new PropertyMetadata(DefaultRowsHorizontalScrollBarVisibility)); + #endregion // Internal Methods diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml b/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml index 4cd01bcb9..c52a305d3 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml +++ b/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml @@ -335,7 +335,7 @@ - + From 9eb760b3c7dc3dbe2bac8f0427737d371e62d3f5 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 22 Jan 2019 12:27:57 -0600 Subject: [PATCH 026/218] Adding a Popup dep prop to the Badge. Note - I don't think Ineed AffectsRender here --- src/client/spark/view/Controls/Badge.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 6e5ec4f96..239403381 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -9,6 +9,7 @@ using System.Globalization; using System.Linq; using System.Windows; using System.Windows.Controls; +using System.Windows.Controls.Primitives; using System.Windows.Data; using System.Windows.Media; using FontFamily = System.Windows.Media.FontFamily; @@ -38,6 +39,7 @@ namespace mbts.ui.controls { CustomOrderDefinition.CustomOneofCase _parent_algo_type; (Point p1, Point p2, Point p3) _current_triangle_vertices; StreamGeometry _triangle_geometry; + Popup _popup; static Badge() { @@ -181,6 +183,7 @@ namespace mbts.ui.controls { _has_multiple_orders_at_level = HasMultipleOrdersAtLevel; _is_hedge_order = IsHedgeOrder; _gcr.glyph_context = GlyphContext.create(FontFamily, FontWeight); + _popup = Popup; } public static readonly DependencyProperty TextLinesProperty = @@ -264,6 +267,19 @@ namespace mbts.ui.controls { (b, v) => b._is_hedge_order = v, false); + public Popup Popup { + get { return (Popup)GetValue(PopupProperty); } + set { SetValue(PopupProperty, value); } + } + + public static readonly DependencyProperty PopupProperty = + WPFHelper.create_dp( + nameof(Popup), + FrameworkPropertyMetadataOptions.AffectsRender, + (b, v) => b._popup = v, + null); + + protected override Size ArrangeOverride(Size finalSize) => finalSize; protected override Size MeasureOverride(Size availableSize) { From ffaba90c96274fad4e0854196924c19dc7c126e8 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 22 Jan 2019 12:35:18 -0600 Subject: [PATCH 027/218] Remove ContextMenu from Badge and setup new Popup --- .../view/Spark/Ladder/LadderOrdersHost.cs | 54 ++++++++++++------- .../spark/view/Spark/Ladder/LadderView.xaml | 11 ---- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index d25322f56..d14cd4e1a 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -91,15 +91,26 @@ namespace mbts.spark { order.PropertyChanged += _order_PropertyChanged; // get the stackpanel it belongs in Panel panel = get_panel(price); + //var coords = GetAbsolutePlacement(panel, true); // insert Badge and wire up DataContext if (panel != null) { - panel.Children.Add(mkbadge(order)); + panel.Children.Add(mkbadge(order, panel)); } } //else { //Log.Ui.warn($"Failed to add order ({order.id}): order already in {nameof(LadderGridHost)}'s {nameof(_orders)}."); //} } + public static Rect GetAbsolutePlacement(FrameworkElement element, bool relativeToScreen = false) { + var absolutePos = element.PointToScreen(new System.Windows.Point(0, 0)); + if (relativeToScreen) { + return new Rect(absolutePos.X, absolutePos.Y, element.ActualWidth, element.ActualHeight); + } + var posMW = Application.Current.MainWindow.PointToScreen(new System.Windows.Point(0, 0)); + absolutePos = new System.Windows.Point(absolutePos.X - posMW.X, absolutePos.Y - posMW.Y); + return new Rect(absolutePos.X, absolutePos.Y, element.ActualWidth, element.ActualHeight); + } + void _order_PropertyChanged(object sender, PropertyChangedEventArgs e) { if (e.PropertyName == nameof(LadderOrderVM.price)) { var order = (LadderOrderVM)sender; @@ -108,7 +119,7 @@ namespace mbts.spark { } } - Badge mkbadge(LadderOrderVM order) { + Badge mkbadge(LadderOrderVM order, UIElement popup_placement_target) { Badge b = new Badge(); b.DataContext = order; // Hook up the style from xaml @@ -118,31 +129,34 @@ namespace mbts.spark { if (e.ChangedButton == MouseButton.Middle) { // create the new popup window in here - b.ContextMenu.DataContext = order.orderbook_vm; var view = new MiniOrderBookView(order.orderbook_vm); - var w = new Window(); - w.Content = view; - w.Show(); + var popup = new System.Windows.Controls.Primitives.Popup(); + popup.Child = view; + popup.StaysOpen = false; + popup.PlacementTarget = popup_placement_target; + popup.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom; + popup.VerticalOffset = 5; + popup.IsOpen = true; + b.Popup = popup; + // close context menu after command executed - if (curr_order != null) { - Action command_executed = null; - command_executed = () => - { - try { - b.ContextMenu.IsOpen = false; - curr_order.command_executed -= command_executed; - } catch (Exception ex) { - Log.Ui.warn($"Error in {typeof(LadderGridHost)}'s {typeof(Badge)} {nameof(LadderOrderVM.command_executed)} local handler: {ex}"); - } - }; - curr_order.command_executed += command_executed; - } + //if (curr_order != null) { + // Action command_executed = null; + // command_executed = () => + // { + // try { + // curr_order.command_executed -= command_executed; + // } catch (Exception ex) { + // Log.Ui.warn($"Error in {typeof(LadderGridHost)}'s {typeof(Badge)} {nameof(LadderOrderVM.command_executed)} local handler: {ex}"); + // } + // }; + // curr_order.command_executed += command_executed; + //} } else if (e.ChangedButton == MouseButton.Left) { if (curr_order?.cancel_command?.CanExecute(null) == true) curr_order.cancel_command.Execute(null); } }; - b.ContextMenuOpening += (s, e) => e.Handled = true; return b; } diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 08b0c089d..92055b480 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -540,17 +540,6 @@ - - - - - - - - - - - From 1183dee418cc1517faf0b60c1bc2af57a5e521e1 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 22 Jan 2019 12:37:53 -0600 Subject: [PATCH 028/218] Create a new OrderbookVM each time; fixes crash when launching mini-ob from same badge multiple times --- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 47c78289d..748611472 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -38,7 +38,6 @@ namespace mbts.spark { readonly Property _is_exchange_order, _has_multiple_orders_at_same_level, _is_hedge_order; readonly Property _parent_algo_type; readonly Property _summary, _description; - readonly Property _orderbook_vm; IObservable _bs; LadderSettings.BadgeStyle _current_badge_style; int _n_active_price_change_ops = 0; @@ -77,23 +76,6 @@ namespace mbts.spark { // add_order(o); - var price_filter = new filters.DoubleMinMaxState(); - price_filter.minimum.value = real_price; - price_filter.maximum.value = real_price; - - var obvm = new OrderBookVM(null, parent.bus, null, parent.model.order_gateway, null); - var state = new bts.shell.OrderBookWindowFactory.OrderBookStartupData( - new bts.shell.OrderBookWindowFactory.FilterStates { - security_criteria = new SecurityCriteria(_parent.security), - price = price_filter, - statuses = new[] { OrderStatus.Working } - }, - bts.shell.OrderBookWindowFactory.OrderBookStartupData.default_mini_grid, - use_defaults: false - ); - obvm.load_from(state); - _orderbook_vm = backing(nameof(orderbook_vm), obvm); - _dispose = Disposable.Create( _bs.Subscribe(badge => { _current_badge_style = badge; @@ -209,7 +191,32 @@ namespace mbts.spark { public bool has_multiple_orders_at_same_level { get => _has_multiple_orders_at_same_level.Value; private set => _has_multiple_orders_at_same_level.Value = value; } public bool is_hedge_order { get => _is_hedge_order.Value; private set => _is_hedge_order.Value = value; } public Brush parent_algo_type_brush { get => _parent_algo_type_brush.Value; private set => _parent_algo_type_brush.Value = value; } - public OrderBookVM orderbook_vm { get => _orderbook_vm.Value; private set => _orderbook_vm.Value = value; } + public OrderBookVM orderbook_vm { + // We are returning a new OrderBookVM each time b/c after + // successive launches of the mini-ob from the same badge, we get an exception + // System.InvalidOperationException: Sharing GridViewColumn among multiple GridViewColumnCollections or adding the same GridViewColumn into one GridViewColumnCollection more than once is not allowed. + // I checked with Eric and he guesses that what is happening is that the Popup is throwing away the grid, but the binding doesn't remove the columns from that grid + // + // I think returning a new OrderbookVM is okay at the moment since this Popup window will not be saving any state at this time + get { + var price_filter = new filters.DoubleMinMaxState(); + price_filter.minimum.value = real_price; + price_filter.maximum.value = real_price; + + var obvm = new OrderBookVM(null, _parent.bus, null, _parent.model.order_gateway, null); + var state = new bts.shell.OrderBookWindowFactory.OrderBookStartupData( + new bts.shell.OrderBookWindowFactory.FilterStates { + security_criteria = new SecurityCriteria(_parent.security), + price = price_filter, + statuses = new[] { OrderStatus.Working } + }, + bts.shell.OrderBookWindowFactory.OrderBookStartupData.default_mini_grid, + use_defaults: false + ); + obvm.load_from(state); + return obvm; + } + } // the setter is public so that the LadderVM can set this field public CustomOrderDefinition.CustomOneofCase parent_algo_type { get => _parent_algo_type.Value; set => _parent_algo_type.Value = value; } From f6df644ab1db407ec7e8dcfde087daf22d124196 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 23 Jan 2019 09:43:03 -0600 Subject: [PATCH 029/218] MiniOB will have parent-child rows expanded by default --- src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 3 ++- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 4 ++-- src/client/spark/view/Spark/Ladder/LadderOrderVM.cs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 5a5213efd..eb20fbb3c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -18,10 +18,11 @@ namespace mbts.spark { int _depth_level; SecurityMD? _security_md => order_tuple.security_md; - public OrderBookRowVM(OrderBookVM owner, OrderRecordTuple order_tuple) { + public OrderBookRowVM(OrderBookVM owner, OrderRecordTuple order_tuple, bool is_expanded) { _owner = owner; this.order_tuple = order_tuple; is_visible = !is_child; + _is_expanded = is_expanded; } public event Action invalidated; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 1a85e767e..f938c0e2e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -34,12 +34,12 @@ namespace mbts.spark { readonly List _resources; OrderBookStartupData _state; - public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager) { + public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager, bool _rows_are_initially_expanded = false) { _bus = bus; _model = model; _settings_manager = settings_manager; _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(u => (u.added.Values.Select(smd => smd.security), u.removed.Values.Select(smd => smd.security)))); - _row_collection = new OrderBookRowCollection(ort => new OrderBookRowVM(this, ort), _columns.get_sorting_data().comparer) { filter = _columns.get_filter() }; + _row_collection = new OrderBookRowCollection(ort => new OrderBookRowVM(this, ort, _rows_are_initially_expanded), _columns.get_sorting_data().comparer) { filter = _columns.get_filter() }; _current_row = backing(nameof(current_row)); _columns.filter_changed += on_filter_changed; collapse_all_rows_command = new DelegateCommand(_row_collection.collapse_all); diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 748611472..5ee091bc9 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -203,7 +203,7 @@ namespace mbts.spark { price_filter.minimum.value = real_price; price_filter.maximum.value = real_price; - var obvm = new OrderBookVM(null, _parent.bus, null, _parent.model.order_gateway, null); + var obvm = new OrderBookVM(null, _parent.bus, null, _parent.model.order_gateway, null, true); var state = new bts.shell.OrderBookWindowFactory.OrderBookStartupData( new bts.shell.OrderBookWindowFactory.FilterStates { security_criteria = new SecurityCriteria(_parent.security), From 8619084fa7fc2b88c28ca5cf016b6973ff087a48 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 23 Jan 2019 09:43:19 -0600 Subject: [PATCH 030/218] adding a border around the popup window --- .../Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 1ea742a44..e27336ee8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -62,6 +62,7 @@ + @@ -155,5 +156,6 @@ + \ No newline at end of file From 3cf026ff478ca50a1746c94a888c15656df4d304 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 23 Jan 2019 10:07:07 -0600 Subject: [PATCH 031/218] Properly Dispose of the OrderBookVM when the popup closes --- src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index d14cd4e1a..018509e19 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -128,17 +128,22 @@ namespace mbts.spark { var curr_order = b.DataContext as LadderOrderVM; if (e.ChangedButton == MouseButton.Middle) { // create the new popup window in here - - var view = new MiniOrderBookView(order.orderbook_vm); + var obvm = order.orderbook_vm; + var view = new MiniOrderBookView(obvm); var popup = new System.Windows.Controls.Primitives.Popup(); + // we only keep the obvm around assigned to the DataContext so that we can + // properly Dispose of it later when the popup is closed. + popup.DataContext = obvm; popup.Child = view; popup.StaysOpen = false; popup.PlacementTarget = popup_placement_target; popup.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom; popup.VerticalOffset = 5; popup.IsOpen = true; + popup.Closed += (sender, event_args) => (popup.DataContext as IDisposable)?.Dispose(); b.Popup = popup; + // close context menu after command executed //if (curr_order != null) { // Action command_executed = null; From b66fb02174615cd114fbcf365b5d230ced09631a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 24 Jan 2019 13:41:33 -0600 Subject: [PATCH 032/218] adding single-click delete/cancel functionality --- .../Trading/OrderBook/OrderBookColumns.cs | 51 ++++++++++++++++++- .../Trading/OrderBook/OrderBookRowVM.cs | 5 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 14 +++-- .../Trading/OrderBook/OrderBookView.xaml.cs | 2 +- .../Trading/OrderBook/OrderBookWindow.cs | 2 +- .../Controls/DIYGrid/Columns/ColumnBase.cs | 3 +- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 1 + 7 files changed, 69 insertions(+), 9 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index acb550f67..1ba081d1b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -63,7 +63,6 @@ namespace mbts.spark { readonly List _active_comparers = new List(); public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable added, IEnumerable removed)> order_securities) { - // security Add(security_column = new SecurityColumn( DiscreteValuesFilterVM.Create( order_securities, @@ -291,6 +290,7 @@ namespace mbts.spark { public event Action filter_changed; + public CancelColumn cancel_column { get; } public SecurityColumn security_column { get; } public SimpleTextColumn symbol_column { get; } public SimpleTextColumn time_created_column { get; } @@ -651,6 +651,55 @@ namespace mbts.spark { base.OnSortDirectionChanged(new_value); } } + + public class CancelColumn : FrameworkElementColumnBase { + readonly BindingBase _command_binding; + + public CancelColumn(Columns key, string command_property) : base(key) { + id = key.ToString(); + Header = DefaultColumnHeaders.Delete; + _command_binding = new Binding(command_property); + } + + public override FrameworkElement view_factory() { + var grid = new Grid() { + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + }; + var l1 = new System.Windows.Shapes.Line() { + StrokeThickness = 1, + Stroke = Brushes.White, + X1 = 0.5, + Y1 = 0.5, + X2 = 7, + Y2 = 7 + }; + var l2 = new System.Windows.Shapes.Line() { + StrokeThickness = 1, + Stroke = Brushes.White, + X1 = 0.5, + Y1 = 7, + X2 = 7, + Y2 = 0.5 + }; + grid.Children.Add(l1); + grid.Children.Add(l2); + + var button = new Button() { + Content = grid, + Background = Brushes.Red, + Foreground = Brushes.White, + Margin = new Thickness(2), + VerticalAlignment = VerticalAlignment.Center, + Height = 14, + Width = 14 + }; + + button.SetBinding(Button.CommandProperty, _command_binding); + return button; + } + } + #endregion static class RenderUtils { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index eb20fbb3c..ab0b19c37 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -13,7 +13,7 @@ namespace mbts.spark { const string _unknown_security_price_format_string = "0.#########"; const int _unknown_security_price_num_fractional_digits = 9; readonly OrderBookVM _owner; - IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd; + IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd; bool _is_parent, _is_expanded; int _depth_level; SecurityMD? _security_md => order_tuple.security_md; @@ -80,6 +80,9 @@ namespace mbts.spark { ICommand DIYGrid.IActionableRowVM.default_command => _show_order_modify_cmd ?? (_show_order_modify_cmd = new DelegateCommand(() => _owner.show_order_modify(this), () => status == OrderStatus.Working)); + public ICommand cancel_command => _cancel_cmd ?? + (_cancel_cmd = new DelegateCommand(() => _owner.cancel_order(this), () => status == OrderStatus.Working)); + // These fns present a way for the orderbook to avoid noisy, intermittent collection changes during "Expand/Collapse All" ops, // when incremental changes are ignored in favor of a full reset, after 'is_expanded' is updated for all rows. internal void expand_internal() => Set(ref _is_expanded, true); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index f938c0e2e..5c62ac6ed 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -34,17 +34,19 @@ namespace mbts.spark { readonly List _resources; OrderBookStartupData _state; - public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager, bool _rows_are_initially_expanded = false) { + public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager, bool rows_are_initially_expanded = false) { _bus = bus; _model = model; _settings_manager = settings_manager; _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(u => (u.added.Values.Select(smd => smd.security), u.removed.Values.Select(smd => smd.security)))); - _row_collection = new OrderBookRowCollection(ort => new OrderBookRowVM(this, ort, _rows_are_initially_expanded), _columns.get_sorting_data().comparer) { filter = _columns.get_filter() }; + // we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front + columns = new ObservableAppendCollection(_columns); + _row_collection = new OrderBookRowCollection(ort => new OrderBookRowVM(this, ort, rows_are_initially_expanded), _columns.get_sorting_data().comparer) { filter = _columns.get_filter() }; _current_row = backing(nameof(current_row)); _columns.filter_changed += on_filter_changed; collapse_all_rows_command = new DelegateCommand(_row_collection.collapse_all); expand_all_rows_command = new DelegateCommand(_row_collection.expand_all); - grid_settings_manager = _create_grid_settings_manager(owner_title, bus, notification_service, model, rows, columns); + grid_settings_manager = _create_grid_settings_manager(owner_title, bus, notification_service, model, rows, core_columns); _resources = new List { model.on_order_tuples_table.OnDispatcher().Subscribe(_row_collection.update), grid_settings_manager, @@ -63,7 +65,8 @@ namespace mbts.spark { public event Action selected_order_changed; public event Action OnDisposed; - public ObservableCollection columns => _columns; + public ObservableAppendCollection columns { get; set; } + public ObservableCollection core_columns => _columns; public ObservableCollection rows => _row_collection; public OrderBookRowVM current_row { get => _current_row.Value; set => _current_row.Value = value ?? _selected_rows.FirstOrDefault(); } public OrderRecordImmutable? current_order => current_row?.order; @@ -133,6 +136,9 @@ namespace mbts.spark { internal void show_order_modify(OrderBookRowVM row) => _bus.post(SparkTags.ShowModifyOrderTag, row.order_key); + internal void cancel_order(OrderBookRowVM row) => + _bus.post(SparkTags.CancelOrders, new List { row.order_key }); + internal void on_expanded_changed(OrderBookRowVM row) { using (_row_collection.defer_refresh(true)) { if (row.is_expanded) { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs index a497b3cbe..7f30240d6 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs @@ -5,7 +5,7 @@ namespace mbts.spark { internal partial class OrderBookView : UserControl { // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. - public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey } + public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel } public const string SubTypeFilterTemplateKey = "SubTypeFilterTemplate", ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index 1bbf0173e..3c4c08060 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -131,7 +131,7 @@ namespace mbts.spark { return _vm.grid_settings_manager.create_vm( // we need to get the most up to date GridSettings when launching b/c users may // have changed some settings on the grid directly, like column widths. - s.general.with(_vm.columns.Select(c => c.create())), + s.general.with(_vm.core_columns.Select(c => c.create())), this.observe_title() ); } diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 3edb17e7d..019581851 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -97,7 +97,8 @@ namespace mbts.ui.controls { DayPnL = "Day PnL", TotalNetPos = "Total Net Pos", TotalPnL = "Total PnL", - PnLPrice = "PnL Price"; + PnLPrice = "PnL Price", + Delete = "Delete"; } public interface IKeyedColumn { diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 5ee091bc9..0edefcfa4 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -214,6 +214,7 @@ namespace mbts.spark { use_defaults: false ); obvm.load_from(state); + obvm.columns.Insert(0, new OrderBookVM.CancelColumn(OrderBookView.Columns.Cancel, nameof(OrderBookRowVM.cancel_command))); return obvm; } } From c0c34efc476459bb4efdb58d827a2178cf5228c7 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 24 Jan 2019 13:45:59 -0600 Subject: [PATCH 033/218] adding comment back in --- src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 1ba081d1b..c4a4b82ed 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -63,6 +63,7 @@ namespace mbts.spark { readonly List _active_comparers = new List(); public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable added, IEnumerable removed)> order_securities) { + // security Add(security_column = new SecurityColumn( DiscreteValuesFilterVM.Create( order_securities, From aadfe2a6779bd761f8f731a1e2e2246a6acb78e0 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 30 Jan 2019 08:05:17 -0600 Subject: [PATCH 034/218] mini ob - inline qty tick up/down; formatting --- .../MiniOrderBook/MiniOrderBookView.xaml | 17 ++--- .../MiniOrderBook/MiniOrderBookView.xaml.cs | 6 +- .../Trading/OrderBook/OrderBookColumns.cs | 31 +++++++-- .../Trading/OrderBook/OrderBookRowVM.cs | 30 +++++++- .../Modules/Trading/OrderBook/OrderBookVM.cs | 18 +++++ .../Trading/OrderBook/OrderBookView.xaml.cs | 6 +- src/client/spark/Spark.csproj | 4 ++ .../DIYGrid/Settings/GridColumnSettings.cs | 4 ++ .../TickUpDownNullableUIntCommit.xaml | 56 +++++++++++++++ .../TickUpDownNullableUIntCommit.xaml.cs | 69 +++++++++++++++++++ .../spark/view/Spark/Ladder/LadderOrderVM.cs | 14 +++- 11 files changed, 232 insertions(+), 23 deletions(-) create mode 100644 src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml create mode 100644 src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index e27336ee8..ce2270938 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -21,7 +21,7 @@ - + - - - + + @@ -74,10 +74,11 @@ Columns="{Binding columns}" CurrentRow="{Binding current_row, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Rows="{Binding rows}" - RowStyle="{StaticResource {x:Static sp:OrderBookView.RowStyleKey}}" - RowTemplate="{StaticResource {x:Static sp:OrderBookView.RowTemplateKey}}" + RowStyle="{StaticResource {x:Static sp:MiniOrderBookView.RowStyleKey}}" + RowTemplate="{StaticResource {x:Static sp:MiniOrderBookView.RowTemplateKey}}" SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}" RowsHorizontalScrollBarVisibility="Collapsed" + RowHeight="20" > @@ -144,8 +145,8 @@ - - + { - public MiniOrderBookRowView() : base(OrderBookView.RowHeight) { } + public MiniOrderBookRowView() : base() { } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index c4a4b82ed..60ce5ebb8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -194,6 +194,10 @@ namespace mbts.spark { // quantity Add(qty_column = new SizeColumn( new UIntMinMax(ort => ort.order.quantity(), nameof(OrderBookRowVM.quantity)))); + // edit quantity column + // not usually part of the main order book, but it's useful to add it + // rather than debugging the popup window + //Add(edit_qty_column = new EditableQtyColumn(Columns.EditableQty)); // filled quantity Add(filled_qty_column = new FilledColumn( new UIntMinMax(ort => ort.order.filled(), nameof(OrderBookRowVM.filled_quantity)))); @@ -304,6 +308,7 @@ namespace mbts.spark { public SimpleTextColumn sub_type_column { get; } public SideColumn side_column { get; } public SizeColumn qty_column { get; } + public EditableQtyColumn edit_qty_column { get; } public SimpleTextColumn price_column { get; } public FilledColumn filled_qty_column { get; } public SimpleTextColumn last_price_column { get; } @@ -510,7 +515,7 @@ namespace mbts.spark { : base(key, header, get_text, sort_prop, width, filter, filter_template, comparer) { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, _get_glyph_context(row), font_size, _get_text(row), position, RowHeight, + CellRender.draw_text(dc, _get_glyph_context(row), font_size, _get_text(row), position, row_height, font_brush, null, horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); } @@ -520,7 +525,7 @@ namespace mbts.spark { : base(Columns.Side, "B/S", r => r.side.ToString(), nameof(OrderBookRowVM.side), DefaultColumnWidths.Side, filter, DataGridFilterKnownTemplates.EnumValues, _wrap_comparer(r => r.side)) { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.side.ToString(), position, RowHeight, + CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.side.ToString(), position, row_height, RenderUtils.get_side_brush(row), null, horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); } @@ -531,7 +536,7 @@ namespace mbts.spark { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.quantity.ToString(), position, RowHeight, + CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.quantity.ToString(), position, row_height, RenderUtils.get_side_brush(row), null, horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); } @@ -542,7 +547,7 @@ namespace mbts.spark { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.filled_quantity.ToString(), position, RowHeight, + CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.filled_quantity.ToString(), position, row_height, RenderUtils.get_side_brush(row), null, horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); } @@ -641,6 +646,8 @@ namespace mbts.spark { grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) }); grid.Children.Add(toggle_button); grid.Children.Add(security_view); + grid.HorizontalAlignment = HorizontalAlignment.Center; + grid.VerticalAlignment = VerticalAlignment.Center; // var border = new Border { Child = grid }; CellRender.set_background_animation_bindings(border, nameof(OrderBookRowVM.security)); @@ -701,6 +708,22 @@ namespace mbts.spark { } } + public class EditableQtyColumn:FrameworkElementColumnBase { + + public EditableQtyColumn(Columns key) : base(key) { + id = key.ToString(); + Header = "Qty"; + Width = 64; + } + + public override FrameworkElement view_factory() { + var tick_up_down = new TickUpDownNullableUIntCommit(); + tick_up_down.SetBinding(TickUpDownNullableUIntCommit.SourceValueProperty, nameof(OrderBookRowVM.quantity)); + tick_up_down.SetBinding(TickUpDownNullableUIntCommit.OnCommitProperty, nameof(OrderBookRowVM.modify_order_quantity)); + return tick_up_down; + } + } + #endregion static class RenderUtils { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index ab0b19c37..222a4000d 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -6,6 +6,9 @@ using mbts.ui; using mbts.ui.controls; using mbts.ui.shell; using System; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; using System.Windows.Input; namespace mbts.spark { @@ -13,8 +16,8 @@ namespace mbts.spark { const string _unknown_security_price_format_string = "0.#########"; const int _unknown_security_price_num_fractional_digits = 9; readonly OrderBookVM _owner; - IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd; - bool _is_parent, _is_expanded; + IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _modify_order_quantity; + bool _is_parent, _is_expanded, _is_selected; int _depth_level; SecurityMD? _security_md => order_tuple.security_md; @@ -23,6 +26,16 @@ namespace mbts.spark { this.order_tuple = order_tuple; is_visible = !is_child; _is_expanded = is_expanded; + this.invalidated += OrderBookRowVM_invalidated; + } + + private void OrderBookRowVM_invalidated() { + modify_order_quantity?.TryRaiseCanExecuteChanged(); + } + + protected override void Dispose(bool disposing) { + this.invalidated -= OrderBookRowVM_invalidated; + base.Dispose(disposing); } public event Action invalidated; @@ -73,6 +86,10 @@ namespace mbts.spark { } } public int depth_level { get => _depth_level; set => Set(ref _depth_level, value); } + public bool is_selected { + get => _is_selected; + set => Set(ref _is_selected, value); + } // Commands public ICommand toggle_command => _toggle_expanded_cmd ?? ( _toggle_expanded_cmd = new DelegateCommand(() => is_expanded = !is_expanded)); @@ -83,6 +100,15 @@ namespace mbts.spark { public ICommand cancel_command => _cancel_cmd ?? (_cancel_cmd = new DelegateCommand(() => _owner.cancel_order(this), () => status == OrderStatus.Working)); + public ICommand modify_order_quantity => _modify_order_quantity ?? + (_modify_order_quantity = new DelegateCommand( + (desired_quantity) => _owner.modify_order_quantity(this, (uint)desired_quantity), + (desired_quantity) => desired_quantity != null && + this.status == OrderStatus.Working && + (uint)desired_quantity != this.quantity + ) + ); + // These fns present a way for the orderbook to avoid noisy, intermittent collection changes during "Expand/Collapse All" ops, // when incremental changes are ignored in favor of a full reset, after 'is_expanded' is updated for all rows. internal void expand_internal() => Set(ref _is_expanded, true); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 5c62ac6ed..bd5a269a7 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -16,6 +16,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using System.Reactive.Linq; +using System.Threading.Tasks; using System.Windows.Controls; using System.Windows.Input; using static bts.shell.OrderBookWindowFactory; @@ -76,6 +77,17 @@ namespace mbts.spark { public ICommand expand_all_rows_command { get; } public void row_selection_changed(SelectionChangedEventArgs e) { + if (e.RemovedItems != null) { + foreach (var row_vm in e.RemovedItems.Cast()) { + row_vm.is_selected = false; + } + } + if (e.AddedItems != null) { + foreach (var row_vm in e.AddedItems.Cast()) { + row_vm.is_selected = true; + } + } + RowSelectionHelper.apply_changes(_selected_rows, e); selected_order_changed?.Invoke(current_order); } @@ -139,6 +151,12 @@ namespace mbts.spark { internal void cancel_order(OrderBookRowVM row) => _bus.post(SparkTags.CancelOrders, new List { row.order_key }); + internal void modify_order_quantity(OrderBookRowVM row, uint size) => + _bus.post(SparkTags.UpdateOrder, (row.order_key, row.price, size)); + + internal void modify_order_price(OrderBookRowVM row, double price) => + _bus.post(SparkTags.UpdateOrder, (row.order_key, price, row.quantity)); + internal void on_expanded_changed(OrderBookRowVM row) { using (_row_collection.defer_refresh(true)) { if (row.is_expanded) { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs index 7f30240d6..c6b583e99 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs @@ -5,7 +5,7 @@ namespace mbts.spark { internal partial class OrderBookView : UserControl { // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. - public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel } + public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel, EditableQty } public const string SubTypeFilterTemplateKey = "SubTypeFilterTemplate", ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", @@ -14,8 +14,6 @@ namespace mbts.spark { CVRowStyleKey = "CVRowStyle", CVRowTemplateKey = "CVRowTemplateKey"; - public const double RowHeight = 17; - public OrderBookView(OrderBookVM vm) { InitializeComponent(); DataContext = vm; @@ -23,6 +21,6 @@ namespace mbts.spark { } class OrderBookRowView : DIYGrid.HighPerformanceRow { - public OrderBookRowView() : base(OrderBookView.RowHeight) { } + public OrderBookRowView() : base() { } } } \ No newline at end of file diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index 300144396..043d64a86 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -54,6 +54,7 @@ + @@ -71,6 +72,9 @@ + + Code + Code diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridColumnSettings.cs b/src/client/spark/view/Controls/DIYGrid/Settings/GridColumnSettings.cs index 539389e71..cce3f9388 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridColumnSettings.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridColumnSettings.cs @@ -135,6 +135,10 @@ namespace mbts.ui.settings { display_name.GetHashCode() ); + public override string ToString() { + return $"id: {id} display_name: {display_name}"; + } + } diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml new file mode 100644 index 000000000..700e9967f --- /dev/null +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs new file mode 100644 index 000000000..9804a1a5d --- /dev/null +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs @@ -0,0 +1,69 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace mbts.ui.controls { + /// + /// Interaction logic for TickUpDownNullableUIntCommit.xaml + /// + public partial class TickUpDownNullableUIntCommit : UserControl { + + + public static readonly DependencyProperty SourceValueProperty = + DependencyProperty.Register("SourceValue", + typeof(uint?), + typeof(TickUpDownNullableUIntCommit), + new PropertyMetadata { + PropertyChangedCallback = source_value_changed + } + ); + + private static void source_value_changed(DependencyObject d, DependencyPropertyChangedEventArgs e) { + if (d is TickUpDownNullableUIntCommit _instance_of_me) { + Application.Current.Dispatcher.BeginInvoke( + (Action)(() => _instance_of_me.OnCommit?.TryRaiseCanExecuteChanged()) + ); + } + } + + public uint? SourceValue { + get => GetValue(SourceValueProperty) as uint?; + set => SetValue(SourceValueProperty, value); + } + + public static readonly DependencyProperty OnCommitProperty = + DependencyProperty.Register("OnCommit", typeof(ICommand), typeof(TickUpDownNullableUIntCommit)); + public ICommand OnCommit { + get => (ICommand)GetValue(OnCommitProperty); + set => SetValue(OnCommitProperty, value); + } + + public TickUpDownNullableUIntCommit() { + InitializeComponent(); + + var content_control = read_only_or_edit.Template.LoadContent() as FrameworkElement; + var qty = content_control.FindName("qty_ticker") as TickUpDownNullableUInt; + + } + + //private void Commit_button_Click(object sender, RoutedEventArgs e) { + // if (OnCommit.CanExecute(null)) { + // OnCommit.Execute(null); + // var content_control = read_only_or_edit.Template.LoadContent() as FrameworkElement; + // var qty = content_control.FindName("qty_ticker") as TickUpDownNullableUInt; + // var proposed_qty = qty.Value; + // } + //} + } +} diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 0edefcfa4..e3866d7df 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -213,8 +213,20 @@ namespace mbts.spark { bts.shell.OrderBookWindowFactory.OrderBookStartupData.default_mini_grid, use_defaults: false ); - obvm.load_from(state); obvm.columns.Insert(0, new OrderBookVM.CancelColumn(OrderBookView.Columns.Cancel, nameof(OrderBookRowVM.cancel_command))); + var qty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Size.ToString()).FirstOrDefault(); + var qty_index = obvm.columns.indexOf(qty_col); + if (qty_index > -1) { + // make sure there isn't an EditableQty column in here already; maybe the DefaultGrid will change + // in the main ob + var existing_editqty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditableQty.ToString()).FirstOrDefault(); + var existing_editqty_index = obvm.columns.indexOf(existing_editqty_col); + if (existing_editqty_index == -1) { + obvm.columns.RemoveAt(qty_index); + obvm.columns.Insert(qty_index, new OrderBookVM.EditableQtyColumn(OrderBookView.Columns.EditableQty)); + } + } + obvm.load_from(state); return obvm; } } From dba3b9371cceef2b2af4545f858433c1e8c5e13b Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 30 Jan 2019 14:27:00 -0600 Subject: [PATCH 035/218] hopefully use the right Dispatcher this time --- .../Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs index 9804a1a5d..6a31c60d6 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs @@ -31,7 +31,7 @@ namespace mbts.ui.controls { private static void source_value_changed(DependencyObject d, DependencyPropertyChangedEventArgs e) { if (d is TickUpDownNullableUIntCommit _instance_of_me) { - Application.Current.Dispatcher.BeginInvoke( + _instance_of_me.Dispatcher.BeginInvoke( (Action)(() => _instance_of_me.OnCommit?.TryRaiseCanExecuteChanged()) ); } From 62d06180ea5a71c2ef0756d53dae00a96b77dd9e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 30 Jan 2019 19:24:50 -0600 Subject: [PATCH 036/218] making row stay in edit mode when a change has not yet been committed but the selection has been moved off the row --- .../MiniOrderBook/MiniOrderBookView.xaml | 2 +- .../Trading/OrderBook/OrderBookColumns.cs | 2 +- .../Trading/OrderBook/OrderBookRowVM.cs | 26 ++++++++++++++--- .../TickUpDownNullableUIntCommit.xaml | 5 +++- .../TickUpDownNullableUIntCommit.xaml.cs | 28 +++++++++++++++---- 5 files changed, 51 insertions(+), 12 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index ce2270938..0f67a7b83 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -62,7 +62,7 @@ - + diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 60ce5ebb8..8f38130ba 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -718,7 +718,7 @@ namespace mbts.spark { public override FrameworkElement view_factory() { var tick_up_down = new TickUpDownNullableUIntCommit(); - tick_up_down.SetBinding(TickUpDownNullableUIntCommit.SourceValueProperty, nameof(OrderBookRowVM.quantity)); + tick_up_down.SetBinding(TickUpDownNullableUIntCommit.SourceValueProperty, nameof(OrderBookRowVM.prospective_quantity)); tick_up_down.SetBinding(TickUpDownNullableUIntCommit.OnCommitProperty, nameof(OrderBookRowVM.modify_order_quantity)); return tick_up_down; } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 222a4000d..6fd0cc6c1 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -20,12 +20,17 @@ namespace mbts.spark { bool _is_parent, _is_expanded, _is_selected; int _depth_level; SecurityMD? _security_md => order_tuple.security_md; - + Property _prospective_quantity; + Property _is_qty_dirty; + + public OrderBookRowVM(OrderBookVM owner, OrderRecordTuple order_tuple, bool is_expanded) { _owner = owner; this.order_tuple = order_tuple; is_visible = !is_child; _is_expanded = is_expanded; + _prospective_quantity = backing(nameof(prospective_quantity), this.quantity); + _is_qty_dirty = backing(nameof(is_qty_dirty), () => this.prospective_quantity != this.quantity, nameof(prospective_quantity), nameof(quantity)); this.invalidated += OrderBookRowVM_invalidated; } @@ -90,6 +95,17 @@ namespace mbts.spark { get => _is_selected; set => Set(ref _is_selected, value); } + public uint prospective_quantity { + get => _prospective_quantity.Value; + set => _prospective_quantity.set(value); + } + + public bool is_qty_dirty { + get => _is_qty_dirty.Value; + set => _is_qty_dirty.set(value); + } + + // Commands public ICommand toggle_command => _toggle_expanded_cmd ?? ( _toggle_expanded_cmd = new DelegateCommand(() => is_expanded = !is_expanded)); @@ -103,9 +119,9 @@ namespace mbts.spark { public ICommand modify_order_quantity => _modify_order_quantity ?? (_modify_order_quantity = new DelegateCommand( (desired_quantity) => _owner.modify_order_quantity(this, (uint)desired_quantity), - (desired_quantity) => desired_quantity != null && - this.status == OrderStatus.Working && - (uint)desired_quantity != this.quantity + (desired_quantity) => + (desired_quantity != null && this.status == OrderStatus.Working && (uint)desired_quantity != this.quantity) + || prospective_quantity != this.quantity ) ); @@ -133,6 +149,8 @@ namespace mbts.spark { // however, the order-type and security cells DO use databindings - if these cells have changed, the PropertyChanged event must be raised regardless of whether or not invalidated is raised if (old_order.order_type() != order.order_type()) RaisePropertyChanged(nameof(order_type), nameof(order_metadata)); + if (old_order.quantity() != order.quantity()) + RaisePropertyChanged(nameof(quantity)); if (!had_security && _security_md.HasValue) { RaisePropertyChanged(nameof(security), nameof(security_text)); // need to raise invalidated to refresh the price cells (the security.ContractSpec determines how they are formatted - Ticks!) diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml index 700e9967f..a1aa32195 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml @@ -3,7 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:mbts.ui.controls" mc:Ignorable="d" xmlns:c="clr-namespace:mbts.ui.controls" d:DesignHeight="100" d:DesignWidth="800" x:Name="_me"> @@ -38,6 +37,7 @@ + @@ -48,6 +48,9 @@ + + + diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs index 6a31c60d6..0a4f8e3fa 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -24,7 +25,8 @@ namespace mbts.ui.controls { DependencyProperty.Register("SourceValue", typeof(uint?), typeof(TickUpDownNullableUIntCommit), - new PropertyMetadata { + new FrameworkPropertyMetadata { + BindsTwoWayByDefault = true, PropertyChangedCallback = source_value_changed } ); @@ -51,10 +53,6 @@ namespace mbts.ui.controls { public TickUpDownNullableUIntCommit() { InitializeComponent(); - - var content_control = read_only_or_edit.Template.LoadContent() as FrameworkElement; - var qty = content_control.FindName("qty_ticker") as TickUpDownNullableUInt; - } //private void Commit_button_Click(object sender, RoutedEventArgs e) { @@ -66,4 +64,24 @@ namespace mbts.ui.controls { // } //} } + + class JakeTemplateConverter : IValueConverter { + public ControlTemplate NormalTemplate { get; set; } + public ControlTemplate EditableTemplate { get; set; } + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + if (value is mbts.spark.OrderBookRowVM vm) { + if (vm.is_qty_dirty || vm.is_selected) { + return EditableTemplate; + } + return NormalTemplate; + } + return NormalTemplate; + + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + throw new NotImplementedException(); + } + } } From fd1ae60e4983917d2c2f9897c0f24e494826040a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 30 Jan 2019 19:30:13 -0600 Subject: [PATCH 037/218] remove checkin cruft --- .../TickUpDownNullableUIntCommit.xaml | 1 - .../TickUpDownNullableUIntCommit.xaml.cs | 28 ------------------- 2 files changed, 29 deletions(-) diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml index a1aa32195..363c85565 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml @@ -37,7 +37,6 @@ - diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs index 0a4f8e3fa..50008743d 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml.cs @@ -55,33 +55,5 @@ namespace mbts.ui.controls { InitializeComponent(); } - //private void Commit_button_Click(object sender, RoutedEventArgs e) { - // if (OnCommit.CanExecute(null)) { - // OnCommit.Execute(null); - // var content_control = read_only_or_edit.Template.LoadContent() as FrameworkElement; - // var qty = content_control.FindName("qty_ticker") as TickUpDownNullableUInt; - // var proposed_qty = qty.Value; - // } - //} - } - - class JakeTemplateConverter : IValueConverter { - public ControlTemplate NormalTemplate { get; set; } - public ControlTemplate EditableTemplate { get; set; } - - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - if (value is mbts.spark.OrderBookRowVM vm) { - if (vm.is_qty_dirty || vm.is_selected) { - return EditableTemplate; - } - return NormalTemplate; - } - return NormalTemplate; - - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { - throw new NotImplementedException(); - } } } From 94eb1e37cbc8ae9760b99f2c6d0bca61b03c15ba Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 29 Jan 2019 09:23:35 -0500 Subject: [PATCH 038/218] Add netcore publish to jenkinsbuild.cmd --- src/client/spark_test/spark_test.csproj | 2 +- src/client/sparkcmd/sparkcmd.csproj | 3 +-- tools/jenkinsbuild.cmd | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/client/spark_test/spark_test.csproj b/src/client/spark_test/spark_test.csproj index 1c755b687..8a6c94761 100644 --- a/src/client/spark_test/spark_test.csproj +++ b/src/client/spark_test/spark_test.csproj @@ -1,7 +1,7 @@ - net471 + netstandard2.0 x64 x64 diff --git a/src/client/sparkcmd/sparkcmd.csproj b/src/client/sparkcmd/sparkcmd.csproj index 31c2efcd9..af47bcfb5 100644 --- a/src/client/sparkcmd/sparkcmd.csproj +++ b/src/client/sparkcmd/sparkcmd.csproj @@ -2,8 +2,7 @@ Exe - net471 - + net471;netcoreapp2.1 win7-x64;ubuntu.16.04-x64 Blue Trading Systems Blue Trading Systems diff --git a/tools/jenkinsbuild.cmd b/tools/jenkinsbuild.cmd index debcee509..a6f345831 100644 --- a/tools/jenkinsbuild.cmd +++ b/tools/jenkinsbuild.cmd @@ -13,6 +13,11 @@ IF %ERRORLEVEL% NEQ 0 GOTO :ERROR_AND_END msbuild /m /p:debugtype=portable /p:platform=x64 /clp:verbosity=minimal /clp:summary spark_client.sln /p:Configuration=release IF %ERRORLEVEL% NEQ 0 GOTO :ERROR_AND_END +:: build netcore +cd src\client\sparkcmd +dotnet publish -f netcoreapp2.1 -c release +IF %ERRORLEVEL% NEQ 0 GOTO :ERROR_AND_END + GOTO :END :ERROR_AND_END From 4747fe5535920a626fc5353cb5c7a3fe51150fa9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 29 Jan 2019 09:23:54 -0500 Subject: [PATCH 039/218] Make sure every sparkcmd command respects -configserver --- src/client/sparkcmd/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/sparkcmd/Program.cs b/src/client/sparkcmd/Program.cs index 1feb68ecb..634895efd 100644 --- a/src/client/sparkcmd/Program.cs +++ b/src/client/sparkcmd/Program.cs @@ -9,6 +9,7 @@ using System.Linq; namespace sparkcmd { class Program { static void Main(string[] args) { + mbts.config.Configuration.initialize(); var commands = ConsoleCommandDispatcher.FindCommandsInSameAssemblyAs(typeof(Program)); ConsoleCommandDispatcher.DispatchCommand(commands, args, Console.Out); return; From a384eb9f73ea01c7ee7d2191cd3678efb56848e1 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 29 Jan 2019 09:31:14 -0500 Subject: [PATCH 040/218] Return int from sparkcmd --- src/client/sparkcmd/Program.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/client/sparkcmd/Program.cs b/src/client/sparkcmd/Program.cs index 634895efd..790308e27 100644 --- a/src/client/sparkcmd/Program.cs +++ b/src/client/sparkcmd/Program.cs @@ -8,11 +8,10 @@ using System.Linq; namespace sparkcmd { class Program { - static void Main(string[] args) { + static int Main(string[] args) { mbts.config.Configuration.initialize(); var commands = ConsoleCommandDispatcher.FindCommandsInSameAssemblyAs(typeof(Program)); - ConsoleCommandDispatcher.DispatchCommand(commands, args, Console.Out); - return; + return ConsoleCommandDispatcher.DispatchCommand(commands, args, Console.Out); } } } \ No newline at end of file From 4efd853c96bf64cff602f5a09fc3d4bd3963c37a Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 29 Jan 2019 16:06:31 -0500 Subject: [PATCH 041/218] Simplify getting a security --- src/client/spark_test/System/LimitsTests.cs | 40 +++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/client/spark_test/System/LimitsTests.cs b/src/client/spark_test/System/LimitsTests.cs index a37f6bce1..b517765bd 100644 --- a/src/client/spark_test/System/LimitsTests.cs +++ b/src/client/spark_test/System/LimitsTests.cs @@ -12,6 +12,7 @@ using bts.test; using bts.api.orderman; using mbts; using mbts.tests; +using bts.co2; namespace bts.tests { @@ -36,6 +37,39 @@ namespace bts.tests Disposable.dispose(ref _context); } + async Task> all_futures(string symbol) { + var request = new MDRequest() { + Host = "system_test", + Channels = { + new SecurityChannel() { + Time = 0, + Flags = 0, + Type = SecurityType.Future, + Exchange = Venue.Sim, + Symbol = symbol, + TradeCursor = 0, + RfqCursor = 0 + } + } + }; + + var relay = _context.locate(); + await Task.Delay(100); + var result = await relay.requestmd_async(request); + + List securities = new List(); + if (result.success) { + foreach (var ch in result.value.Channels) { + foreach (var update in ch.Updates) { + if (update.Security != null) { + securities.Add(new SecurityImmutable(update.Security)); + } + } + } + } + return securities; + } + [Test] public async Task test_clip_limits() { //Get and set limit values from the admin service @@ -53,9 +87,9 @@ namespace bts.tests //create Orders Here - bts.md.MarketDataClient mdc = new bts.md.MarketDataClient(); - - SecurityImmutable? sec = await mdc.find_security_async(y => y.Symbol == test_symbol && y.Exchange == Venue.Sim); + var all = await all_futures(test_symbol); + SecurityImmutable? sec = all.FirstOrDefault(); + Assert.IsTrue(sec.HasValue); uint under_limit_order_key; uint over_limit_order_key; From 0501418da63305a16012bf243933c12a4d7a0cce Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 29 Jan 2019 16:55:12 -0500 Subject: [PATCH 042/218] provide_command_line for system_tests -configserver --- src/lib/os/os.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/os/os.cpp b/src/lib/os/os.cpp index f7f087633..d16966dcd 100755 --- a/src/lib/os/os.cpp +++ b/src/lib/os/os.cpp @@ -544,7 +544,6 @@ uint64_t tick_count() { #endif } -#ifdef _WIN32 std::vector g_cmd_args; bool g_cmd_args_set; @@ -559,14 +558,13 @@ extern "C" BTS_EXPORT void provide_command_line(const char **argv, int argc) { g_cmd_args_set = true; } } -#endif std::vector get_command_line() { -#ifdef _WIN32 if (g_cmd_args_set) { // return cached copy return g_cmd_args; } +#ifdef _WIN32 for (int index = 0; index < __argc; index++) { if (__argv != nullptr) { g_cmd_args.push_back(__argv[index]); From 968dfbac2a3d04afb66de4dec6766777e732ab48 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 30 Jan 2019 11:18:31 -0500 Subject: [PATCH 043/218] Need spark_test.dll for system tests --- src/client/sparkcmd/sparkcmd.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/sparkcmd/sparkcmd.csproj b/src/client/sparkcmd/sparkcmd.csproj index af47bcfb5..9046c4610 100644 --- a/src/client/sparkcmd/sparkcmd.csproj +++ b/src/client/sparkcmd/sparkcmd.csproj @@ -17,7 +17,7 @@ - + From ac88586c8fc1b5b48052124df4a17d9ec44d0fa5 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 31 Jan 2019 11:48:48 -0600 Subject: [PATCH 044/218] darken popup border --- .../Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 0f67a7b83..6cee4aa43 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -62,7 +62,7 @@ - + From d18caa7ba1db7ab14e2237e668f33d438d80c830 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 31 Jan 2019 11:50:27 -0600 Subject: [PATCH 045/218] auto close popup when no orders remain --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 17 +++++++++++++ .../view/Spark/Ladder/LadderOrdersHost.cs | 24 ++++++++++--------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index bd5a269a7..8cb173533 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -34,6 +34,7 @@ namespace mbts.spark { readonly IWindowSettingsManager _settings_manager; readonly List _resources; OrderBookStartupData _state; + bool _is_row_collection_populated; public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager, bool rows_are_initially_expanded = false) { _bus = bus; @@ -43,6 +44,7 @@ namespace mbts.spark { // we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front columns = new ObservableAppendCollection(_columns); _row_collection = new OrderBookRowCollection(ort => new OrderBookRowVM(this, ort, rows_are_initially_expanded), _columns.get_sorting_data().comparer) { filter = _columns.get_filter() }; + _row_collection.CollectionChanged += _row_collection_CollectionChanged; _current_row = backing(nameof(current_row)); _columns.filter_changed += on_filter_changed; collapse_all_rows_command = new DelegateCommand(_row_collection.collapse_all); @@ -53,6 +55,7 @@ namespace mbts.spark { grid_settings_manager, Disposable.Create(() => { _columns.filter_changed -= on_filter_changed; + _row_collection.CollectionChanged -= _row_collection_CollectionChanged; Disposable.dispose(_row_collection); }), _columns @@ -63,6 +66,10 @@ namespace mbts.spark { void on_filter_changed() => _row_collection.filter = _columns.get_filter(); } + private void _row_collection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) { + is_row_collection_populated = _row_collection.Count != 0; + } + public event Action selected_order_changed; public event Action OnDisposed; @@ -76,6 +83,16 @@ namespace mbts.spark { public ICommand collapse_all_rows_command { get; } public ICommand expand_all_rows_command { get; } + public bool is_row_collection_populated { + get => _is_row_collection_populated; + set { + if (value != _is_row_collection_populated) { + _is_row_collection_populated = value; + RaisePropertyChanged(); + } + } + } + public void row_selection_changed(SelectionChangedEventArgs e) { if (e.RemovedItems != null) { foreach (var row_vm in e.RemovedItems.Cast()) { diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index 018509e19..b4aa555ee 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -130,20 +130,22 @@ namespace mbts.spark { // create the new popup window in here var obvm = order.orderbook_vm; var view = new MiniOrderBookView(obvm); - var popup = new System.Windows.Controls.Primitives.Popup(); - // we only keep the obvm around assigned to the DataContext so that we can - // properly Dispose of it later when the popup is closed. - popup.DataContext = obvm; - popup.Child = view; - popup.StaysOpen = false; - popup.PlacementTarget = popup_placement_target; - popup.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom; - popup.VerticalOffset = 5; - popup.IsOpen = true; + var popup = new System.Windows.Controls.Primitives.Popup { + // we only keep the obvm around assigned to the DataContext so that we can + // properly Dispose of it later when the popup is closed. + DataContext = obvm, + Child = view, + StaysOpen = false, + PlacementTarget = popup_placement_target, + Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom, + VerticalOffset = 5 + }; + popup.SetBinding(System.Windows.Controls.Primitives.Popup.IsOpenProperty, + nameof(OrderBookVM.is_row_collection_populated) + ); popup.Closed += (sender, event_args) => (popup.DataContext as IDisposable)?.Dispose(); b.Popup = popup; - // close context menu after command executed //if (curr_order != null) { // Action command_executed = null; From 2f31fb62849bc8e1a5e1aadd3bca8c372d0e77e2 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 31 Jan 2019 14:29:04 -0600 Subject: [PATCH 046/218] qty ticker layout changes --- .../TickUpDownNullableUIntCommit.xaml | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml index 363c85565..d1233327f 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml @@ -8,7 +8,7 @@ d:DesignHeight="100" d:DesignWidth="800" x:Name="_me"> - + @@ -17,7 +17,7 @@ - + @@ -38,21 +38,20 @@ - - - - - - - + + + + + + From 4f5f4c61f3c1259757c443338462a6ce674fc882 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 1 Feb 2019 11:02:56 -0600 Subject: [PATCH 047/218] inline price ticker --- .../MiniOrderBook/MiniOrderBookView.xaml.cs | 2 +- .../Trading/OrderBook/OrderBookColumns.cs | 24 +++++- .../Trading/OrderBook/OrderBookRowVM.cs | 30 +++++++- .../Trading/OrderBook/OrderBookView.xaml.cs | 2 +- .../OrderBook/OrderBookWindowFactory.cs | 2 +- .../TickUpDown/PriceEntryCommitControl.xaml | 74 +++++++++++++++++++ .../PriceEntryCommitControl.xaml.cs | 73 ++++++++++++++++++ .../spark/view/Spark/Ladder/LadderOrderVM.cs | 16 +++- .../view/Spark/Ladder/LadderOrdersHost.cs | 14 ---- src/lib/CMakeDeps.cmake | 2 +- 10 files changed, 212 insertions(+), 27 deletions(-) create mode 100644 src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml create mode 100644 src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml.cs diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs index 228a053de..20f5a46d5 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs @@ -5,7 +5,7 @@ namespace mbts.spark { internal partial class MiniOrderBookView : UserControl { // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. - public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel, EditableQty } + public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel, EditableQty, EditablePrice } public const string SubTypeFilterTemplateKey = "SubTypeFilterTemplate", ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 8f38130ba..6cf5f3623 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -213,6 +213,10 @@ namespace mbts.spark { nameof(OrderBookRowVM.price)), DataGridFilterKnownTemplates.DoubleMinMax, _wrap_comparer(r => r.price))); + // edit price column + // not usually part of the main order book, but it's useful to add it + // rather than debugging the popup window + //Add(edit_price_column = new OrderBookVM.EditablePriceColumn()); // avg filled price Add(avg_price_column = new SimpleTextColumn( Columns.AvgFilled, @@ -310,6 +314,7 @@ namespace mbts.spark { public SizeColumn qty_column { get; } public EditableQtyColumn edit_qty_column { get; } public SimpleTextColumn price_column { get; } + public EditablePriceColumn edit_price_column { get; } public FilledColumn filled_qty_column { get; } public SimpleTextColumn last_price_column { get; } public SimpleTextColumn avg_price_column { get; } @@ -710,7 +715,7 @@ namespace mbts.spark { public class EditableQtyColumn:FrameworkElementColumnBase { - public EditableQtyColumn(Columns key) : base(key) { + public EditableQtyColumn() : base(Columns.EditableQty) { id = key.ToString(); Header = "Qty"; Width = 64; @@ -724,6 +729,23 @@ namespace mbts.spark { } } + public class EditablePriceColumn : FrameworkElementColumnBase { + + public EditablePriceColumn() : base(Columns.EditablePrice) { + id = key.ToString(); + Header = "Price"; + Width = 96; + } + + public override FrameworkElement view_factory() { + var price_up_down = new PriceEntryCommitControl(); + price_up_down.SetBinding(PriceEntryCommitControl.SourceValueProperty, nameof(OrderBookRowVM.prospective_price)); + price_up_down.SetBinding(PriceEntryCommitControl.SourceContractSpecProperty, nameof(OrderBookRowVM.contract_spec)); + price_up_down.SetBinding(PriceEntryCommitControl.OnCommitProperty, nameof(OrderBookRowVM.modify_order_price)); + return price_up_down; + } + } + #endregion static class RenderUtils { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 6fd0cc6c1..a49a2c23d 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -16,12 +16,13 @@ namespace mbts.spark { const string _unknown_security_price_format_string = "0.#########"; const int _unknown_security_price_num_fractional_digits = 9; readonly OrderBookVM _owner; - IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _modify_order_quantity; + IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _modify_order_quantity, _modify_order_price; bool _is_parent, _is_expanded, _is_selected; int _depth_level; SecurityMD? _security_md => order_tuple.security_md; Property _prospective_quantity; - Property _is_qty_dirty; + Property _prospective_price; + Property _is_qty_dirty, _is_price_dirty; public OrderBookRowVM(OrderBookVM owner, OrderRecordTuple order_tuple, bool is_expanded) { @@ -30,12 +31,15 @@ namespace mbts.spark { is_visible = !is_child; _is_expanded = is_expanded; _prospective_quantity = backing(nameof(prospective_quantity), this.quantity); + _prospective_price = backing(nameof(prospective_price), this.price); _is_qty_dirty = backing(nameof(is_qty_dirty), () => this.prospective_quantity != this.quantity, nameof(prospective_quantity), nameof(quantity)); + _is_price_dirty = backing(nameof(is_price_dirty), () => this.prospective_price != this.price, nameof(prospective_price), nameof(price)); this.invalidated += OrderBookRowVM_invalidated; } private void OrderBookRowVM_invalidated() { modify_order_quantity?.TryRaiseCanExecuteChanged(); + modify_order_price?.TryRaiseCanExecuteChanged(); } protected override void Dispose(bool disposing) { @@ -53,6 +57,7 @@ namespace mbts.spark { public uint parent_order_key => order.ParentKey; public uint security_key => order.security_key(); public SecurityImmutable? security => _security_md.security(); + public ContractSpecificationImmutable? contract_spec => security.spec_or_default(); public string security_text => security.display_name(); public Venue exchange => _security_md.exchange(); public string symbol => _security_md.symbol(); @@ -99,12 +104,18 @@ namespace mbts.spark { get => _prospective_quantity.Value; set => _prospective_quantity.set(value); } - + public double prospective_price { + get => _prospective_price.Value; + set => _prospective_price.set(value); + } public bool is_qty_dirty { get => _is_qty_dirty.Value; set => _is_qty_dirty.set(value); } - + public bool is_price_dirty { + get => _is_price_dirty.Value; + set => _is_price_dirty.set(value); + } // Commands public ICommand toggle_command => _toggle_expanded_cmd ?? ( @@ -125,6 +136,15 @@ namespace mbts.spark { ) ); + public ICommand modify_order_price => _modify_order_price ?? + (_modify_order_price = new DelegateCommand( + (desired_price) => _owner.modify_order_price(this, (double)desired_price), + (desired_price) => + (desired_price != null && this.status == OrderStatus.Working && (double)desired_price != this.price) + || prospective_price != this.price + ) + ); + // These fns present a way for the orderbook to avoid noisy, intermittent collection changes during "Expand/Collapse All" ops, // when incremental changes are ignored in favor of a full reset, after 'is_expanded' is updated for all rows. internal void expand_internal() => Set(ref _is_expanded, true); @@ -151,6 +171,8 @@ namespace mbts.spark { RaisePropertyChanged(nameof(order_type), nameof(order_metadata)); if (old_order.quantity() != order.quantity()) RaisePropertyChanged(nameof(quantity)); + if (old_order.price() != order.price()) + RaisePropertyChanged(nameof(price)); if (!had_security && _security_md.HasValue) { RaisePropertyChanged(nameof(security), nameof(security_text)); // need to raise invalidated to refresh the price cells (the security.ContractSpec determines how they are formatted - Ticks!) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs index c6b583e99..8fb0a43c9 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs @@ -5,7 +5,7 @@ namespace mbts.spark { internal partial class OrderBookView : UserControl { // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. - public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel, EditableQty } + public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel, EditableQty, EditablePrice } public const string SubTypeFilterTemplateKey = "SubTypeFilterTemplate", ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index 4392dca83..829f937ab 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -149,7 +149,7 @@ namespace bts.shell { } private static List _mini_mode_columns_to_hide = new List { - time_created, exchange, sub_type, avg_price, last_price, status, last_message, security_key, order_key, parent_key + time_created, exchange, sub_type, quantity, price, avg_price, last_price, status, last_message, security_key, order_key, parent_key }; public static IEnumerable mini { diff --git a/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml b/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml new file mode 100644 index 000000000..acd37eaa7 --- /dev/null +++ b/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml.cs b/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml.cs new file mode 100644 index 000000000..d2373ffd3 --- /dev/null +++ b/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml.cs @@ -0,0 +1,73 @@ +using bts.api; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace mbts.ui.controls { + /// + /// Interaction logic for PriceEntryCommitControl.xaml + /// + public partial class PriceEntryCommitControl : UserControl { + + + public static readonly DependencyProperty SourceValueProperty = + DependencyProperty.Register("SourceValue", + typeof(double), + typeof(PriceEntryCommitControl), + new FrameworkPropertyMetadata { + BindsTwoWayByDefault = true, + PropertyChangedCallback = source_value_changed + } + ); + + public double SourceValue { + get => (double)GetValue(SourceValueProperty); + set => SetValue(SourceValueProperty, value); + } + private static void source_value_changed(DependencyObject d, DependencyPropertyChangedEventArgs e) { + if (d is PriceEntryCommitControl _instance_of_me) { + _instance_of_me.Dispatcher.BeginInvoke( + (Action)(() => _instance_of_me.OnCommit?.TryRaiseCanExecuteChanged()) + ); + } + } + + public static readonly DependencyProperty SourceContractSpecProperty = + DependencyProperty.Register("SourceContractSpec", typeof(ContractSpecificationImmutable?), typeof(PriceEntryCommitControl)); + public ContractSpecificationImmutable? SourceContractSpec { + get => (ContractSpecificationImmutable?)GetValue(SourceContractSpecProperty); + set => SetValue(SourceContractSpecProperty, value); + } + + // public static readonly DependencyProperty PriceTextProperty = + //DependencyProperty.Register("PricText", typeof(string), typeof(PriceEntryCommitControl)); + // public string PriceText { + // get => (string)GetValue(PriceTextProperty); + // set => SetValue(PriceTextProperty, value); + // } + + public static readonly DependencyProperty OnCommitProperty = + DependencyProperty.Register("OnCommit", typeof(ICommand), typeof(PriceEntryCommitControl)); + public ICommand OnCommit { + get => (ICommand)GetValue(OnCommitProperty); + set => SetValue(OnCommitProperty, value); + } + + public PriceEntryCommitControl() { + InitializeComponent(); + } + + } +} diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index e3866d7df..7e40e3473 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -217,13 +217,21 @@ namespace mbts.spark { var qty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Size.ToString()).FirstOrDefault(); var qty_index = obvm.columns.indexOf(qty_col); if (qty_index > -1) { - // make sure there isn't an EditableQty column in here already; maybe the DefaultGrid will change - // in the main ob + // insert the edit column in the same position that the hidden column occupies var existing_editqty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditableQty.ToString()).FirstOrDefault(); var existing_editqty_index = obvm.columns.indexOf(existing_editqty_col); if (existing_editqty_index == -1) { - obvm.columns.RemoveAt(qty_index); - obvm.columns.Insert(qty_index, new OrderBookVM.EditableQtyColumn(OrderBookView.Columns.EditableQty)); + obvm.columns.Insert(qty_index, new OrderBookVM.EditableQtyColumn()); + } + } + var price_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Price.ToString()).FirstOrDefault(); + var price_index = obvm.columns.indexOf(price_col); + if (price_index > -1) { + // insert the edit column in the same position that the hidden column occupies + var existing_editprice_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditablePrice.ToString()).FirstOrDefault(); + var existing_editprice_index = obvm.columns.indexOf(existing_editprice_col); + if (existing_editprice_index == -1) { + obvm.columns.Insert(price_index, new OrderBookVM.EditablePriceColumn()); } } obvm.load_from(state); diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index b4aa555ee..dc5e975c4 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -145,20 +145,6 @@ namespace mbts.spark { ); popup.Closed += (sender, event_args) => (popup.DataContext as IDisposable)?.Dispose(); b.Popup = popup; - - // close context menu after command executed - //if (curr_order != null) { - // Action command_executed = null; - // command_executed = () => - // { - // try { - // curr_order.command_executed -= command_executed; - // } catch (Exception ex) { - // Log.Ui.warn($"Error in {typeof(LadderGridHost)}'s {typeof(Badge)} {nameof(LadderOrderVM.command_executed)} local handler: {ex}"); - // } - // }; - // curr_order.command_executed += command_executed; - //} } else if (e.ChangedButton == MouseButton.Left) { if (curr_order?.cancel_command?.CanExecute(null) == true) curr_order.cancel_command.Execute(null); diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index e3785a74c..afd768425 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file From c91eedcca089d920291c4dcd3922c44437fa8a45 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 1 Feb 2019 12:04:34 -0600 Subject: [PATCH 048/218] minor refactoring, some notes after talking w/ john --- .../spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 4 ++-- .../spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 4 ++-- .../spark/view/Controls/DIYGrid/Columns/ColumnBase.cs | 2 +- src/client/spark/view/Spark/Ladder/LadderOrderVM.cs | 6 +++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 6cf5f3623..dd240cfb7 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -668,9 +668,9 @@ namespace mbts.spark { public class CancelColumn : FrameworkElementColumnBase { readonly BindingBase _command_binding; - public CancelColumn(Columns key, string command_property) : base(key) { + public CancelColumn(string command_property) : base(Columns.Cancel) { id = key.ToString(); - Header = DefaultColumnHeaders.Delete; + Header = DefaultColumnHeaders.Cancel; _command_binding = new Binding(command_property); } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index a49a2c23d..ca6bf6be2 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -132,7 +132,7 @@ namespace mbts.spark { (desired_quantity) => _owner.modify_order_quantity(this, (uint)desired_quantity), (desired_quantity) => (desired_quantity != null && this.status == OrderStatus.Working && (uint)desired_quantity != this.quantity) - || prospective_quantity != this.quantity + || is_qty_dirty ) ); @@ -141,7 +141,7 @@ namespace mbts.spark { (desired_price) => _owner.modify_order_price(this, (double)desired_price), (desired_price) => (desired_price != null && this.status == OrderStatus.Working && (double)desired_price != this.price) - || prospective_price != this.price + || is_price_dirty ) ); diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 019581851..02ff43b49 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -98,7 +98,7 @@ namespace mbts.ui.controls { TotalNetPos = "Total Net Pos", TotalPnL = "Total PnL", PnLPrice = "PnL Price", - Delete = "Delete"; + Cancel = "Cancel"; } public interface IKeyedColumn { diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 7e40e3473..43a018033 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -213,7 +213,11 @@ namespace mbts.spark { bts.shell.OrderBookWindowFactory.OrderBookStartupData.default_mini_grid, use_defaults: false ); - obvm.columns.Insert(0, new OrderBookVM.CancelColumn(OrderBookView.Columns.Cancel, nameof(OrderBookRowVM.cancel_command))); + // NOTE: + // we might need the ObservableAppend to InsertAt + // if these EditXXX ever support settings. + // insert the cancel column + obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command))); var qty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Size.ToString()).FirstOrDefault(); var qty_index = obvm.columns.indexOf(qty_col); if (qty_index > -1) { From 7738da7d168e9b0941b0ebced1e0ce319fa38e16 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 1 Feb 2019 15:18:39 -0600 Subject: [PATCH 049/218] remove ladder tooltip and backing property --- src/client/spark/view/Spark/Ladder/LadderOrderVM.cs | 5 +---- src/client/spark/view/Spark/Ladder/LadderView.xaml | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 43a018033..cfed55159 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -37,7 +37,7 @@ namespace mbts.spark { readonly Property _foreground, _background, _hoverbackground, _border, _parent_algo_type_brush; readonly Property _is_exchange_order, _has_multiple_orders_at_same_level, _is_hedge_order; readonly Property _parent_algo_type; - readonly Property _summary, _description; + readonly Property _summary; IObservable _bs; LadderSettings.BadgeStyle _current_badge_style; int _n_active_price_change_ops = 0; @@ -63,7 +63,6 @@ namespace mbts.spark { _hoverbackground = backing(nameof(hoverbackground), _color_bg_brush); _border = backing(nameof(border), _color_bg_brush); _summary = backing(nameof(summary), string.Empty); - _description = backing(nameof(description), string.Empty); _is_exchange_order = backing(nameof(is_exchange_order), false); _has_multiple_orders_at_same_level = backing(nameof(has_multiple_orders_at_same_level), false); _is_hedge_order = backing(nameof(is_hedge_order), false); @@ -123,7 +122,6 @@ namespace mbts.spark { if (_orders.Any()) { summary = _orders.Values.Select(order => order.short_description(_parent.security.ContractSpec)).Aggregate((s1, s2) => $"{s1}{Environment.NewLine}{Environment.NewLine}{s2}"); - description = _orders.Values.Select(order => order.full_description(_parent.security)).Aggregate((s1, s2) => $"{s1}{Environment.NewLine}{Environment.NewLine}{s2}"); } _set_badge_text(); @@ -186,7 +184,6 @@ namespace mbts.spark { public Brush hoverbackground { get => _hoverbackground.Value; private set => _hoverbackground.Value = value; } public Brush border { get => _border.Value; private set => _border.Value = value; } public string summary { get => _summary.Value; private set => _summary.Value = value; } - public string description { get => _description.Value; private set => _description.Value = value; } public bool is_exchange_order { get => _is_exchange_order.Value; private set => _is_exchange_order.Value = value; } public bool has_multiple_orders_at_same_level { get => _has_multiple_orders_at_same_level.Value; private set => _has_multiple_orders_at_same_level.Value = value; } public bool is_hedge_order { get => _is_hedge_order.Value; private set => _is_hedge_order.Value = value; } diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 92055b480..360855cba 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -533,7 +533,6 @@ - From e71b1518f0cc490bd3954469b2744ea934e103f9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 1 Feb 2019 15:24:29 -0600 Subject: [PATCH 050/218] move edit price immediately after edit qty --- src/client/spark/view/Spark/Ladder/LadderOrderVM.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index cfed55159..5a0ed2ccd 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -228,11 +228,11 @@ namespace mbts.spark { var price_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Price.ToString()).FirstOrDefault(); var price_index = obvm.columns.indexOf(price_col); if (price_index > -1) { - // insert the edit column in the same position that the hidden column occupies var existing_editprice_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditablePrice.ToString()).FirstOrDefault(); var existing_editprice_index = obvm.columns.indexOf(existing_editprice_col); if (existing_editprice_index == -1) { - obvm.columns.Insert(price_index, new OrderBookVM.EditablePriceColumn()); + // insert the edit price column immediately after the edit qty + obvm.columns.Insert(qty_index + 1, new OrderBookVM.EditablePriceColumn()); } } obvm.load_from(state); From fc82ccf221e62ff0fd4042affe28c4cbcf493dbe Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 1 Feb 2019 15:38:55 -0600 Subject: [PATCH 051/218] enforce max height on popop size --- .../Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 6cee4aa43..b929403bc 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -10,7 +10,8 @@ xmlns:uspcv="clr-namespace:mbts.ui.spark.converters" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:order="clr-namespace:bts.api.orderman;assembly=spark_api" - mc:Ignorable="d" + mc:Ignorable="d" + MaxHeight="240" d:DesignHeight="600" d:DesignWidth="1080" FocusManager.IsFocusScope="True" Background="{StaticResource CommonBackground}"> From 2ba7f949ccd9a06dce9ebc8599a16a154877dc7a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 1 Feb 2019 16:55:49 -0600 Subject: [PATCH 052/218] MinWidth so that the vertical scrollbar does not cover up the content in the last column --- .../Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index b929403bc..627a2da4b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -1,4 +1,6 @@ - + + From 94285918bf60f6c69fa3ac7c9535a74097f41e75 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Feb 2019 15:01:52 -0500 Subject: [PATCH 053/218] Trying to fix the linux/win war on CMAkeDeps.cmake --- src/lib/CMakeDeps_win.cmake | 1 + tools/safe_dep_glob.cmake | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 src/lib/CMakeDeps_win.cmake diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake new file mode 100644 index 000000000..afd768425 --- /dev/null +++ b/src/lib/CMakeDeps_win.cmake @@ -0,0 +1 @@ +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/tools/safe_dep_glob.cmake b/tools/safe_dep_glob.cmake index e4a8e28e4..3b8dc2255 100644 --- a/tools/safe_dep_glob.cmake +++ b/tools/safe_dep_glob.cmake @@ -16,7 +16,12 @@ endfunction(update_file) # the list of dependencies in it - this file should be treated as part of # CMakeLists.txt (source controlled, etc.). function(update_deps_file deps) + if (WIN32) + set(deps_file "CMakeDeps_win.cmake") + else () set(deps_file "CMakeDeps.cmake") + endif() + # Normalize the list so it's the same on every machine list(REMOVE_DUPLICATES deps) list(SORT deps) From 3d4fe8f832937c9f325ac2d32efda45def792512 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 11:27:58 -0600 Subject: [PATCH 054/218] PR edit; columns setter is now private --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 8cb173533..bde0d1024 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -73,7 +73,7 @@ namespace mbts.spark { public event Action selected_order_changed; public event Action OnDisposed; - public ObservableAppendCollection columns { get; set; } + public ObservableAppendCollection columns { get; private set; } public ObservableCollection core_columns => _columns; public ObservableCollection rows => _row_collection; public OrderBookRowVM current_row { get => _current_row.Value; set => _current_row.Value = value ?? _selected_rows.FirstOrDefault(); } From 636e170f44ae3677d46fe31330a07c0ad3d1b4b4 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 11:34:04 -0600 Subject: [PATCH 055/218] PR edits --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index bde0d1024..3ee4f91d0 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -73,7 +73,7 @@ namespace mbts.spark { public event Action selected_order_changed; public event Action OnDisposed; - public ObservableAppendCollection columns { get; private set; } + public ObservableAppendCollection columns { get; } public ObservableCollection core_columns => _columns; public ObservableCollection rows => _row_collection; public OrderBookRowVM current_row { get => _current_row.Value; set => _current_row.Value = value ?? _selected_rows.FirstOrDefault(); } From af278d2d87c86e566dd59fbd24c8372323bd1ef8 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 12:29:34 -0600 Subject: [PATCH 056/218] PR edits - devolving qty/dirty and price/dirty --- .../Trading/OrderBook/OrderBookColumns.cs | 2 +- .../Trading/OrderBook/OrderBookRowVM.cs | 45 ++++++++++++------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index dd240cfb7..58a62d2b4 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -197,7 +197,7 @@ namespace mbts.spark { // edit quantity column // not usually part of the main order book, but it's useful to add it // rather than debugging the popup window - //Add(edit_qty_column = new EditableQtyColumn(Columns.EditableQty)); + //Add(edit_qty_column = new EditableQtyColumn()); // filled quantity Add(filled_qty_column = new FilledColumn( new UIntMinMax(ort => ort.order.filled(), nameof(OrderBookRowVM.filled_quantity)))); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index ca6bf6be2..d40f36dc3 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -20,9 +20,10 @@ namespace mbts.spark { bool _is_parent, _is_expanded, _is_selected; int _depth_level; SecurityMD? _security_md => order_tuple.security_md; - Property _prospective_quantity; - Property _prospective_price; - Property _is_qty_dirty, _is_price_dirty; + + // for mini-ob + uint _prospective_quantity; + double _prospective_price; public OrderBookRowVM(OrderBookVM owner, OrderRecordTuple order_tuple, bool is_expanded) { @@ -30,10 +31,8 @@ namespace mbts.spark { this.order_tuple = order_tuple; is_visible = !is_child; _is_expanded = is_expanded; - _prospective_quantity = backing(nameof(prospective_quantity), this.quantity); - _prospective_price = backing(nameof(prospective_price), this.price); - _is_qty_dirty = backing(nameof(is_qty_dirty), () => this.prospective_quantity != this.quantity, nameof(prospective_quantity), nameof(quantity)); - _is_price_dirty = backing(nameof(is_price_dirty), () => this.prospective_price != this.price, nameof(prospective_price), nameof(price)); + prospective_quantity = this.quantity; + prospective_price = this.price; this.invalidated += OrderBookRowVM_invalidated; } @@ -101,20 +100,28 @@ namespace mbts.spark { set => Set(ref _is_selected, value); } public uint prospective_quantity { - get => _prospective_quantity.Value; - set => _prospective_quantity.set(value); + get => _prospective_quantity; + set { + var property_was_changed = Set(ref _prospective_quantity, value); + if (property_was_changed) { + RaisePropertyChanged(nameof(is_qty_dirty)); + } + } } public double prospective_price { - get => _prospective_price.Value; - set => _prospective_price.set(value); + get => _prospective_price; + set { + var property_was_changed = Set(ref _prospective_price, value); + if (property_was_changed) { + RaisePropertyChanged(nameof(is_price_dirty)); + } + } } public bool is_qty_dirty { - get => _is_qty_dirty.Value; - set => _is_qty_dirty.set(value); + get => this.prospective_quantity != this.quantity; } public bool is_price_dirty { - get => _is_price_dirty.Value; - set => _is_price_dirty.set(value); + get => this.prospective_price != this.price; } // Commands @@ -169,10 +176,14 @@ namespace mbts.spark { // however, the order-type and security cells DO use databindings - if these cells have changed, the PropertyChanged event must be raised regardless of whether or not invalidated is raised if (old_order.order_type() != order.order_type()) RaisePropertyChanged(nameof(order_type), nameof(order_metadata)); - if (old_order.quantity() != order.quantity()) + if (old_order.quantity() != order.quantity()) { RaisePropertyChanged(nameof(quantity)); - if (old_order.price() != order.price()) + RaisePropertyChanged(nameof(is_qty_dirty)); + } + if (old_order.price() != order.price()) { RaisePropertyChanged(nameof(price)); + RaisePropertyChanged(nameof(is_price_dirty)); + } if (!had_security && _security_md.HasValue) { RaisePropertyChanged(nameof(security), nameof(security_text)); // need to raise invalidated to refresh the price cells (the security.ContractSpec determines how they are formatted - Ticks!) From 39014696f3980bf8c5ee70843c792b71cf214f75 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 12:34:56 -0600 Subject: [PATCH 057/218] PR edit; Set is your friend --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 3ee4f91d0..b0fc0609d 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -85,12 +85,7 @@ namespace mbts.spark { public bool is_row_collection_populated { get => _is_row_collection_populated; - set { - if (value != _is_row_collection_populated) { - _is_row_collection_populated = value; - RaisePropertyChanged(); - } - } + set => Set(ref _is_row_collection_populated, value); } public void row_selection_changed(SelectionChangedEventArgs e) { From a61e21bd877d4f656d8f53aabfdbc240e1b6024a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 12:40:19 -0600 Subject: [PATCH 058/218] PR edits - Hashset for the win over List for Contains --- .../spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index 829f937ab..5912ac397 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -148,7 +148,7 @@ namespace bts.shell { } } - private static List _mini_mode_columns_to_hide = new List { + private static HashSet _mini_mode_columns_to_hide = new HashSet { time_created, exchange, sub_type, quantity, price, avg_price, last_price, status, last_message, security_key, order_key, parent_key }; From f20ee21ce7372dde108c25867e6360e5c43732d6 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 13:01:51 -0600 Subject: [PATCH 059/218] PR edits - Simplifying XAML since UserControl is a ContentControl --- .../TickUpDown/PriceEntryCommitControl.xaml | 28 +++++++++---------- .../TickUpDownNullableUIntCommit.xaml | 12 ++++---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml b/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml index acd37eaa7..23efd25ff 100644 --- a/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml +++ b/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml @@ -56,19 +56,17 @@ - - - - - + + + diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml index d1233327f..4d2b93056 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableUIntCommit.xaml @@ -38,11 +38,10 @@ - - - - - - + From 8c7dd2460da7c56f80bebad66b2e61791ad0136a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 13:11:24 -0600 Subject: [PATCH 060/218] PR edit - changing orderbook_vm property to method to better reflect the nature of the beast --- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 103 +++++++++--------- .../view/Spark/Ladder/LadderOrdersHost.cs | 2 +- 2 files changed, 52 insertions(+), 53 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 5a0ed2ccd..7df7af22c 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -187,58 +187,7 @@ namespace mbts.spark { public bool is_exchange_order { get => _is_exchange_order.Value; private set => _is_exchange_order.Value = value; } public bool has_multiple_orders_at_same_level { get => _has_multiple_orders_at_same_level.Value; private set => _has_multiple_orders_at_same_level.Value = value; } public bool is_hedge_order { get => _is_hedge_order.Value; private set => _is_hedge_order.Value = value; } - public Brush parent_algo_type_brush { get => _parent_algo_type_brush.Value; private set => _parent_algo_type_brush.Value = value; } - public OrderBookVM orderbook_vm { - // We are returning a new OrderBookVM each time b/c after - // successive launches of the mini-ob from the same badge, we get an exception - // System.InvalidOperationException: Sharing GridViewColumn among multiple GridViewColumnCollections or adding the same GridViewColumn into one GridViewColumnCollection more than once is not allowed. - // I checked with Eric and he guesses that what is happening is that the Popup is throwing away the grid, but the binding doesn't remove the columns from that grid - // - // I think returning a new OrderbookVM is okay at the moment since this Popup window will not be saving any state at this time - get { - var price_filter = new filters.DoubleMinMaxState(); - price_filter.minimum.value = real_price; - price_filter.maximum.value = real_price; - - var obvm = new OrderBookVM(null, _parent.bus, null, _parent.model.order_gateway, null, true); - var state = new bts.shell.OrderBookWindowFactory.OrderBookStartupData( - new bts.shell.OrderBookWindowFactory.FilterStates { - security_criteria = new SecurityCriteria(_parent.security), - price = price_filter, - statuses = new[] { OrderStatus.Working } - }, - bts.shell.OrderBookWindowFactory.OrderBookStartupData.default_mini_grid, - use_defaults: false - ); - // NOTE: - // we might need the ObservableAppend to InsertAt - // if these EditXXX ever support settings. - // insert the cancel column - obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command))); - var qty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Size.ToString()).FirstOrDefault(); - var qty_index = obvm.columns.indexOf(qty_col); - if (qty_index > -1) { - // insert the edit column in the same position that the hidden column occupies - var existing_editqty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditableQty.ToString()).FirstOrDefault(); - var existing_editqty_index = obvm.columns.indexOf(existing_editqty_col); - if (existing_editqty_index == -1) { - obvm.columns.Insert(qty_index, new OrderBookVM.EditableQtyColumn()); - } - } - var price_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Price.ToString()).FirstOrDefault(); - var price_index = obvm.columns.indexOf(price_col); - if (price_index > -1) { - var existing_editprice_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditablePrice.ToString()).FirstOrDefault(); - var existing_editprice_index = obvm.columns.indexOf(existing_editprice_col); - if (existing_editprice_index == -1) { - // insert the edit price column immediately after the edit qty - obvm.columns.Insert(qty_index + 1, new OrderBookVM.EditablePriceColumn()); - } - } - obvm.load_from(state); - return obvm; - } - } + public Brush parent_algo_type_brush { get => _parent_algo_type_brush.Value; private set => _parent_algo_type_brush.Value = value; } // the setter is public so that the LadderVM can set this field public CustomOrderDefinition.CustomOneofCase parent_algo_type { get => _parent_algo_type.Value; set => _parent_algo_type.Value = value; } @@ -273,6 +222,56 @@ namespace mbts.spark { } } + public OrderBookVM get_orderbook_vm() { + // We are returning a new OrderBookVM each time b/c after + // successive launches of the mini-ob from the same badge, we get an exception + // System.InvalidOperationException: Sharing GridViewColumn among multiple GridViewColumnCollections or adding the same GridViewColumn into one GridViewColumnCollection more than once is not allowed. + // I checked with Eric and he guesses that what is happening is that the Popup is throwing away the grid, but the binding doesn't remove the columns from that grid + // + // I think returning a new OrderbookVM is okay at the moment since this Popup window will not be saving any state at this time + var price_filter = new filters.DoubleMinMaxState(); + price_filter.minimum.value = real_price; + price_filter.maximum.value = real_price; + + var obvm = new OrderBookVM(null, _parent.bus, null, _parent.model.order_gateway, null, true); + var state = new bts.shell.OrderBookWindowFactory.OrderBookStartupData( + new bts.shell.OrderBookWindowFactory.FilterStates { + security_criteria = new SecurityCriteria(_parent.security), + price = price_filter, + statuses = new[] { OrderStatus.Working } + }, + bts.shell.OrderBookWindowFactory.OrderBookStartupData.default_mini_grid, + use_defaults: false + ); + // NOTE: + // we might need the ObservableAppend to InsertAt + // if these EditXXX ever support settings. + // insert the cancel column + obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command))); + var qty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Size.ToString()).FirstOrDefault(); + var qty_index = obvm.columns.indexOf(qty_col); + if (qty_index > -1) { + // insert the edit column in the same position that the hidden column occupies + var existing_editqty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditableQty.ToString()).FirstOrDefault(); + var existing_editqty_index = obvm.columns.indexOf(existing_editqty_col); + if (existing_editqty_index == -1) { + obvm.columns.Insert(qty_index, new OrderBookVM.EditableQtyColumn()); + } + } + var price_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Price.ToString()).FirstOrDefault(); + var price_index = obvm.columns.indexOf(price_col); + if (price_index > -1) { + var existing_editprice_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditablePrice.ToString()).FirstOrDefault(); + var existing_editprice_index = obvm.columns.indexOf(existing_editprice_col); + if (existing_editprice_index == -1) { + // insert the edit price column immediately after the edit qty + obvm.columns.Insert(qty_index + 1, new OrderBookVM.EditablePriceColumn()); + } + } + obvm.load_from(state); + return obvm; + } + public override string ToString() { return $"Price: {this.price} Order Count: {this.orders.Count()}"; } diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index dc5e975c4..f703dc951 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -128,7 +128,7 @@ namespace mbts.spark { var curr_order = b.DataContext as LadderOrderVM; if (e.ChangedButton == MouseButton.Middle) { // create the new popup window in here - var obvm = order.orderbook_vm; + var obvm = order.get_orderbook_vm(); var view = new MiniOrderBookView(obvm); var popup = new System.Windows.Controls.Primitives.Popup { // we only keep the obvm around assigned to the DataContext so that we can From 88c8663d296f0f4e91454a5d75b9e1dd9fd2ae75 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 13:12:33 -0600 Subject: [PATCH 061/218] PR - naming --- src/client/spark/view/Spark/Ladder/LadderOrderVM.cs | 2 +- src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 7df7af22c..363863578 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -222,7 +222,7 @@ namespace mbts.spark { } } - public OrderBookVM get_orderbook_vm() { + public OrderBookVM create_orderbook_vm() { // We are returning a new OrderBookVM each time b/c after // successive launches of the mini-ob from the same badge, we get an exception // System.InvalidOperationException: Sharing GridViewColumn among multiple GridViewColumnCollections or adding the same GridViewColumn into one GridViewColumnCollection more than once is not allowed. diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index f703dc951..a2aa0e49e 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -128,7 +128,7 @@ namespace mbts.spark { var curr_order = b.DataContext as LadderOrderVM; if (e.ChangedButton == MouseButton.Middle) { // create the new popup window in here - var obvm = order.get_orderbook_vm(); + var obvm = order.create_orderbook_vm(); var view = new MiniOrderBookView(obvm); var popup = new System.Windows.Controls.Primitives.Popup { // we only keep the obvm around assigned to the DataContext so that we can From b65fedc7817df5c5a8c3a8164f456f8fb1c942cf Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 13:17:24 -0600 Subject: [PATCH 062/218] PR edit - simplify LINQ expressions when using Where and FirstOrDefault --- src/client/spark/view/Spark/Ladder/LadderOrderVM.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 363863578..048c236ce 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -248,20 +248,20 @@ namespace mbts.spark { // if these EditXXX ever support settings. // insert the cancel column obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command))); - var qty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Size.ToString()).FirstOrDefault(); + var qty_col = obvm.columns.FirstOrDefault(x => x.id == OrderBookView.Columns.Size.ToString()); var qty_index = obvm.columns.indexOf(qty_col); if (qty_index > -1) { // insert the edit column in the same position that the hidden column occupies - var existing_editqty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditableQty.ToString()).FirstOrDefault(); + var existing_editqty_col = obvm.columns.FirstOrDefault(x => x.id == OrderBookView.Columns.EditableQty.ToString()); var existing_editqty_index = obvm.columns.indexOf(existing_editqty_col); if (existing_editqty_index == -1) { obvm.columns.Insert(qty_index, new OrderBookVM.EditableQtyColumn()); } } - var price_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Price.ToString()).FirstOrDefault(); + var price_col = obvm.columns.FirstOrDefault(x => x.id == OrderBookView.Columns.Price.ToString()); var price_index = obvm.columns.indexOf(price_col); if (price_index > -1) { - var existing_editprice_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.EditablePrice.ToString()).FirstOrDefault(); + var existing_editprice_col = obvm.columns.FirstOrDefault(x => x.id == OrderBookView.Columns.EditablePrice.ToString()); var existing_editprice_index = obvm.columns.indexOf(existing_editprice_col); if (existing_editprice_index == -1) { // insert the edit price column immediately after the edit qty From 50d18eb10dd404cb972e7069b8f6e85a69a32c72 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 13:20:39 -0600 Subject: [PATCH 063/218] PR edits - Style cop --- .../Modules/Trading/OrderBook/OrderBookRowVM.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index d40f36dc3..76dc8341f 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -102,8 +102,7 @@ namespace mbts.spark { public uint prospective_quantity { get => _prospective_quantity; set { - var property_was_changed = Set(ref _prospective_quantity, value); - if (property_was_changed) { + if (Set(ref _prospective_quantity, value)) { RaisePropertyChanged(nameof(is_qty_dirty)); } } @@ -111,18 +110,13 @@ namespace mbts.spark { public double prospective_price { get => _prospective_price; set { - var property_was_changed = Set(ref _prospective_price, value); - if (property_was_changed) { + if (Set(ref _prospective_price, value)) { RaisePropertyChanged(nameof(is_price_dirty)); } } } - public bool is_qty_dirty { - get => this.prospective_quantity != this.quantity; - } - public bool is_price_dirty { - get => this.prospective_price != this.price; - } + public bool is_qty_dirty => this.prospective_quantity != this.quantity; + public bool is_price_dirty => this.prospective_price != this.price; // Commands public ICommand toggle_command => _toggle_expanded_cmd ?? ( From 4215d96ba977eaf432c871fd87d6aa4f075fc233 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 4 Feb 2019 14:55:33 -0500 Subject: [PATCH 064/218] Wait to give obvm obvm a chance to load rows and not flash --- src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index a2aa0e49e..8ff34f733 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Data; @@ -124,11 +125,12 @@ namespace mbts.spark { b.DataContext = order; // Hook up the style from xaml b.Style = this.TryFindResource(typeof(Badge)) as Style; - b.MouseUp += (s, e) => { + b.MouseUp += async (s, e) => { var curr_order = b.DataContext as LadderOrderVM; if (e.ChangedButton == MouseButton.Middle) { // create the new popup window in here var obvm = order.create_orderbook_vm(); + await Task.Delay(100); // Wait for obvm to load rows collection before showing UI to avoid a flash var view = new MiniOrderBookView(obvm); var popup = new System.Windows.Controls.Primitives.Popup { // we only keep the obvm around assigned to the DataContext so that we can From 367bd0e3b9def932d7b651f1d18bb7fa8a77aaaf Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Feb 2019 15:05:49 -0500 Subject: [PATCH 065/218] Added release notes --- doc/user/docs/release_notes.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index 722258b98..feae64b17 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -1,5 +1,11 @@ # Release Notes +## 1.4.11 +### Ladder Usability Improvements + - Added a mini order book display on middle click of order badge +### SDK + - Improved SDK documentation and usability + ## 1.4.10 ### Bug Fixes - Removed duplicate entries in performance log From a8a922160dad862be8939fababf345c5d1b728be Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 1 Feb 2019 16:41:11 -0500 Subject: [PATCH 066/218] move externals pointer to proto36, small changes in spark to support that --- externals | 2 +- src/client/spark/Spark.csproj | 2 +- src/client/spark_api/spark_api.csproj | 2 +- src/client/spark_excel/spark_excel.csproj | 2 +- src/client/spark_sdk/spark_sdk.csproj | 2 +- src/lib/config/ConfigValueQueue.cpp | 1 + src/lib/config/text_format/strutil.h | 1 + 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/externals b/externals index 5570689de..c0941c565 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 5570689de27947a1573aa82e8f0e13000234f639 +Subproject commit c0941c5650a2a136cb036960d009fb8a16fb1165 diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index 043d64a86..c6eb7e982 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/client/spark_api/spark_api.csproj b/src/client/spark_api/spark_api.csproj index 5a555f48a..a0d60f3e1 100644 --- a/src/client/spark_api/spark_api.csproj +++ b/src/client/spark_api/spark_api.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/client/spark_excel/spark_excel.csproj b/src/client/spark_excel/spark_excel.csproj index 37fe13f5a..4aa21a9c4 100644 --- a/src/client/spark_excel/spark_excel.csproj +++ b/src/client/spark_excel/spark_excel.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj index bf27ddb55..26ff14c6c 100644 --- a/src/client/spark_sdk/spark_sdk.csproj +++ b/src/client/spark_sdk/spark_sdk.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/lib/config/ConfigValueQueue.cpp b/src/lib/config/ConfigValueQueue.cpp index 1195eac08..2d65a5ee8 100755 --- a/src/lib/config/ConfigValueQueue.cpp +++ b/src/lib/config/ConfigValueQueue.cpp @@ -14,6 +14,7 @@ namespace internal { using namespace ::google::protobuf; using namespace bts::expression; using namespace bts::util::proto; +using std::vector; ConfigValueQueue::ConfigValueQueue(IPropertyEvaluator& evaluator) : _eval(evaluator), diff --git a/src/lib/config/text_format/strutil.h b/src/lib/config/text_format/strutil.h index df28c94da..ab8c8b53e 100644 --- a/src/lib/config/text_format/strutil.h +++ b/src/lib/config/text_format/strutil.h @@ -35,6 +35,7 @@ #include #include +using std::vector; #include #include From 781c9dcc86ec075c8dce180bf05a373519bd88f4 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 1 Feb 2019 17:22:12 -0500 Subject: [PATCH 067/218] moved that using std::vector out of header --- src/lib/config/text_format/strutil.h | 1 - src/lib/config/text_format/text_format.cpp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/config/text_format/strutil.h b/src/lib/config/text_format/strutil.h index ab8c8b53e..df28c94da 100644 --- a/src/lib/config/text_format/strutil.h +++ b/src/lib/config/text_format/strutil.h @@ -35,7 +35,6 @@ #include #include -using std::vector; #include #include diff --git a/src/lib/config/text_format/text_format.cpp b/src/lib/config/text_format/text_format.cpp index 99f352cbf..cc942c036 100755 --- a/src/lib/config/text_format/text_format.cpp +++ b/src/lib/config/text_format/text_format.cpp @@ -50,6 +50,7 @@ #include #include #include +using std::vector; #include "text_format.h" From 7e2e2bf1b0374f1ac246047cf6e5185cef8e0d97 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 18 Dec 2018 09:22:12 -0500 Subject: [PATCH 068/218] Dev doc --- doc/dev/dev_process.md | 72 ++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/doc/dev/dev_process.md b/doc/dev/dev_process.md index 2d7445a1f..7324179af 100644 --- a/doc/dev/dev_process.md +++ b/doc/dev/dev_process.md @@ -1,11 +1,10 @@ # The BTS Development Process # -## The Big Picture ## - -Our development work is organized in projects. A project is an effort -to specifiy, develop and validate a related set of additions to our -Spark platform. A project can be assigned to one more developers and a -developer might concurrently be assigned to multiple +## Projects ## +Our development work is organized in projects. A project is a +non-trivial effort to specify, develop and validate a related set of +additions to our Spark platform. A project can be assigned to one more +developers and a developer might concurrently be assigned to multiple projects. Projects typically start out with specification work, proceed to implementation and finish with validation efforts. At any given time there will be multiple projects being worked on @@ -14,16 +13,16 @@ are merged into the product and deployed to customers. ## The Details ## Typically project ideas come from sales interactions, opposition -research and customer feedback, alltough on occasion development or -operational requirements will also suggest potentially valuable +research and customer feedback, all tough on occasion development or +operational requirements can also suggest valuable project ideas. Whatever the source of a project idea the final decision of which projects to pursue is always done by management. Once a project idea has been selected for implementation the corresponding project -will go through several phases: inception, specification, development -and merge. We detail each of these phases below. +will go through several phases: inception, specification, development, +validation and merge. -* Inception. In this phase we create the infrastructure for the -project. Typically this means selecting a team, creating a project +* Inception. In this phase the infrastructure for the project is +created. Typically this means selecting a team, creating a project case in Jira (that is a case assigned to the team@bluetradesys.com Jira user) and possibly creating a new branch for the project. This phase is mostly mechanical and the responsibility of Pedro. @@ -32,11 +31,11 @@ phase is mostly mechanical and the responsibility of Pedro. ill-considered idea project idea into a concrete, implementable specification that attempts to maximize the value/cost ratio of the project. It is hard to exaggerate the impact of a this phase on the -rest of the project. *Nothing* has more impact on our ability to -quickly deliver value to customers than good specification -work. Specification typically take the form of shared google docs, -using a mix of text and UI mockups to capture both user requirements -and suggested implementation strategies. Taha is responsible for this +rest of the project. *Nothing* has more impact on BTS's ability to +quickly deliver value to customers than good specification work. A +specification typically takes the form of a shared google docs using +a mix of text and UI mock-ups to capture both user requirements and +suggested implementation strategies. Taha is responsible for this phase. * Development. Once a specification is complete, a team of developers @@ -44,24 +43,26 @@ will use a project specific branch to implement the specification. Periodically, typically once a week, progress on the project is assessed by Pedro, possibly with the help of others. This assessment takes the form of code reviews, demos, or just one-on-one -conversations. To ensure development does not go off on sub-optimal -tangents, developers are expected to continuously merge master into -the project branch as well as encouraged to create Pull Requests (PRs) -early in the project implementation, so that their work is kept -visible and integrated with that of the rest of the group. During the +conversations. To ensure development does not go off on tangents, +developers are expected to continuously merge master into the project +branch as well as encouraged to create Pull Requests (PRs) early in +the project implementation, so that their work is kept visible and +integrated with that of the rest of the group. During the implementation phase developers should reach out to Pedro for UI -reviews, architecture and design concerns as well as specification -trade off concerns. +reviews, architecture and design questions and specification trade off +concerns. -* Verification. Once code is complete think carefully about the best way -to verify that it is good before it goes to production. We don't have a -dedicated QA cycle to flush out bugs so it's important that a change be -fully tested before it's marked "Ready to Merge." For any non-trivial -change consider enlisting a 'test buddy' to help review the code and -think of test cases that you may not have considered. Stability from -release to release is especially critical right now as we develop a -reputation in the futures world. - - Code Reviews +* Verification. Once code is complete it is the project's team job to +think carefully about the best way to verify that the work is solid +enough to go to production. We do not have a dedicated QA cycle to +flush out bugs so it is important for changes to be fully tested +before being marked ready to merge (RTM). For any non-trivial change +project teams should enlist a 'test buddy' from outside the team to +help review the code and think of test cases that they may not have +considered. Stability from release to release is especially critical +right now as we develop a reputation in the futures +world. Additionally, project teams are encouraged to make liberal use +of other testing techniques such as - Unit tests - System tests - Manual tests @@ -70,7 +71,7 @@ reputation in the futures world. that includes Pedro should be created (unless, as mentioned above, an early PR was already created in the development phase). Whether the PR already existed or not, its description should be changed to start -with the "Ready To Merge" statement. This marks the project as ready +with the RTM (Ready To Merge) acronym. This marks the project as ready to be merged into master. Once a week, typically on Mondays, Pedro will go through every PR marked as "Ready To Merge", build it, check it out and if everything looks good merge it to master. At the end of @@ -79,6 +80,3 @@ number. This version will be go through some additional testing by Brian and will then be deployed by Karl and Pete to customers throughout the rest of the week. -## Tools ## - * Pre-Merge checklist - * Code Review tutorial From cf3ef9323a5c2383e59a139d511232c91186339a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Feb 2019 20:14:17 +0000 Subject: [PATCH 069/218] dev_process.md edited online with Bitbucket --- doc/dev/dev_process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/dev/dev_process.md b/doc/dev/dev_process.md index 7324179af..b3736db48 100644 --- a/doc/dev/dev_process.md +++ b/doc/dev/dev_process.md @@ -35,7 +35,7 @@ rest of the project. *Nothing* has more impact on BTS's ability to quickly deliver value to customers than good specification work. A specification typically takes the form of a shared google docs using a mix of text and UI mock-ups to capture both user requirements and -suggested implementation strategies. Taha is responsible for this +suggested implementation strategies. Taha and Kevin are responsible for this phase. * Development. Once a specification is complete, a team of developers From e375274cbe4bcbd7c6602c2e097978f7671202a7 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 14:19:43 -0600 Subject: [PATCH 070/218] Updating release notes describing Floating Order Book --- doc/user/docs/release_notes.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index feae64b17..c6df2851c 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -1,8 +1,15 @@ # Release Notes ## 1.4.11 -### Ladder Usability Improvements - - Added a mini order book display on middle click of order badge +### New Features + - Floating Order Book + - The floating order book provides a quick view of orders occupying that price level + - Launch the Floating Order Book by middle-clicking a ladder badge + - Cancel orders by clicking on the red X in the Cancel column + - Quantity and Price modification + - Clicking on a row will select it, providing the option for changing your price and quantity + - Enter in a new value or use the up/down buttons to set a desired value + - Press the green checkbox to finalize your change and update the order ### SDK - Improved SDK documentation and usability From 16f1e568a584193e2cce9c24d4d2b87f7fe354e3 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 4 Feb 2019 14:20:50 -0600 Subject: [PATCH 071/218] release notes - words --- doc/user/docs/release_notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index c6df2851c..a3659e58a 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -3,7 +3,7 @@ ## 1.4.11 ### New Features - Floating Order Book - - The floating order book provides a quick view of orders occupying that price level + - The floating order book provides a quick view of orders occupying a price level in the ladder - Launch the Floating Order Book by middle-clicking a ladder badge - Cancel orders by clicking on the red X in the Cancel column - Quantity and Price modification From 5675c4e117bebade34a25de5094d091163e823b5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 5 Feb 2019 10:02:10 -0500 Subject: [PATCH 072/218] Renamed crack to detach. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/orderman/actors/order_manager/OrderServices.h | 4 ++-- src/lib/orderman/orders/IcebergOrder.cpp | 2 +- src/lib/orderman/orders/IcebergOrder.h | 2 +- src/lib/orderman/orders/NativeOrder.cpp | 2 +- src/lib/orderman/orders/NativeOrder.h | 2 +- src/lib/orderman/orders/Order.h | 6 +++--- src/lib/orderman/orders/TimeBoxOrder.cpp | 2 +- src/lib/orderman/orders/TimeBoxOrder.h | 2 +- .../orderman/orders/spreader_orders/ISpreaderStateWorker.h | 2 +- src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp | 6 +++--- src/lib/orderman/orders/spreader_orders/SpreaderOrder.h | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index afd768425..e3785a74c 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 66497e0ec..914ba5b15 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -380,11 +380,11 @@ class OrderServices { // Crack void crack() { call_with_reentrancy_guard( - [](OrderServices &self) { self._owner->on_crack(self._do_nothing); }); + [](OrderServices &self) { self._owner->on_detach(self._do_nothing); }); } void crack(OrderOpCallback const &on_order_op) { call_with_reentrancy_guard([on_order_op](OrderServices &self) { - self._owner->on_crack(on_order_op); + self._owner->on_detach(on_order_op); }); } diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index bcd08eda5..a8a57e1e8 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -184,7 +184,7 @@ OrderOpResult IcebergOrder::on_update(api::orderman::Update const &) { return OrderOpResult{}; } -OrderOpResult IcebergOrder::on_crack() { +OrderOpResult IcebergOrder::on_detach() { return OrderOpResult{}; } diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index 6281d350f..41e20296e 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -23,7 +23,7 @@ public: OrderOpResult on_activate(Price,Quantity,OrderServices &) override ; OrderOpResult on_update(Price , Quantity) override ; OrderOpResult on_update(api::orderman::Update const&update) override; - OrderOpResult on_crack() override ; + OrderOpResult on_detach() override ; OrderOpResult on_cancel() override ; private: diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index e775305b3..b5c40181d 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -586,7 +586,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q) { return OrderOpResult{}; } -OrderOpResult NativeOrder::on_crack() { +OrderOpResult NativeOrder::on_detach() { return OrderOpResult{}; } diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 5a12b317e..86f7c90df 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -26,7 +26,7 @@ class NativeOrder : public Order { OrderOpResult on_activate(Price, Quantity, OrderServices &) override; OrderOpResult on_update(Price, Quantity) override; - OrderOpResult on_crack() override; + OrderOpResult on_detach() override; OrderOpResult on_cancel() override; api::orderman::OrderDefinition diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index c1bd2277d..c45ff4ecb 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -76,9 +76,9 @@ class Order { "Not implemented"}; } - // Crack - virtual void on_crack(OrderOpCallback const &cb) { cb(on_crack()); } - virtual OrderOpResult on_crack() { + // Detach + virtual void on_detach(OrderOpCallback const &cb) { cb(on_detach()); } + virtual OrderOpResult on_detach() { return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, "Not implemented"}; } diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index ac37f5007..ef90a67a0 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -185,7 +185,7 @@ OrderOpResult TimeBoxOrder::on_update(Price p, Quantity q) { return OrderOpResult{}; } -OrderOpResult TimeBoxOrder::on_crack() { +OrderOpResult TimeBoxOrder::on_detach() { return OrderOpResult{}; } diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index 5de5c834a..054c78b4c 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -21,7 +21,7 @@ public: const PreActivationOrderServices &) override; OrderOpResult on_activate(Price,Quantity,OrderServices &) override ; OrderOpResult on_update(Price , Quantity) override ; - OrderOpResult on_crack() override ; + OrderOpResult on_detach() override ; OrderOpResult on_cancel() override ; private: diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index 664e00922..325d44b7a 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -56,6 +56,6 @@ public: virtual void on_quoter_irrecoverable_error() = 0; // 16. when the spreader order is cracked, setting the // child orders free - virtual void on_crack () {} + virtual void on_detach () {} }; }} diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index d8283be73..baca509a9 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -89,10 +89,10 @@ OrderOpResult SpreaderOrder::on_cancel(){ _report_state(); return OrderOpResult {}; } -OrderOpResult SpreaderOrder::on_crack(){ +OrderOpResult SpreaderOrder::on_detach(){ if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED}; - LOG(OrderMan, Info, "SpreaderOrder.on_crack key: {}", key().value()); - _state_worker->on_crack(); + LOG(OrderMan, Info, "SpreaderOrder.on_detach key: {}", key().value()); + _state_worker->on_detach(); _report_state(); return OrderOpResult {}; } diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 11b1fa5b8..06400fcf9 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -119,7 +119,7 @@ public: OrderOpResult on_cancel() override; // crack means to let the lower level orders lose from the higher // level order and cancel the higher level order - OrderOpResult on_crack() override; + OrderOpResult on_detach() override; // ISpreaderManager //////////////////// //////////////////////////////////////// public: From 5bed54c953f31371cfe9ddd13b34dac253bd1875 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 8 Feb 2019 09:10:01 -0500 Subject: [PATCH 073/218] More SDK work. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/OrderService.proto | 1 + .../actors/order_manager/OrderBuilder.h | 14 +- src/lib/orderman/core/IOrderServices.cpp | 2 +- .../orderman/order_factory/IOrderFactory.h | 2 + src/lib/orderman/orders/IcebergOrder.cpp | 2 +- src/lib/orderman/orders/IcebergOrder2.cpp | 160 ++++++++++++++++++ src/lib/orderman/orders/IcebergOrder2.h | 53 ++++++ src/lib/orderman/orders/TimeBoxOrder.cpp | 2 +- src/lib/orderman/orders/TriggerOrder.cpp | 2 +- .../orderman/orders/book_algos/BookAlgo.cpp | 4 +- .../SpreaderOrderBuilder.cpp | 4 +- src/sdk/examples/order_plugin_example.cpp | 2 +- 13 files changed, 238 insertions(+), 12 deletions(-) create mode 100644 src/lib/orderman/orders/IcebergOrder2.cpp create mode 100644 src/lib/orderman/orders/IcebergOrder2.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index e3785a74c..87295f644 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/IcebergOrder2.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index ee6acddbf..23637e201 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -109,6 +109,7 @@ message StopLimitOrderDefinition { } message IcebergOrderDefinition { double show_quantity = 1; + uint32 pause_between_orders_ms = 3; CustomOrderDefinition child = 2; } message SpreaderOrderDefinition { diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 1a446d59e..92b1a1161 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -21,7 +21,7 @@ class OrderBuilder { OrderBuilder(OrderBuilder &&src) { operator=(std::move(src)); } OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, - PreActivationOrderServices const &srv, size_t reserve_sz = 1) + IOrderFactory &factory, size_t reserve_sz = 1) : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), _order_stash(), _builder_id(++_current_builder_id), _order_services(nullptr) @@ -30,7 +30,17 @@ class OrderBuilder { bts_assert(parent_key != null_order_key()); while (_order_stash.size() != reserve_sz) _order_stash.push_back( - &srv.order_factory.create(parent_key, _definition)); + &factory.create(parent_key, _definition)); + } + + OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, + size_t reserve_sz = 1) + : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), + _order_stash(), _builder_id(++_current_builder_id), + _order_services(nullptr) + + { + bts_assert(parent_key != null_order_key()); } void activate(OrderServices &order_services) { diff --git a/src/lib/orderman/core/IOrderServices.cpp b/src/lib/orderman/core/IOrderServices.cpp index 47bb48912..d2640c03f 100644 --- a/src/lib/orderman/core/IOrderServices.cpp +++ b/src/lib/orderman/core/IOrderServices.cpp @@ -1 +1 @@ -#include "lib/orderman/core/IOrderServices.h" +//#include "lib/orderman/core/IOrderServices.h" diff --git a/src/lib/orderman/order_factory/IOrderFactory.h b/src/lib/orderman/order_factory/IOrderFactory.h index 70557bf26..80cc9207b 100644 --- a/src/lib/orderman/order_factory/IOrderFactory.h +++ b/src/lib/orderman/order_factory/IOrderFactory.h @@ -18,6 +18,8 @@ namespace orderman { inline OrderKey null_order_key() {return OrderKey(0);} + + class IOrderFactory { public: diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index a8a57e1e8..a9a80020d 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -68,7 +68,7 @@ void IcebergOrder::on_init_new(api::orderman::OrderDefinition const &def, *child_def.mutable_custom_def() = iceberg_def.child(); if (me->show_quantity.value() != 0) { me->child_builder = OrderBuilder( - key(), child_def, services, + key(), child_def, services.order_factory, std::max((size_t)1, (size_t)(me->show_quantity).value() / 10)); transition(ORDER_STATUS_INACTIVE); } else { diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp new file mode 100644 index 000000000..b1a782911 --- /dev/null +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -0,0 +1,160 @@ +// #include "IcebergOrder2.h" +// #include "lib/orderman/actors/order_manager/ChildOrder.h" +// #include "lib/orderman/actors/order_manager/OrderBuilder.h" + +// namespace bts { +// namespace orderman { + +// using namespace api::orderman; + +// enum class IcebergOrder2::State { PAUSED, WORKING, COMPLETED }; + +// struct IcebergOrder2::ActiveChild { +// ActiveChild() {} +// ChildOrder order; + +// OrderState state; +// OrderKey key; +// void clear() { +// state = OrderState(); +// key = null_order_key(); +// } +// }; + +// struct IcebergOrder2::PImpl { +// OrderServices *services = nullptr; +// OrderDefinition def; +// OrderState order_state; +// OrderBuilder child_builder; +// ActiveChild child; +// State state = State::PAUSED; +// TimeStamp start_of_pause = Timer::now(); +// uint32_t ms_pause_between_orders = 0; +// }; + +// IcebergOrder2::IcebergOrder2() : me(new PImpl()) {} +// IcebergOrder2::~IcebergOrder2() {} + +// void IcebergOrder2::on_init_new(OrderDefinition const &def, +// const PreActivationOrderServices &services) { +// // Save our order definition +// me->def = def; + +// // Initialize mutable iceberg component of our state report +// me->order_state.mutable_iceberg(); + +// auto &ib = iceberg_def(); + +// if (ib.show_quantity() == 0) { +// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, +// "Show quantity must be greater than 0"); +// return; +// } + +// initialize_child_builder(services.order_factory); +// } + +// void IcebergOrder2::on_init_recovered(OrderRecord const &rec, +// const PreActivationOrderServices &) { +// auto const &def = rec.def(); +// me->def = def; +// me->order_state = rec.state(); + +// switch (me->order_state.status()) { + +// case ORDER_STATUS_WORKING: +// case ORDER_STATUS_DISCONNECTED: +// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, +// "System restarted with active iceberg order"); +// break; + +// // terminal states +// case ORDER_STATUS_ERROR: +// case ORDER_STATUS_REJECTED_BY_SPARK: +// case ORDER_STATUS_COMPLETED: +// case ORDER_STATUS_CANCELED: +// transition(State::COMPLETED, rec.state().status(), +// rec.state().last_msg()); +// break; + +// case ORDER_STATUS_PENDING_WORKING: +// case ORDER_STATUS_INACTIVE: +// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: +// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: +// bts_assert(false); +// break; +// } +// } + +// OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, OrderServices &services) { +// bts_assert(!me->services); +// me->services = &services; +// me->child_builder.activate(services); + +// switch (me->state) { +// case State::PAUSED: +// me->order_state.set_price(p.value()); +// me->order_state.set_quantity(q.value()); +// services.subscribe_to_time( +// [this](auto const &time) { this->on_time(time); }); +// services.subscribe_to_child_updates( +// [this](auto const &os) { this->on_child_order_update(os); }); +// send_next_child_order(); +// break; + +// case State::COMPLETED: +// break; +// case State::WORKING: +// bts_assert(false); +// break; +// } +// report_state(); +// cb(OrderOpResult{}); +// } + +// OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { +// switch (me->state) { +// case State::PAUSED: +// case State::WORKING: +// if (update.has_custom() && !update.custom().has_iceberg()) +// cb(OrderOpResult{ORDER_ERROR_INVALID_OP, +// "Update is not valid for this order type"}); +// else { +// auto &ib_update = update.custom().iceberg(); +// if (ib_update.show_quantity() == 0) +// cb(OrderOpResult{ORDER_ERROR_INVALID_OP, +// "Show quantity must be greater than 0"}); +// else { + +// me->order_state.set_price(update.price()); +// me->order_state.set_quantity(update.quantity()); +// } + + +// break; + +// case State::COMPLETED: +// break; +// break; +// } +// } + +// IcebergOrderDefinition &IcebergOrder2::iceberg_def() { +// return *me->def.mutable_custom_def()->mutable_iceberg(); +// } + +// void IcebergOrder2::initialize_child_builder(IOrderFactory &of) { +// // Copy parent definition to child, so the child inherits all the +// // standard properties of the parent (side, security, TIF, etc) +// auto child_def = me->def; +// // Copy the custom part of the child order definition to our child +// *child_def.mutable_custom_def() = iceberg_def().child(); + +// // Build our child builder +// me->child_builder = OrderBuilder(key(), child_def, of, 1); +// if (me->services) +// me->child_builder.activate(*me->services); +// } + +// } // namespace orderman +// } // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h new file mode 100644 index 000000000..ffe0e7975 --- /dev/null +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -0,0 +1,53 @@ +#pragma once + +#include "lib/api/services/OrderService.server.pb.h" +#include "lib/orderman/orders/Order.h" +#include + +namespace bts { +namespace api { +namespace orderman { +class IcebergOrderDefinition; +} +} // namespace api +} // namespace bts + +namespace bts { +namespace mercury { +class TimerEvent; +} +namespace orderman { + +class OrderStateUpdateEvent; +class IOrderFactory; + +class IcebergOrder2 : public Order { + public: + IcebergOrder2(); + ~IcebergOrder2(); + void on_init_new(api::orderman::OrderDefinition const &, + const PreActivationOrderServices &) override; + void on_init_recovered(api::orderman::OrderRecord const &, + const PreActivationOrderServices &) override; + OrderOpResult on_activate(Price, Quantity, OrderServices &) override; + OrderOpResult on_update(api::orderman::Update const &) override; + OrderOpResult on_detach() override; + OrderOpResult on_cancel() override; + + private: + + enum class State; + struct ActiveChild; + struct PImpl; + std::unique_ptr me; + api::orderman::IcebergOrderDefinition &iceberg_def(); + void initialize_child_builder(IOrderFactory&); + void transition(State state, api::orderman::OrderStatus,std::string const&msg=""); + void on_time(mercury::TimerEvent const &t); + void on_child_order_update(OrderStateUpdateEvent const &ev); + void report_state(); + void send_next_child_order(); +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index ef90a67a0..1231103a0 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -43,7 +43,7 @@ void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def, *child_def.mutable_custom_def() = timebox_def.child(); if (me->start_time.seconds() > utils::pb::pb_now().seconds() && me->stop_time.seconds() > me->start_time.seconds()) { - me->child_builder = OrderBuilder(key(), child_def, services, 1); + me->child_builder = OrderBuilder(key(), child_def, services.order_factory, 1); transition(ORDER_STATUS_INACTIVE); } else { auto msg = fmt::format("Invalid time"); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 510864dde..0461be0c3 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -314,7 +314,7 @@ bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition &order_def, child_order_def.set_security_key( trigger_order_def.trigger_action().security_id()); child_order_def.mutable_custom_def()->CopyFrom(trigger_order_def.child()); - me->order_builder = OrderBuilder(key(), child_order_def, pre_os); + me->order_builder = OrderBuilder(key(), child_order_def, pre_os.order_factory); const auto *sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); me->tick_size = std::min(sec_ptr->contract_spec().low_tick(), diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index e89c69532..383eb01e1 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -90,12 +90,12 @@ void BookAlgo::on_init_new(const api::orderman::OrderDefinition &def, me->child_state.set_status(ORDER_STATUS_INACTIVE); OrderDefinition child_def = def; setup_child(def, services, me->child_state, &child_def); - me->child_builder = OrderBuilder(key(), child_def, services, 1); + me->child_builder = OrderBuilder(key(), child_def, services.order_factory, 1); OrderDefinition hedge_def = def; me->supports_hedge = setup_hedge(def, services, &hedge_def); if (me->supports_hedge) - me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); + me->hedge_builder = OrderBuilder(key(), hedge_def, services.order_factory, 4); const bts::api::Security *sec = services.sec_db.resolve(SecurityKey(def.security_key())); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp index 4a4fda9d7..b746a9178 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp @@ -11,7 +11,7 @@ SpreaderOrderBuilder::SpreaderOrderBuilder (bts::orderman::OrderKey parent_key, _is_live(spreader_pao_services.is_live()){ if (_is_live){ LOG(OrderMan, Info, "SpreaderOrderBuilder.cons parent_key: {} sec_key: {}", parent_key, order_def.security_key()); - _real_order_builder = bts::orderman::OrderBuilder(parent_key, order_def, spreader_pao_services.pre_services(), reserve_sz); + _real_order_builder = bts::orderman::OrderBuilder(parent_key, order_def, spreader_pao_services.pre_services().order_factory, reserve_sz); } } SpreaderOrderBuilder::SpreaderOrderBuilder(SpreaderOrderBuilder&&) @@ -33,4 +33,4 @@ void SpreaderOrderBuilder::activate(SpreaderOrderServices& order_services){ if (_is_live) _real_order_builder.activate(order_services.order_services()); } -}} \ No newline at end of file +}} diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 349a5989c..c46800910 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -81,7 +81,7 @@ void DynamicIcebergOrder::on_init_new( iceberg_def.order_params().at("child").as_order_def(); if (me->show_quantity.value() != 0) { me->child_builder = OrderBuilder( - key(), child_def, services, + key(), child_def, services.order_factory, std::max((size_t)1, (size_t)(me->show_quantity).value() / 10)); transition(ORDER_STATUS_INACTIVE); } else { From ad37a652c5c86ec98fdde23230d928a479344fb8 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Feb 2019 16:47:58 -0500 Subject: [PATCH 074/218] Refactor --- src/lib/orderman/events/DetachOrderEvent.h | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/lib/orderman/events/DetachOrderEvent.h diff --git a/src/lib/orderman/events/DetachOrderEvent.h b/src/lib/orderman/events/DetachOrderEvent.h new file mode 100644 index 000000000..5efd60408 --- /dev/null +++ b/src/lib/orderman/events/DetachOrderEvent.h @@ -0,0 +1,25 @@ +#pragma once + +#include + +#include "lib/mercury/events/Event.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" + +namespace bts { +namespace orderman { + +class DetachOrderEvent : public mercury::Event { + public: + using SynopsisPolicy = mercury::NoSynopsis; + + DetachOrderEvent(uint32_t req_id, OrderKey k) + : req_id(req_id), k(k) {} + + uint32_t req_id; + // used by ContentSubscription + OrderKey key() const { return k; } + OrderKey k; +}; +} // namespace orderman +} // namespace bts From 836301e75f35fa29efa3743179fe3b6eefba2bed Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Feb 2019 16:48:17 -0500 Subject: [PATCH 075/218] Iceberg with update --- src/lib/api/services/OrderService.proto | 2 +- .../actors/order_manager/ChildOrder.h | 12 +- .../actors/order_manager/OrderManager.cpp | 10 +- .../actors/order_manager/OrderManager.h | 8 +- .../actors/order_manager/OrderServices.h | 9 +- .../actors/order_manager/OrderServicesData.h | 2 +- src/lib/orderman/orders/IcebergOrder2.cpp | 461 +++++++++++++----- src/lib/orderman/orders/IcebergOrder2.h | 7 +- 8 files changed, 354 insertions(+), 157 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 23637e201..ddd2f512f 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -21,7 +21,7 @@ service OrderService { rpc update_order(Update) returns (Response) { option(skip_excel_generation) = true; }; - rpc crack_order(Crack) returns (Response) + rpc detach_order(Crack) returns (Response) { option(skip_excel_generation) = true; }; rpc get_registered_dynamic_order_types(bts.api.VoidMessage) diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 7052eaffe..603691055 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -102,22 +102,22 @@ class ChildOrder { } // End Update - // Crack - void crack() { + // Detach + void detach() { bts_assert(_order); bts_assert(_active); - _child_order_services->crack(); + _child_order_services->detach(); } - template void crack(CB const &on_result) { + template void detach(CB const &on_result) { bts_assert(_order); bts_assert(_active); auto on_result_w = [this, on_result](OrderOpResult const &r) { _parent_order_services->call_with_reentrancy_guard( [r, on_result](auto const &) { on_result(r); }); }; - _child_order_services->crack(on_result); + _child_order_services->detach(on_result); } - // End Crack + // End Detach // Cancel void cancel() { diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 7d2ec70ed..d2fbd3168 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -276,7 +276,7 @@ void OrderManager::on_cancel_order(const mercury::Update &m) { } } -void OrderManager::on_crack_order(const mercury::Update &m) { +void OrderManager::on_detach_order(const mercury::Update &m) { if (m.events) for (auto const &ev : *m.events) { auto k = ev.key(); @@ -289,13 +289,13 @@ void OrderManager::on_crack_order(const mercury::Update &m) { }; if (it != me->orders.end()) - it->second->_services->crack(on_order_op_result); + it->second->_services->detach(on_order_op_result); else { on_order_op_result(OrderOpResult{ api::orderman::ORDER_ERROR_UNKNOWN_ORDER, "Unknown Order"}); LOG(OrderMan, Error, - "Received a crack request for an unknown order {}. " + "Received a detach request for an unknown order {}. " "This should not happen and likely indicates a serious bug. ", ev.key().value()); } @@ -436,8 +436,8 @@ void OrderManager::init_order_services() { [this](auto const &ev) { this->on_update_order(ev); }); subscribe( [this](auto const &ev) { this->on_cancel_order(ev); }); - subscribe( - [this](auto const &ev) { this->on_crack_order(ev); }); + subscribe( + [this](auto const &ev) { this->on_detach_order(ev); }); // Clock subscribe( diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index 2489f5b11..461705c1f 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -6,7 +6,7 @@ #include "lib/mercury/actors/IPollableActor.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" -#include "lib/orderman/events/CrackOrderEvent.h" +#include "lib/orderman/events/DetachOrderEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/utils/inplace_function.h" @@ -26,7 +26,7 @@ class NewExecutionReportEvent; class ActivateOrderEvent; class UpdateOrderEvent; class CancelOrderEvent; -class CrackOrderEvent; +class DetachOrderEvent; class StoredOrderEvent; class StoredFillEvent; class OrderServices; @@ -57,7 +57,7 @@ namespace orderman { // Additionally handles order maintenance events: // - create // - cancel -// - crack +// - detach // - update class OrderManager : public mercury::Actor, public mercury::IPollableActor { @@ -78,7 +78,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void on_activate_order(const mercury::Update &); void on_update_order(const mercury::Update &); void on_cancel_order(const mercury::Update &); - void on_crack_order(const mercury::Update &); + void on_detach_order(const mercury::Update &); void on_new_fix_buffer(const mercury::Update &); void on_gateway_state(const mercury::Update &); void on_timer(const mercury::Update &); diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 914ba5b15..d8290fc4c 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -132,6 +132,7 @@ class OrderServices { } securities::ISecurityDB &sec_db() { return _data->sec_db; } + IOrderFactory &order_factory() { return _data->order_factory; } mercury::TimeStampStr const &get_time_str() const { return _data->last_timer_ev.ts_str; @@ -318,8 +319,6 @@ class OrderServices { } } - IOrderFactory &order_factory() { return _data->order_factory; } - using CreateOrderReplySubID = EventStream::SubID; template @@ -377,12 +376,12 @@ class OrderServices { }); } - // Crack - void crack() { + // Detach + void detach() { call_with_reentrancy_guard( [](OrderServices &self) { self._owner->on_detach(self._do_nothing); }); } - void crack(OrderOpCallback const &on_order_op) { + void detach(OrderOpCallback const &on_order_op) { call_with_reentrancy_guard([on_order_op](OrderServices &self) { self._owner->on_detach(on_order_op); }); diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 00c50cb98..97c47acb8 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -14,7 +14,7 @@ #include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CancelRejectEvent.h" -#include "lib/orderman/events/CrackOrderEvent.h" +#include "lib/orderman/events/DetachOrderEvent.h" #include "lib/orderman/events/CreateFIXBufferReplyEvent.h" #include "lib/orderman/events/CreateFIXBufferRequestEvent.h" #include "lib/orderman/events/CreateOrderReplyEvent.h" diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index b1a782911..58e12968e 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -1,160 +1,355 @@ -// #include "IcebergOrder2.h" -// #include "lib/orderman/actors/order_manager/ChildOrder.h" -// #include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "IcebergOrder2.h" +#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/actors/order_manager/OrderBuilder.h" -// namespace bts { -// namespace orderman { +#include -// using namespace api::orderman; +namespace bts { +namespace orderman { -// enum class IcebergOrder2::State { PAUSED, WORKING, COMPLETED }; +using namespace api::orderman; +enum class IcebergOrder2::State { PAUSED, WORKING, COMPLETED }; -// struct IcebergOrder2::ActiveChild { -// ActiveChild() {} -// ChildOrder order; +struct IcebergOrder2::ActiveChild { + ActiveChild() {} + ChildOrder order; -// OrderState state; -// OrderKey key; -// void clear() { -// state = OrderState(); -// key = null_order_key(); -// } -// }; + OrderState state; + OrderKey key; + void clear() { + state = OrderState(); + key = null_order_key(); + } +}; -// struct IcebergOrder2::PImpl { -// OrderServices *services = nullptr; -// OrderDefinition def; -// OrderState order_state; -// OrderBuilder child_builder; -// ActiveChild child; -// State state = State::PAUSED; -// TimeStamp start_of_pause = Timer::now(); -// uint32_t ms_pause_between_orders = 0; -// }; +struct IcebergOrder2::PImpl { + OrderServices *services = nullptr; + OrderDefinition def; + OrderState order_state; + OrderBuilder child_builder; + ActiveChild child; + State state = State::PAUSED; + TimeStamp start_of_pause = Timer::now(); + uint32_t ms_pause_between_orders = 0; +}; -// IcebergOrder2::IcebergOrder2() : me(new PImpl()) {} -// IcebergOrder2::~IcebergOrder2() {} +IcebergOrder2::IcebergOrder2() : me(new PImpl()) {} +IcebergOrder2::~IcebergOrder2() {} -// void IcebergOrder2::on_init_new(OrderDefinition const &def, -// const PreActivationOrderServices &services) { -// // Save our order definition -// me->def = def; +void IcebergOrder2::on_init_new(OrderDefinition const &def, + const PreActivationOrderServices &services) { + // Save our order definition + me->def = def; -// // Initialize mutable iceberg component of our state report -// me->order_state.mutable_iceberg(); + // Initialize mutable iceberg component of our state report + me->order_state.mutable_iceberg(); -// auto &ib = iceberg_def(); + auto &ib = iceberg_def(); -// if (ib.show_quantity() == 0) { -// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, -// "Show quantity must be greater than 0"); -// return; -// } + if (ib.show_quantity() == 0) { + transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, + "Show quantity must be greater than 0"); + return; + } -// initialize_child_builder(services.order_factory); -// } + initialize_child_builder(services.order_factory); +} -// void IcebergOrder2::on_init_recovered(OrderRecord const &rec, -// const PreActivationOrderServices &) { -// auto const &def = rec.def(); -// me->def = def; -// me->order_state = rec.state(); +void IcebergOrder2::on_init_recovered(OrderRecord const &rec, + const PreActivationOrderServices &) { + auto const &def = rec.def(); + me->def = def; + me->order_state = rec.state(); -// switch (me->order_state.status()) { + switch (me->order_state.status()) { -// case ORDER_STATUS_WORKING: -// case ORDER_STATUS_DISCONNECTED: -// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, -// "System restarted with active iceberg order"); -// break; + case ORDER_STATUS_WORKING: + case ORDER_STATUS_DISCONNECTED: + transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, + "System restarted with active iceberg order"); + break; -// // terminal states -// case ORDER_STATUS_ERROR: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_COMPLETED: -// case ORDER_STATUS_CANCELED: -// transition(State::COMPLETED, rec.state().status(), -// rec.state().last_msg()); -// break; + // terminal states + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + transition(State::COMPLETED, rec.state().status(), + rec.state().last_msg()); + break; -// case ORDER_STATUS_PENDING_WORKING: -// case ORDER_STATUS_INACTIVE: -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } -// } + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } +} -// OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, OrderServices &services) { -// bts_assert(!me->services); -// me->services = &services; -// me->child_builder.activate(services); +OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, + OrderServices &services) { + bts_assert(!me->services); + me->services = &services; + me->child_builder.activate(services); -// switch (me->state) { -// case State::PAUSED: -// me->order_state.set_price(p.value()); -// me->order_state.set_quantity(q.value()); -// services.subscribe_to_time( -// [this](auto const &time) { this->on_time(time); }); -// services.subscribe_to_child_updates( -// [this](auto const &os) { this->on_child_order_update(os); }); -// send_next_child_order(); -// break; + switch (me->state) { + case State::PAUSED: + me->order_state.set_price(p.value()); + me->order_state.set_quantity(q.value()); + if (q.value()) { + services.subscribe_to_time( + [this](auto const &time) { this->on_time(time); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + send_next_child_order(); + } else + transition(State::COMPLETED, ORDER_STATUS_COMPLETED); + case State::COMPLETED: + break; + case State::WORKING: + bts_assert(false); + break; + } + report_state(); + return OrderOpResult{}; +} -// case State::COMPLETED: -// break; -// case State::WORKING: -// bts_assert(false); -// break; -// } -// report_state(); -// cb(OrderOpResult{}); -// } +OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { + auto result = OrderOpResult{}; -// OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { -// switch (me->state) { -// case State::PAUSED: -// case State::WORKING: -// if (update.has_custom() && !update.custom().has_iceberg()) -// cb(OrderOpResult{ORDER_ERROR_INVALID_OP, -// "Update is not valid for this order type"}); -// else { -// auto &ib_update = update.custom().iceberg(); -// if (ib_update.show_quantity() == 0) -// cb(OrderOpResult{ORDER_ERROR_INVALID_OP, -// "Show quantity must be greater than 0"}); -// else { - -// me->order_state.set_price(update.price()); -// me->order_state.set_quantity(update.quantity()); -// } - + switch (me->state) { + case State::PAUSED: + case State::WORKING: + if (update.has_custom() && !update.custom().has_iceberg()) { + result = OrderOpResult{ORDER_ERROR_INVALID_OP, + "Update is not valid for this order type"}; + break; + } -// break; + if (update.has_custom()) { + auto &ib_update = update.custom().iceberg(); + if (ib_update.show_quantity() == 0) { + result = OrderOpResult{ORDER_ERROR_INVALID_OP, + "Show quantity must be greater than 0"}; + break; + } + *me->def.mutable_custom_def() = update.custom(); + me->services->report_definition(me->def.custom_def()); + initialize_child_builder(me->services->order_factory()); + } + me->order_state.set_price(update.price()); + me->order_state.set_quantity(update.quantity()); + break; -// case State::COMPLETED: -// break; -// break; -// } -// } + case State::COMPLETED: + result = + OrderOpResult{ORDER_ERROR_INVALID_OP, "Order is already completed"}; + break; + } + report_state(); + return result; +} -// IcebergOrderDefinition &IcebergOrder2::iceberg_def() { -// return *me->def.mutable_custom_def()->mutable_iceberg(); -// } +void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { + switch (me->state) { + case State::PAUSED: + + if (ev.key == me->child.key) { + me->child.state = ev.rebuild_state(); -// void IcebergOrder2::initialize_child_builder(IOrderFactory &of) { -// // Copy parent definition to child, so the child inherits all the -// // standard properties of the parent (side, security, TIF, etc) -// auto child_def = me->def; -// // Copy the custom part of the child order definition to our child -// *child_def.mutable_custom_def() = iceberg_def().child(); + switch (ev.status) { -// // Build our child builder -// me->child_builder = OrderBuilder(key(), child_def, of, 1); -// if (me->services) -// me->child_builder.activate(*me->services); -// } + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + // nothing to do but report new state + break; -// } // namespace orderman -// } // namespace bts + case ORDER_STATUS_COMPLETED: { + api::orderman::OrderState merged_state; + merge_states(me->order_state, me->child.state, &merged_state); + me->order_state = merged_state; + me->child.clear(); + if (me->state.quantity() > me->state.filled_quantity()) { + if (me->pause_between_orders) { + me->working_sub_status = WorkingSubStatus::PAUSED; + me->start_of_pause = Timer::now(); + } else + send_next_child_order(); + } else + transition(ORDER_STATUS_COMPLETED); + break; + } + + case ORDER_STATUS_CANCELED: + LOG(OrderMan, Info, + "Unexpected cancel of child {} in Iceberg Order {}. Canceling " + "parent", + ev.key.value(), key().value()); + transition(ORDER_STATUS_CANCELED); + break; + + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_ERROR: + me->child.clear(); + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; + + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + + } else { + LOG(OrderMan, Info, + "Iceberg order {} received update for non active child order {}." + "update state = {}", + key().value(), me->child.key.value(), + utils::pb::to_string(ev.rebuild_state())); + } + break; + + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_COMPLETED: + break; + + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); +} + +void IcebergOrder2::transition(State state, api::orderman::OrderStatus status, + std::string const &msg) { + LOG(OrderMan, Info, "Transitioning iceberg order {} from {} to {}", + key().value(), std::string(state_name(me->state)), + std::string(state_name(state))); + me->state = state; + me->order_state.set_status(status); + me->order_state.set_last_msg(msg); +} + +void IcebergOrder2::report_state() { + if (me->child.state.filled_quantity()) { + api::orderman::OrderState merged_state; + merge_states(me->order_state, me->child.state, &merged_state); + me->services->report_state(merged_state); + } else + me->services->report_state(me->order_state); +} + +IcebergOrderDefinition &IcebergOrder2::iceberg_def() { + return *me->def.mutable_custom_def()->mutable_iceberg(); +} + +OrderOpResult IcebergOrder2::on_cancel() { + switch (me->state) { + case State::PAUSED: + transition(State::COMPLETED, ORDER_STATUS_CANCELED); + return OrderOpResult{}; + case State::WORKING: + me->child.order.cancel(); + transition(State::COMPLETED, ORDER_STATUS_CANCELED); + return OrderOpResult{}; + case State::COMPLETED: + return OrderOpResult{ORDER_ERROR_INVALID_OP, + "Order is already completed"}; + } +} + +void IcebergOrder2::send_next_child_order() { + bts_assert(me->order_state.quantity() > me->order_state.filled_quantity()); + + auto remaining = + me->order_state.quantity() - me->order_state.filled_quantity(); + auto to_send = std::min(remaining, (uint32_t)iceberg_def().show_quantity()); + + me->child.order = me->child_builder.build(); + me->child.key = me->child.order.key(); + + LOG(OrderMan, Info, + "Iceberg order {} creating new child order {} with size " + "{} price {}. Filled {} so far out of {}", + key().value(), me->child.key.value(), to_send, me->order_state.price(), + me->order_state.filled_quantity(), me->order_state.quantity()); + + me->child.order.activate( + Price(me->order_state.price()), Quantity(to_send), + [this](auto const &op) { this->on_order_op_completed(op); }); +} + +void IcebergOrder2::on_order_op_completed(OrderOpResult r) { + if (r.error == ORDER_ERROR_OK) + return; + + switch (me->state) { + case State::PAUSED: + transition(State::COMPLETED, ORDER_STATUS_ERROR, + std::string ("Child order operation failed: ") + + r.error_msg); + break; + case State::WORKING: + me->child.order.cancel(); + transition(State::COMPLETED, ORDER_STATUS_ERROR, + std::string ("Child order operation failed: ") + + r.error_msg); + break; + case State::COMPLETED: + break; + } +} + +void IcebergOrder2::initialize_child_builder(IOrderFactory &of) { + // Copy parent definition to child, so the child inherits all the + // standard properties of the parent (side, security, TIF, etc) + auto child_def = me->def; + // Copy the custom part of the child order definition to our child + *child_def.mutable_custom_def() = iceberg_def().child(); + + // Build our child builder + me->child_builder = OrderBuilder(key(), child_def, of, 1); + if (me->services) + me->child_builder.activate(*me->services); +} + +void IcebergOrder2::merge_states(api::orderman::OrderState const &iceberg_state, + api::orderman::OrderState const &child_state, + api::orderman::OrderState *merged) { + auto child_order_fills = child_state.filled_quantity(); + auto child_order_avg_price = child_state.avg_price(); + auto child_order_last_price = child_state.last_price(); + + auto iceberg_fills = iceberg_state.filled_quantity(); + auto iceberg_avg_price = iceberg_state.avg_price(); + + *merged = iceberg_state; + merged->set_filled_quantity(child_order_fills + iceberg_fills); + merged->set_last_price(child_order_last_price); + merged->set_avg_price((child_order_fills * child_order_avg_price + + iceberg_fills * iceberg_avg_price) / + (child_order_fills + iceberg_fills)); +} + +const char *IcebergOrder2::state_name(State st) { + switch (st) { + case State::PAUSED: + return "PAUSED"; + case State::COMPLETED: + return "COMPLETED"; + case State::WORKING: + return "WORKING"; + } +} + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h index ffe0e7975..f22297007 100644 --- a/src/lib/orderman/orders/IcebergOrder2.h +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -31,11 +31,9 @@ class IcebergOrder2 : public Order { const PreActivationOrderServices &) override; OrderOpResult on_activate(Price, Quantity, OrderServices &) override; OrderOpResult on_update(api::orderman::Update const &) override; - OrderOpResult on_detach() override; OrderOpResult on_cancel() override; private: - enum class State; struct ActiveChild; struct PImpl; @@ -47,6 +45,11 @@ class IcebergOrder2 : public Order { void on_child_order_update(OrderStateUpdateEvent const &ev); void report_state(); void send_next_child_order(); + const char* state_name (State); + void merge_states(api::orderman::OrderState const &iceberg_state, + api::orderman::OrderState const &child_state, + api::orderman::OrderState *merged); + void on_order_op_completed(OrderOpResult); }; } // namespace orderman From 198e76f722930e8d3431fb90313e49f104a25906 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Feb 2019 17:52:26 -0500 Subject: [PATCH 076/218] Renamed crack detach. --- src/client/spark/Orders/OrdersModel.cs | 10 +- src/client/spark/core/Bus/SparkTags.cs | 2 +- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 6 +- src/lib/api/services/OrderService.proto | 4 +- src/lib/orderman/actors/ServiceBridge.cpp | 10 +- src/lib/orderman/actors/ServiceBridge.h | 4 +- src/lib/orderman/events/CrackOrderEvent.h | 4 +- src/lib/orderman/orders/IcebergOrder2.cpp | 606 +++++++++--------- .../orderman/orders/book_algos/BookAlgo.cpp | 4 +- .../orders/spreader_orders/SpreaderOrder.h | 2 +- .../orderman/server/OrderServiceServer.cpp | 8 +- src/lib/orderman/server/OrderServiceServer.h | 2 +- 12 files changed, 331 insertions(+), 331 deletions(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index eba27fea3..461e2c015 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -67,7 +67,7 @@ namespace mbts.spark { _bus.subscribe(SparkTags.CreateOrder).Subscribe(a => send_order(a.definition, a.price, a.size).ignore()), _bus.subscribe(SparkTags.RecreateOrder).Subscribe(a => a.ForEach(x => send_order(x.definition, x.price, x.size).ignore())), _bus.subscribe(SparkTags.CancelOrders).Subscribe(x => cancel_orders(x).ignore()), - _bus.subscribe(SparkTags.CrackOrders).Subscribe(x => crack_orders(x).ignore()), + _bus.subscribe(SparkTags.DetachOrders).Subscribe(x => detach_orders(x).ignore()), _bus.subscribe(SparkTags.UpdateOrder).Subscribe(x => this.update_order(x.key, x.price, x.size).ignore()) ); } @@ -138,11 +138,11 @@ namespace mbts.spark { return success; } - public Task crack_orders(IEnumerable orders) => - Task.WhenAll(orders.Select(crack_order)); + public Task detach_orders(IEnumerable orders) => + Task.WhenAll(orders.Select(detach_order)); - public async Task crack_order(uint order) { - var result = await _service.crack_order_async(new Crack() { OrderKey = order }); + public async Task detach_order(uint order) { + var result = await _service.detach_order_async(new Detach() { OrderKey = order }); return _handle_error(result, "Failed to break order: {0}").key.HasValue; } diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index 132782398..89d9c5cf0 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -22,7 +22,7 @@ namespace mbts.spark public static ITag> RecreateOrder { get; } = new SparkTag>(); public static ITag> CancelOrders { get; } = new SparkTag>(); - public static ITag> CrackOrders { get; } = new SparkTag>(); + public static ITag> DetachOrders { get; } = new SparkTag>(); public static ITag<(uint key, double price, uint size)> UpdateOrder { get; } = new SparkTag<(uint, double, uint)>(); public static ITag ShowModifyOrderTag { get; } = new SparkTag(nameof(ShowModifyOrderTag)); diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 048c236ce..14ea706af 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -167,7 +167,7 @@ namespace mbts.spark { public bool has_parent => _orders.Values.Any( order => order.has_parent()); public bool has_phantom_price => !double.IsNaN(_phantom_price); - public ICommand detach_command => new DelegateCommand(() => _execute_command(_crack_order), () => !has_parent); + public ICommand detach_command => new DelegateCommand(() => _execute_command(_detach_order), () => !has_parent); public ICommand cancel_command => new DelegateCommand(() => _execute_command(_cancel_order)); //public ICommand modify_command => new DelegateCommand(() => _execute_command(() => _bus.post(SparkTags.ShowModifyOrderTag, _order.Key)), () => !has_parent); public event Action command_executed; @@ -199,9 +199,9 @@ namespace mbts.spark { } } - void _crack_order() { + void _detach_order() { var distinct_parent_keys = _orders.Values.Where(o => o.has_parent()).Select(x => x.ParentKey).Distinct(); - model.order_gateway.crack_orders(distinct_parent_keys).ignore(); + model.order_gateway.detach_orders(distinct_parent_keys).ignore(); } public async void try_set_price(OrderRecordImmutable order, double new_price) { diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index ddd2f512f..4752e6c3e 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -21,7 +21,7 @@ service OrderService { rpc update_order(Update) returns (Response) { option(skip_excel_generation) = true; }; - rpc detach_order(Crack) returns (Response) + rpc detach_order(Detach) returns (Response) { option(skip_excel_generation) = true; }; rpc get_registered_dynamic_order_types(bts.api.VoidMessage) @@ -46,7 +46,7 @@ message Update { uint32 order_key = 1; } message Cancel {uint32 order_key = 1;}; -message Crack {uint32 order_key = 1;}; +message Detach {uint32 order_key = 1;}; // response types message Response {uint32 order_key = 1; OrderError error_code = 2; string msg = 3;} diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index ec70cef17..46a63e9b2 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -4,7 +4,7 @@ #include "lib/mercury/broker/BrokerProxy.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" -#include "lib/orderman/events/CrackOrderEvent.h" +#include "lib/orderman/events/DetachOrderEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" @@ -51,7 +51,7 @@ struct ServiceBridge::PImpl { mercury::Stream activate_order_pub; mercury::Stream update_order_pub; mercury::Stream cancel_order_pub; - mercury::Stream crack_order_pub; + mercury::Stream detach_order_pub; mercury::Stream new_admin_data_pub; std::unordered_set known_orders; std::vector> admin_data_updates; @@ -82,7 +82,7 @@ void ServiceBridge::init() { me->activate_order_pub = make_stream(); me->update_order_pub = make_stream(); me->cancel_order_pub = make_stream(); - me->crack_order_pub = make_stream(); + me->detach_order_pub = make_stream(); me->new_admin_data_pub = make_stream(); me->ready.set_value(); } @@ -206,13 +206,13 @@ void ServiceBridge::cancel_order(uint32_t rid, api::orderman::Cancel const &c) { }); } -void ServiceBridge::crack_order(uint32_t rid, api::orderman::Crack const &c) { +void ServiceBridge::detach_order(uint32_t rid, api::orderman::Detach const &c) { me->service_call_marshaller.schedule_action([this, c, rid]() { auto ok = OrderKey(c.order_key()); if (is_ready()) { if (me->known_orders.count(ok)) - publish(me->crack_order_pub, rid, ok); + publish(me->detach_order_pub, rid, ok); else me->on_order_op_result(OrderOpResultEvent(ok, rid, OrderOpResult(api::orderman::ORDER_ERROR_UNKNOWN_ORDER))); diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index c1d8b6f6c..97136b982 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -19,7 +19,7 @@ class Response; class Create; class Update; class Cancel; -class Crack; +class Detach; } // namespace orderman } // namespace api namespace orderman { @@ -66,7 +66,7 @@ class ServiceBridge : public mercury::Actor { void create_order(uint32_t rid, api::orderman::Create const &c); void update_order(uint32_t rid, api::orderman::Update const &c); void cancel_order(uint32_t rid, api::orderman::Cancel const &c); - void crack_order(uint32_t rid, api::orderman::Crack const &c); + void detach_order(uint32_t rid, api::orderman::Detach const &c); void update_admin_data(std::shared_ptr const &admin); diff --git a/src/lib/orderman/events/CrackOrderEvent.h b/src/lib/orderman/events/CrackOrderEvent.h index 1cd171e63..5efd60408 100644 --- a/src/lib/orderman/events/CrackOrderEvent.h +++ b/src/lib/orderman/events/CrackOrderEvent.h @@ -9,11 +9,11 @@ namespace bts { namespace orderman { -class CrackOrderEvent : public mercury::Event { +class DetachOrderEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; - CrackOrderEvent(uint32_t req_id, OrderKey k) + DetachOrderEvent(uint32_t req_id, OrderKey k) : req_id(req_id), k(k) {} uint32_t req_id; diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index 58e12968e..a9ac9bb67 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -1,355 +1,355 @@ -#include "IcebergOrder2.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" +// #include "IcebergOrder2.h" +// #include "lib/orderman/actors/order_manager/ChildOrder.h" +// #include "lib/orderman/actors/order_manager/OrderBuilder.h" -#include +// #include -namespace bts { -namespace orderman { +// namespace bts { +// namespace orderman { -using namespace api::orderman; -enum class IcebergOrder2::State { PAUSED, WORKING, COMPLETED }; +// using namespace api::orderman; +// enum class IcebergOrder2::State { PAUSED, WORKING, COMPLETED }; -struct IcebergOrder2::ActiveChild { - ActiveChild() {} - ChildOrder order; +// struct IcebergOrder2::ActiveChild { +// ActiveChild() {} +// ChildOrder order; - OrderState state; - OrderKey key; - void clear() { - state = OrderState(); - key = null_order_key(); - } -}; +// OrderState state; +// OrderKey key; +// void clear() { +// state = OrderState(); +// key = null_order_key(); +// } +// }; -struct IcebergOrder2::PImpl { - OrderServices *services = nullptr; - OrderDefinition def; - OrderState order_state; - OrderBuilder child_builder; - ActiveChild child; - State state = State::PAUSED; - TimeStamp start_of_pause = Timer::now(); - uint32_t ms_pause_between_orders = 0; -}; +// struct IcebergOrder2::PImpl { +// OrderServices *services = nullptr; +// OrderDefinition def; +// OrderState order_state; +// OrderBuilder child_builder; +// ActiveChild child; +// State state = State::PAUSED; +// TimeStamp start_of_pause = Timer::now(); +// uint32_t ms_pause_between_orders = 0; +// }; -IcebergOrder2::IcebergOrder2() : me(new PImpl()) {} -IcebergOrder2::~IcebergOrder2() {} +// IcebergOrder2::IcebergOrder2() : me(new PImpl()) {} +// IcebergOrder2::~IcebergOrder2() {} -void IcebergOrder2::on_init_new(OrderDefinition const &def, - const PreActivationOrderServices &services) { - // Save our order definition - me->def = def; +// void IcebergOrder2::on_init_new(OrderDefinition const &def, +// const PreActivationOrderServices &services) { +// // Save our order definition +// me->def = def; - // Initialize mutable iceberg component of our state report - me->order_state.mutable_iceberg(); +// // Initialize mutable iceberg component of our state report +// me->order_state.mutable_iceberg(); - auto &ib = iceberg_def(); +// auto &ib = iceberg_def(); - if (ib.show_quantity() == 0) { - transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, - "Show quantity must be greater than 0"); - return; - } +// if (ib.show_quantity() == 0) { +// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, +// "Show quantity must be greater than 0"); +// return; +// } - initialize_child_builder(services.order_factory); -} +// initialize_child_builder(services.order_factory); +// } -void IcebergOrder2::on_init_recovered(OrderRecord const &rec, - const PreActivationOrderServices &) { - auto const &def = rec.def(); - me->def = def; - me->order_state = rec.state(); +// void IcebergOrder2::on_init_recovered(OrderRecord const &rec, +// const PreActivationOrderServices &) { +// auto const &def = rec.def(); +// me->def = def; +// me->order_state = rec.state(); - switch (me->order_state.status()) { +// switch (me->order_state.status()) { - case ORDER_STATUS_WORKING: - case ORDER_STATUS_DISCONNECTED: - transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, - "System restarted with active iceberg order"); - break; +// case ORDER_STATUS_WORKING: +// case ORDER_STATUS_DISCONNECTED: +// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, +// "System restarted with active iceberg order"); +// break; - // terminal states - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - transition(State::COMPLETED, rec.state().status(), - rec.state().last_msg()); - break; +// // terminal states +// case ORDER_STATUS_ERROR: +// case ORDER_STATUS_REJECTED_BY_SPARK: +// case ORDER_STATUS_COMPLETED: +// case ORDER_STATUS_CANCELED: +// transition(State::COMPLETED, rec.state().status(), +// rec.state().last_msg()); +// break; - case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } -} +// case ORDER_STATUS_PENDING_WORKING: +// case ORDER_STATUS_INACTIVE: +// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: +// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: +// bts_assert(false); +// break; +// } +// } -OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, - OrderServices &services) { - bts_assert(!me->services); - me->services = &services; - me->child_builder.activate(services); +// OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, +// OrderServices &services) { +// bts_assert(!me->services); +// me->services = &services; +// me->child_builder.activate(services); - switch (me->state) { - case State::PAUSED: - me->order_state.set_price(p.value()); - me->order_state.set_quantity(q.value()); - if (q.value()) { - services.subscribe_to_time( - [this](auto const &time) { this->on_time(time); }); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); - send_next_child_order(); - } else - transition(State::COMPLETED, ORDER_STATUS_COMPLETED); - case State::COMPLETED: - break; - case State::WORKING: - bts_assert(false); - break; - } - report_state(); - return OrderOpResult{}; -} +// switch (me->state) { +// case State::PAUSED: +// me->order_state.set_price(p.value()); +// me->order_state.set_quantity(q.value()); +// if (q.value()) { +// services.subscribe_to_time( +// [this](auto const &time) { this->on_time(time); }); +// services.subscribe_to_child_updates( +// [this](auto const &os) { this->on_child_order_update(os); }); +// send_next_child_order(); +// } else +// transition(State::COMPLETED, ORDER_STATUS_COMPLETED); +// case State::COMPLETED: +// break; +// case State::WORKING: +// bts_assert(false); +// break; +// } +// report_state(); +// return OrderOpResult{}; +// } -OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { - auto result = OrderOpResult{}; +// OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { +// auto result = OrderOpResult{}; - switch (me->state) { - case State::PAUSED: - case State::WORKING: - if (update.has_custom() && !update.custom().has_iceberg()) { - result = OrderOpResult{ORDER_ERROR_INVALID_OP, - "Update is not valid for this order type"}; - break; - } +// switch (me->state) { +// case State::PAUSED: +// case State::WORKING: +// if (update.has_custom() && !update.custom().has_iceberg()) { +// result = OrderOpResult{ORDER_ERROR_INVALID_OP, +// "Update is not valid for this order type"}; +// break; +// } - if (update.has_custom()) { - auto &ib_update = update.custom().iceberg(); - if (ib_update.show_quantity() == 0) { - result = OrderOpResult{ORDER_ERROR_INVALID_OP, - "Show quantity must be greater than 0"}; - break; - } - *me->def.mutable_custom_def() = update.custom(); - me->services->report_definition(me->def.custom_def()); - initialize_child_builder(me->services->order_factory()); - } - me->order_state.set_price(update.price()); - me->order_state.set_quantity(update.quantity()); - break; +// if (update.has_custom()) { +// auto &ib_update = update.custom().iceberg(); +// if (ib_update.show_quantity() == 0) { +// result = OrderOpResult{ORDER_ERROR_INVALID_OP, +// "Show quantity must be greater than 0"}; +// break; +// } +// *me->def.mutable_custom_def() = update.custom(); +// me->services->report_definition(me->def.custom_def()); +// initialize_child_builder(me->services->order_factory()); +// } +// me->order_state.set_price(update.price()); +// me->order_state.set_quantity(update.quantity()); +// break; - case State::COMPLETED: - result = - OrderOpResult{ORDER_ERROR_INVALID_OP, "Order is already completed"}; - break; - } - report_state(); - return result; -} +// case State::COMPLETED: +// result = +// OrderOpResult{ORDER_ERROR_INVALID_OP, "Order is already completed"}; +// break; +// } +// report_state(); +// return result; +// } -void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { - switch (me->state) { - case State::PAUSED: +// void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { +// switch (me->state) { +// case State::PAUSED: - if (ev.key == me->child.key) { - me->child.state = ev.rebuild_state(); +// if (ev.key == me->child.key) { +// me->child.state = ev.rebuild_state(); - switch (ev.status) { +// switch (ev.status) { - case ORDER_STATUS_WORKING: - case ORDER_STATUS_PENDING_WORKING: - // nothing to do but report new state - break; +// case ORDER_STATUS_WORKING: +// case ORDER_STATUS_PENDING_WORKING: +// // nothing to do but report new state +// break; - case ORDER_STATUS_COMPLETED: { - api::orderman::OrderState merged_state; - merge_states(me->order_state, me->child.state, &merged_state); - me->order_state = merged_state; - me->child.clear(); - if (me->state.quantity() > me->state.filled_quantity()) { - if (me->pause_between_orders) { - me->working_sub_status = WorkingSubStatus::PAUSED; - me->start_of_pause = Timer::now(); - } else - send_next_child_order(); - } else - transition(ORDER_STATUS_COMPLETED); - break; - } +// case ORDER_STATUS_COMPLETED: { +// api::orderman::OrderState merged_state; +// merge_states(me->order_state, me->child.state, &merged_state); +// me->order_state = merged_state; +// me->child.clear(); +// if (me->state.quantity() > me->state.filled_quantity()) { +// if (me->pause_between_orders) { +// me->working_sub_status = WorkingSubStatus::PAUSED; +// me->start_of_pause = Timer::now(); +// } else +// send_next_child_order(); +// } else +// transition(ORDER_STATUS_COMPLETED); +// break; +// } - case ORDER_STATUS_CANCELED: - LOG(OrderMan, Info, - "Unexpected cancel of child {} in Iceberg Order {}. Canceling " - "parent", - ev.key.value(), key().value()); - transition(ORDER_STATUS_CANCELED); - break; +// case ORDER_STATUS_CANCELED: +// LOG(OrderMan, Info, +// "Unexpected cancel of child {} in Iceberg Order {}. Canceling " +// "parent", +// ev.key.value(), key().value()); +// transition(ORDER_STATUS_CANCELED); +// break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_ERROR: - me->child.clear(); - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; +// case ORDER_STATUS_DISCONNECTED: +// case ORDER_STATUS_REJECTED_BY_SPARK: +// case ORDER_STATUS_ERROR: +// me->child.clear(); +// transition(ORDER_STATUS_ERROR, "Unexpected child order state"); +// break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } +// case ORDER_STATUS_INACTIVE: +// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: +// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: +// bts_assert(false); +// break; +// } - } else { - LOG(OrderMan, Info, - "Iceberg order {} received update for non active child order {}." - "update state = {}", - key().value(), me->child.key.value(), - utils::pb::to_string(ev.rebuild_state())); - } - break; +// } else { +// LOG(OrderMan, Info, +// "Iceberg order {} received update for non active child order {}." +// "update state = {}", +// key().value(), me->child.key.value(), +// utils::pb::to_string(ev.rebuild_state())); +// } +// break; - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_COMPLETED: - break; +// case ORDER_STATUS_CANCELED: +// case ORDER_STATUS_ERROR: +// case ORDER_STATUS_DISCONNECTED: +// case ORDER_STATUS_COMPLETED: +// break; - case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } - report_state(); -} +// case ORDER_STATUS_PENDING_WORKING: +// case ORDER_STATUS_REJECTED_BY_SPARK: +// case ORDER_STATUS_INACTIVE: +// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: +// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: +// bts_assert(false); +// break; +// } +// report_state(); +// } -void IcebergOrder2::transition(State state, api::orderman::OrderStatus status, - std::string const &msg) { - LOG(OrderMan, Info, "Transitioning iceberg order {} from {} to {}", - key().value(), std::string(state_name(me->state)), - std::string(state_name(state))); - me->state = state; - me->order_state.set_status(status); - me->order_state.set_last_msg(msg); -} +// void IcebergOrder2::transition(State state, api::orderman::OrderStatus status, +// std::string const &msg) { +// LOG(OrderMan, Info, "Transitioning iceberg order {} from {} to {}", +// key().value(), std::string(state_name(me->state)), +// std::string(state_name(state))); +// me->state = state; +// me->order_state.set_status(status); +// me->order_state.set_last_msg(msg); +// } -void IcebergOrder2::report_state() { - if (me->child.state.filled_quantity()) { - api::orderman::OrderState merged_state; - merge_states(me->order_state, me->child.state, &merged_state); - me->services->report_state(merged_state); - } else - me->services->report_state(me->order_state); -} +// void IcebergOrder2::report_state() { +// if (me->child.state.filled_quantity()) { +// api::orderman::OrderState merged_state; +// merge_states(me->order_state, me->child.state, &merged_state); +// me->services->report_state(merged_state); +// } else +// me->services->report_state(me->order_state); +// } -IcebergOrderDefinition &IcebergOrder2::iceberg_def() { - return *me->def.mutable_custom_def()->mutable_iceberg(); -} +// IcebergOrderDefinition &IcebergOrder2::iceberg_def() { +// return *me->def.mutable_custom_def()->mutable_iceberg(); +// } -OrderOpResult IcebergOrder2::on_cancel() { - switch (me->state) { - case State::PAUSED: - transition(State::COMPLETED, ORDER_STATUS_CANCELED); - return OrderOpResult{}; - case State::WORKING: - me->child.order.cancel(); - transition(State::COMPLETED, ORDER_STATUS_CANCELED); - return OrderOpResult{}; - case State::COMPLETED: - return OrderOpResult{ORDER_ERROR_INVALID_OP, - "Order is already completed"}; - } -} +// OrderOpResult IcebergOrder2::on_cancel() { +// switch (me->state) { +// case State::PAUSED: +// transition(State::COMPLETED, ORDER_STATUS_CANCELED); +// return OrderOpResult{}; +// case State::WORKING: +// me->child.order.cancel(); +// transition(State::COMPLETED, ORDER_STATUS_CANCELED); +// return OrderOpResult{}; +// case State::COMPLETED: +// return OrderOpResult{ORDER_ERROR_INVALID_OP, +// "Order is already completed"}; +// } +// } -void IcebergOrder2::send_next_child_order() { - bts_assert(me->order_state.quantity() > me->order_state.filled_quantity()); +// void IcebergOrder2::send_next_child_order() { +// bts_assert(me->order_state.quantity() > me->order_state.filled_quantity()); - auto remaining = - me->order_state.quantity() - me->order_state.filled_quantity(); - auto to_send = std::min(remaining, (uint32_t)iceberg_def().show_quantity()); +// auto remaining = +// me->order_state.quantity() - me->order_state.filled_quantity(); +// auto to_send = std::min(remaining, (uint32_t)iceberg_def().show_quantity()); - me->child.order = me->child_builder.build(); - me->child.key = me->child.order.key(); +// me->child.order = me->child_builder.build(); +// me->child.key = me->child.order.key(); - LOG(OrderMan, Info, - "Iceberg order {} creating new child order {} with size " - "{} price {}. Filled {} so far out of {}", - key().value(), me->child.key.value(), to_send, me->order_state.price(), - me->order_state.filled_quantity(), me->order_state.quantity()); +// LOG(OrderMan, Info, +// "Iceberg order {} creating new child order {} with size " +// "{} price {}. Filled {} so far out of {}", +// key().value(), me->child.key.value(), to_send, me->order_state.price(), +// me->order_state.filled_quantity(), me->order_state.quantity()); - me->child.order.activate( - Price(me->order_state.price()), Quantity(to_send), - [this](auto const &op) { this->on_order_op_completed(op); }); -} +// me->child.order.activate( +// Price(me->order_state.price()), Quantity(to_send), +// [this](auto const &op) { this->on_order_op_completed(op); }); +// } -void IcebergOrder2::on_order_op_completed(OrderOpResult r) { - if (r.error == ORDER_ERROR_OK) - return; +// void IcebergOrder2::on_order_op_completed(OrderOpResult r) { +// if (r.error == ORDER_ERROR_OK) +// return; - switch (me->state) { - case State::PAUSED: - transition(State::COMPLETED, ORDER_STATUS_ERROR, - std::string ("Child order operation failed: ") + - r.error_msg); - break; - case State::WORKING: - me->child.order.cancel(); - transition(State::COMPLETED, ORDER_STATUS_ERROR, - std::string ("Child order operation failed: ") + - r.error_msg); - break; - case State::COMPLETED: - break; - } -} +// switch (me->state) { +// case State::PAUSED: +// transition(State::COMPLETED, ORDER_STATUS_ERROR, +// std::string ("Child order operation failed: ") + +// r.error_msg); +// break; +// case State::WORKING: +// me->child.order.cancel(); +// transition(State::COMPLETED, ORDER_STATUS_ERROR, +// std::string ("Child order operation failed: ") + +// r.error_msg); +// break; +// case State::COMPLETED: +// break; +// } +// } -void IcebergOrder2::initialize_child_builder(IOrderFactory &of) { - // Copy parent definition to child, so the child inherits all the - // standard properties of the parent (side, security, TIF, etc) - auto child_def = me->def; - // Copy the custom part of the child order definition to our child - *child_def.mutable_custom_def() = iceberg_def().child(); +// void IcebergOrder2::initialize_child_builder(IOrderFactory &of) { +// // Copy parent definition to child, so the child inherits all the +// // standard properties of the parent (side, security, TIF, etc) +// auto child_def = me->def; +// // Copy the custom part of the child order definition to our child +// *child_def.mutable_custom_def() = iceberg_def().child(); - // Build our child builder - me->child_builder = OrderBuilder(key(), child_def, of, 1); - if (me->services) - me->child_builder.activate(*me->services); -} +// // Build our child builder +// me->child_builder = OrderBuilder(key(), child_def, of, 1); +// if (me->services) +// me->child_builder.activate(*me->services); +// } -void IcebergOrder2::merge_states(api::orderman::OrderState const &iceberg_state, - api::orderman::OrderState const &child_state, - api::orderman::OrderState *merged) { - auto child_order_fills = child_state.filled_quantity(); - auto child_order_avg_price = child_state.avg_price(); - auto child_order_last_price = child_state.last_price(); +// void IcebergOrder2::merge_states(api::orderman::OrderState const &iceberg_state, +// api::orderman::OrderState const &child_state, +// api::orderman::OrderState *merged) { +// auto child_order_fills = child_state.filled_quantity(); +// auto child_order_avg_price = child_state.avg_price(); +// auto child_order_last_price = child_state.last_price(); - auto iceberg_fills = iceberg_state.filled_quantity(); - auto iceberg_avg_price = iceberg_state.avg_price(); +// auto iceberg_fills = iceberg_state.filled_quantity(); +// auto iceberg_avg_price = iceberg_state.avg_price(); - *merged = iceberg_state; - merged->set_filled_quantity(child_order_fills + iceberg_fills); - merged->set_last_price(child_order_last_price); - merged->set_avg_price((child_order_fills * child_order_avg_price + - iceberg_fills * iceberg_avg_price) / - (child_order_fills + iceberg_fills)); -} +// *merged = iceberg_state; +// merged->set_filled_quantity(child_order_fills + iceberg_fills); +// merged->set_last_price(child_order_last_price); +// merged->set_avg_price((child_order_fills * child_order_avg_price + +// iceberg_fills * iceberg_avg_price) / +// (child_order_fills + iceberg_fills)); +// } -const char *IcebergOrder2::state_name(State st) { - switch (st) { - case State::PAUSED: - return "PAUSED"; - case State::COMPLETED: - return "COMPLETED"; - case State::WORKING: - return "WORKING"; - } -} +// const char *IcebergOrder2::state_name(State st) { +// switch (st) { +// case State::PAUSED: +// return "PAUSED"; +// case State::COMPLETED: +// return "COMPLETED"; +// case State::WORKING: +// return "WORKING"; +// } +// } -} // namespace orderman -} // namespace bts +// } // namespace orderman +// } // namespace bts diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 383eb01e1..4799f4ede 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -249,7 +249,7 @@ OrderOpResult BookAlgo::on_cancel() { if (!me->fake_detached_child) me->child.cancel(); for (auto &i : me->hedges) - i.crack(); + i.detach(); transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_PENDING_WORKING: @@ -383,7 +383,7 @@ void BookAlgo::paydown(const md::PriceSize &opposite, void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) { me->fake_detached_child = true; - me->child.crack(); + me->child.detach(); transition(status_after_detach); report_state(); } diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 06400fcf9..602936667 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -117,7 +117,7 @@ public: OrderOpResult on_update(Price, Quantity) override; // called when the user (or higher level order) cancels an order OrderOpResult on_cancel() override; - // crack means to let the lower level orders lose from the higher + // detach means to let the lower level orders lose from the higher // level order and cancel the higher level order OrderOpResult on_detach() override; // ISpreaderManager //////////////////// diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 400518c57..c8279d998 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -330,18 +330,18 @@ void OrderServiceServer::update_order( } } -void OrderServiceServer::crack_order( - const api::orderman::Crack &crack, +void OrderServiceServer::detach_order( + const api::orderman::Detach &detach, const api::Response &r) { if (!me->service_ready) { api::orderman::Response response; - response.set_order_key(crack.order_key()); + response.set_order_key(detach.order_key()); response.set_error_code(api::orderman::ORDER_ERROR_SERVER_NOT_READY); r(response); } else { me->in_flight_order_ops[++me->current_req_op_id] = r; - me->service_bridge->crack_order(me->current_req_op_id, crack); + me->service_bridge->detach_order(me->current_req_op_id, detach); } } diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index 3801f6440..1eca52a46 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -32,7 +32,7 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { const api::Response &) override; void update_order(const api::orderman::Update &, const api::Response &) override; - void crack_order(const api::orderman::Crack &, + void detach_order(const api::orderman::Detach &, const api::Response &) override; void get_registered_dynamic_order_types( const api::VoidMessage &, From a9fc3d43a0d648dd5ad18affbc275dc20b1f22be Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 12 Feb 2019 09:36:57 -0500 Subject: [PATCH 077/218] Fixed merge. --- src/lib/orderman/orders/book_algos/BookAlgo.cpp | 5 +---- src/lib/orderman/orders/book_algos/OCOOrder.cpp | 3 ++- src/lib/orderman/orders/book_algos/OCOOrder.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 37e4f39ff..d19b93597 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -234,7 +234,6 @@ OrderOpResult BookAlgo::on_activate(Price p, Quantity q, OrderServices &services } OrderOpResult BookAlgo::on_update(Price p, Quantity q) { -{ LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); switch (this_state().status()) { @@ -292,8 +291,6 @@ OrderOpResult BookAlgo::on_update(Price p, Quantity q) { } OrderOpResult BookAlgo::on_cancel() { - - LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); switch (this_state().status()) @@ -308,7 +305,7 @@ OrderOpResult BookAlgo::on_cancel() { if(!me->is_detached) me->child.cancel(); for(auto& i : me->hedges) - i.detach(); + i.second.detach(); transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_PENDING_WORKING: diff --git a/src/lib/orderman/orders/book_algos/OCOOrder.cpp b/src/lib/orderman/orders/book_algos/OCOOrder.cpp index b77ff61d8..fa8836fa7 100644 --- a/src/lib/orderman/orders/book_algos/OCOOrder.cpp +++ b/src/lib/orderman/orders/book_algos/OCOOrder.cpp @@ -194,7 +194,7 @@ void OCOOrder::on_book_update(const bts::orderman::BookUpdateEvent& ) } } -void OCOOrder::on_cancel(trace::CorID const&) +OrderOpResult OCOOrder::on_cancel() { LOG(OrderMan, Info, "Canceling OCOOrder Order {}", key().value()); @@ -249,6 +249,7 @@ void OCOOrder::on_cancel(trace::CorID const&) break; } report_state(); + return OrderOpResult{}; } } diff --git a/src/lib/orderman/orders/book_algos/OCOOrder.h b/src/lib/orderman/orders/book_algos/OCOOrder.h index 5fd0e8789..f8c5f7e58 100644 --- a/src/lib/orderman/orders/book_algos/OCOOrder.h +++ b/src/lib/orderman/orders/book_algos/OCOOrder.h @@ -18,7 +18,7 @@ public: OCOOrder(); virtual ~OCOOrder(); - void on_cancel(trace::CorID const&) override ; + OrderOpResult on_cancel() override ; protected: void setup_child(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, api::orderman::OrderState&, api::orderman::OrderDefinition*) override; From 904023c5fa6cc419fe34d4353ee100cdc61141a2 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 12 Feb 2019 09:50:32 -0500 Subject: [PATCH 078/218] Added a few comments. --- src/lib/orderman/orders/NativeOrder.cpp | 69 +++++++++++++------------ 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 718c8bb03..e26d8ec9f 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -180,7 +180,7 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec, } } -api::orderman::OrderDefinition +api::orderman::OrderDefinition NativeOrder::on_init_from_exe_report(ExecutionReport const &er, const PreActivationOrderServices &os) { auto k = er.order_key; @@ -276,22 +276,21 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er, NativeOrder::~NativeOrder() {} -void NativeOrder::warm_up_activate(OrderServicesData&data, OrderServices& services) { +void NativeOrder::warm_up_activate(OrderServicesData &data, + OrderServices &services) { bts_assert(!me->services); me->services = &services; - init_order_services(data,services); - _on_activate(Price(0),Quantity(0),services); + init_order_services(data, services); + _on_activate(Price(0), Quantity(0), services); - me->services->unsubscribe_from_exe_report( - *me->session_services,me->exe_report_sid); - me->services->unsubscribe_from_cancel_reject( - *me->session_services,me->cancel_reject_sid); - me->services->unsubscribe_from_gateway_status( - *me->session_services); - me->services = nullptr; + me->services->unsubscribe_from_exe_report(*me->session_services, + me->exe_report_sid); + me->services->unsubscribe_from_cancel_reject(*me->session_services, + me->cancel_reject_sid); + me->services->unsubscribe_from_gateway_status(*me->session_services); + me->services = nullptr; } - bool NativeOrder::_on_activate(Price p, Quantity q, bts::orderman::OrderServices &services) { me->state.set_price(p.value()); @@ -406,23 +405,29 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, switch (me->state.status()) { case ORDER_STATUS_INACTIVE: { - auto scoped_log = - services.log_scope("NativeOrder::on_activate", key().value()); - // this is a brand new order - if (_on_activate(p,q,services)) { - me->services->queue_fix(*me->session_services, - jetfix::MessageTypes::NewOrderSingle, - me->create_encoding); - me->services->governor(*me->session_services).record_sent(); - me->state.set_status(ORDER_STATUS_PENDING_WORKING); + if (_on_activate(p, q, services)) { + auto scoped_log = + services.log_scope("NativeOrder::on_activate", key().value()); + me->services->queue_fix(*me->session_services, + jetfix::MessageTypes::NewOrderSingle, + me->create_encoding); - LOG(OrderMan, Info, "Sent new order with key {} to gateway", - key().value()); - // early return so we skip the expensive report_state() call - return OrderOpResult{}; + me->services->governor(*me->session_services).record_sent(); + me->state.set_status(ORDER_STATUS_PENDING_WORKING); + + LOG(OrderMan, Info, "Sent new order with key {} to gateway", + key().value()); + + // Early return so we skip the expensive report_state() + // call. It is OK to spkip it because we are bound to report + // our state once the excange aknowledges the order. + return OrderOpResult{}; } + + // When the order fails its limits checks we fall through the + // switch to report the error state at the end of this function break; } @@ -589,9 +594,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q) { return OrderOpResult{}; } -OrderOpResult NativeOrder::on_detach() { - return OrderOpResult{}; -} +OrderOpResult NativeOrder::on_detach() { return OrderOpResult{}; } OrderOpResult NativeOrder::on_cancel() { auto scoped_log = @@ -605,7 +608,8 @@ OrderOpResult NativeOrder::on_cancel() { me->cancel_transact_time_bm, &ts.value()[0], ts.value().size()); me->services->queue_fix(*me->session_services, - jetfix::MessageTypes::Cancel, me->cancel_encoding); + jetfix::MessageTypes::Cancel, + me->cancel_encoding); break; } @@ -652,8 +656,8 @@ bool NativeOrder::is_old_exe_report( } void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { - auto scoped_log = me->services->log_scope( - "NativeOrder::on_exe_report", key().value()); + auto scoped_log = + me->services->log_scope("NativeOrder::on_exe_report", key().value()); auto &state = me->state; auto &native_state = get_native_state(state); @@ -707,7 +711,8 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { native_state.set_native_type(er.data->order_type); bool got_first_exchange_order_id = !me->received_exchanged_order_id; if (got_first_exchange_order_id) { - native_state.set_exchange_order_id(to_trim_str(er.data->exchange_order_id)); + native_state.set_exchange_order_id( + to_trim_str(er.data->exchange_order_id)); add_exchange_order_id_to_fix(); } From a62a41a0aa32ac3d39fc0f79a04f8f0c623c2928 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 12 Feb 2019 17:13:53 -0500 Subject: [PATCH 079/218] IB2 code complete. --- src/data_files/CMakeDeps.cmake | 2 +- src/lib/CMakeDeps.cmake | 2 +- src/lib/orderman/orders/IcebergOrder2.cpp | 739 +++++++++++++--------- src/lib/orderman/orders/IcebergOrder2.h | 22 +- 4 files changed, 453 insertions(+), 312 deletions(-) diff --git a/src/data_files/CMakeDeps.cmake b/src/data_files/CMakeDeps.cmake index 01fed7937..db22eba31 100644 --- a/src/data_files/CMakeDeps.cmake +++ b/src/data_files/CMakeDeps.cmake @@ -1 +1 @@ -set(sources files/Onixs.BTS.lic;files/cert_secure_logon.txt;files/perf_trace/compiled.css;files/perf_trace/index.html;files/perf_trace/jquery-3.3.1.min.js;files/perf_trace/main.js;files/perf_trace/perf_log.sql;files/perf_trace/perf_trace_analysis.sql;files/perf_trace/plotly-latest.min.js) \ No newline at end of file +set(sources files/Onixs.BTS.lic;files/cert_secure_logon.txt;files/futures.coconut.xz;files/perf_trace/compiled.css;files/perf_trace/index.html;files/perf_trace/jquery-3.3.1.min.js;files/perf_trace/main.js;files/perf_trace/perf_log.sql;files/perf_trace/perf_trace_analysis.sql;files/perf_trace/plotly-latest.min.js) \ No newline at end of file diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index afd768425..abff1711f 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/IcebergOrder2.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index a9ac9bb67..99ac7a95f 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -1,355 +1,486 @@ -// #include "IcebergOrder2.h" -// #include "lib/orderman/actors/order_manager/ChildOrder.h" -// #include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "IcebergOrder2.h" +#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/utils/PBUtils.h" -// #include +#include -// namespace bts { -// namespace orderman { +namespace bts { +namespace orderman { -// using namespace api::orderman; -// enum class IcebergOrder2::State { PAUSED, WORKING, COMPLETED }; +using namespace api::orderman; +enum class IcebergOrder2::InternalStatus { + INACTIVE, + PAUSED, + WORKING, + COMPLETED +}; -// struct IcebergOrder2::ActiveChild { -// ActiveChild() {} -// ChildOrder order; +struct IcebergOrder2::ActiveChild { + ActiveChild() {} -// OrderState state; -// OrderKey key; -// void clear() { -// state = OrderState(); -// key = null_order_key(); -// } -// }; + ChildOrder order; + OrderState state; + OrderKey key = null_order_key(); -// struct IcebergOrder2::PImpl { -// OrderServices *services = nullptr; -// OrderDefinition def; -// OrderState order_state; -// OrderBuilder child_builder; -// ActiveChild child; -// State state = State::PAUSED; -// TimeStamp start_of_pause = Timer::now(); -// uint32_t ms_pause_between_orders = 0; -// }; + bool is_empty() { return key == null_order_key(); } -// IcebergOrder2::IcebergOrder2() : me(new PImpl()) {} -// IcebergOrder2::~IcebergOrder2() {} + void reset() { + state = OrderState(); + key = null_order_key(); + } +}; -// void IcebergOrder2::on_init_new(OrderDefinition const &def, -// const PreActivationOrderServices &services) { -// // Save our order definition -// me->def = def; +struct IcebergOrder2::PImpl { + OrderServices *services = nullptr; + OrderDefinition def; + OrderState order_state; + OrderBuilder child_builder; + ActiveChild active_child; + InternalStatus internal_status = InternalStatus::INACTIVE; -// // Initialize mutable iceberg component of our state report -// me->order_state.mutable_iceberg(); + OrderStatus external_status() { return order_state.status(); } + void set_external_status(OrderStatus st) { order_state.set_status(st); } -// auto &ib = iceberg_def(); + IcebergOrderDefinition &iceberg_def() { + return *def.mutable_custom_def()->mutable_iceberg(); + } -// if (ib.show_quantity() == 0) { -// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, -// "Show quantity must be greater than 0"); -// return; -// } + TimeStamp start_of_pause = Timer::now(); + uint32_t ms_pause_between_orders = 0; +}; -// initialize_child_builder(services.order_factory); -// } +IcebergOrder2::IcebergOrder2() : me(new PImpl()) {} +IcebergOrder2::~IcebergOrder2() {} -// void IcebergOrder2::on_init_recovered(OrderRecord const &rec, -// const PreActivationOrderServices &) { -// auto const &def = rec.def(); -// me->def = def; -// me->order_state = rec.state(); +void IcebergOrder2::on_init_new(OrderDefinition const &def, + const PreActivationOrderServices &services) { + // Save our order definition + me->def = def; -// switch (me->order_state.status()) { + // Initialize mutable iceberg component of our state report + me->order_state.mutable_iceberg(); -// case ORDER_STATUS_WORKING: -// case ORDER_STATUS_DISCONNECTED: -// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, -// "System restarted with active iceberg order"); -// break; + auto &ib = me->iceberg_def(); -// // terminal states -// case ORDER_STATUS_ERROR: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_COMPLETED: -// case ORDER_STATUS_CANCELED: -// transition(State::COMPLETED, rec.state().status(), -// rec.state().last_msg()); -// break; + if (ib.show_quantity() == 0) { + terminate(ORDER_STATUS_REJECTED_BY_SPARK, + "Show quantity must be greater than 0"); + return; + } + if (!ib.has_child()) { + terminate(ORDER_STATUS_REJECTED_BY_SPARK, + "Iceberg order must have a child order definition"); + return; + } + initialize_child_builder(services.order_factory); +} -// case ORDER_STATUS_PENDING_WORKING: -// case ORDER_STATUS_INACTIVE: -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } -// } +void IcebergOrder2::on_init_recovered(OrderRecord const &rec, + const PreActivationOrderServices &) { + auto const &def = rec.def(); + me->def = def; + me->order_state = rec.state(); -// OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, -// OrderServices &services) { -// bts_assert(!me->services); -// me->services = &services; -// me->child_builder.activate(services); + // Infer internal status from persisted external status + switch (me->external_status()) { -// switch (me->state) { -// case State::PAUSED: -// me->order_state.set_price(p.value()); -// me->order_state.set_quantity(q.value()); -// if (q.value()) { -// services.subscribe_to_time( -// [this](auto const &time) { this->on_time(time); }); -// services.subscribe_to_child_updates( -// [this](auto const &os) { this->on_child_order_update(os); }); -// send_next_child_order(); -// } else -// transition(State::COMPLETED, ORDER_STATUS_COMPLETED); -// case State::COMPLETED: -// break; -// case State::WORKING: -// bts_assert(false); -// break; -// } -// report_state(); -// return OrderOpResult{}; -// } + case ORDER_STATUS_WORKING: + terminate(ORDER_STATUS_REJECTED_BY_SPARK, + "System restarted with active iceberg order"); + return; -// OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { -// auto result = OrderOpResult{}; + // terminal states + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + terminate(rec.state().status(), rec.state().last_msg()); + break; -// switch (me->state) { -// case State::PAUSED: -// case State::WORKING: -// if (update.has_custom() && !update.custom().has_iceberg()) { -// result = OrderOpResult{ORDER_ERROR_INVALID_OP, -// "Update is not valid for this order type"}; -// break; -// } + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + // these are illegal persisted states for this order type + bts_assert(false); + break; + } +} -// if (update.has_custom()) { -// auto &ib_update = update.custom().iceberg(); -// if (ib_update.show_quantity() == 0) { -// result = OrderOpResult{ORDER_ERROR_INVALID_OP, -// "Show quantity must be greater than 0"}; -// break; -// } -// *me->def.mutable_custom_def() = update.custom(); -// me->services->report_definition(me->def.custom_def()); -// initialize_child_builder(me->services->order_factory()); -// } -// me->order_state.set_price(update.price()); -// me->order_state.set_quantity(update.quantity()); -// break; +OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, + OrderServices &services) { + bts_assert(!me->services); + me->services = &services; + me->child_builder.activate(services); -// case State::COMPLETED: -// result = -// OrderOpResult{ORDER_ERROR_INVALID_OP, "Order is already completed"}; -// break; -// } -// report_state(); -// return result; -// } + switch (me->internal_status) { -// void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { -// switch (me->state) { -// case State::PAUSED: - -// if (ev.key == me->child.key) { -// me->child.state = ev.rebuild_state(); + case InternalStatus::INACTIVE: + me->order_state.set_price(p.value()); + me->order_state.set_quantity(q.value()); + if (q.value()) { + if (me->iceberg_def().pause_between_orders_ms()) + services.subscribe_to_time( + [this](auto const &) { this->on_time(); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + me->set_external_status(ORDER_STATUS_WORKING); + work(); + } else + terminate(ORDER_STATUS_COMPLETED); + return report_and_return(); -// switch (ev.status) { + case InternalStatus::COMPLETED: + return report_and_return(); -// case ORDER_STATUS_WORKING: -// case ORDER_STATUS_PENDING_WORKING: -// // nothing to do but report new state -// break; + case InternalStatus::WORKING: + case InternalStatus::PAUSED: + bts_assert(false); + return report_and_return(); + } +} -// case ORDER_STATUS_COMPLETED: { -// api::orderman::OrderState merged_state; -// merge_states(me->order_state, me->child.state, &merged_state); -// me->order_state = merged_state; -// me->child.clear(); -// if (me->state.quantity() > me->state.filled_quantity()) { -// if (me->pause_between_orders) { -// me->working_sub_status = WorkingSubStatus::PAUSED; -// me->start_of_pause = Timer::now(); -// } else -// send_next_child_order(); -// } else -// transition(ORDER_STATUS_COMPLETED); -// break; -// } +OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { -// case ORDER_STATUS_CANCELED: -// LOG(OrderMan, Info, -// "Unexpected cancel of child {} in Iceberg Order {}. Canceling " -// "parent", -// ev.key.value(), key().value()); -// transition(ORDER_STATUS_CANCELED); -// break; + switch (me->internal_status) { + case InternalStatus::PAUSED: + case InternalStatus::WORKING: -// case ORDER_STATUS_DISCONNECTED: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_ERROR: -// me->child.clear(); -// transition(ORDER_STATUS_ERROR, "Unexpected child order state"); -// break; + // If a custom portion is present in the update it must be for + // an Iceberg + if (update.has_custom() && !update.custom().has_iceberg()) + return report_and_return(ORDER_ERROR_INVALID_OP, + "Update is not valid for this order type"); -// case ORDER_STATUS_INACTIVE: -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } + if (update.has_custom()) { + auto &ib_update = update.custom().iceberg(); -// } else { -// LOG(OrderMan, Info, -// "Iceberg order {} received update for non active child order {}." -// "update state = {}", -// key().value(), me->child.key.value(), -// utils::pb::to_string(ev.rebuild_state())); -// } -// break; + // new show quantity must be valid + if (ib_update.show_quantity() == 0) + return report_and_return(ORDER_ERROR_INVALID_OP, + "Show quantity must be greater than 0"); -// case ORDER_STATUS_CANCELED: -// case ORDER_STATUS_ERROR: -// case ORDER_STATUS_DISCONNECTED: -// case ORDER_STATUS_COMPLETED: -// break; + // Icebergs must have child definitions + if (!ib_update.has_child()) + return report_and_return( + ORDER_ERROR_INVALID_OP, + "Iceberg update must specifiy a child type"); -// case ORDER_STATUS_PENDING_WORKING: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_INACTIVE: -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } -// report_state(); -// } + // Adjust the time subscription to the new definition + auto had_time_sub = me->iceberg_def().pause_between_orders_ms(); + auto needs_time_sub = ib_update.pause_between_orders_ms(); + if (!had_time_sub && needs_time_sub) + me->services->subscribe_to_time( + [this](auto const &) { this->on_time(); }); + else if (had_time_sub && !needs_time_sub) + me->services->unsubscribe_from_time(); -// void IcebergOrder2::transition(State state, api::orderman::OrderStatus status, -// std::string const &msg) { -// LOG(OrderMan, Info, "Transitioning iceberg order {} from {} to {}", -// key().value(), std::string(state_name(me->state)), -// std::string(state_name(state))); -// me->state = state; -// me->order_state.set_status(status); -// me->order_state.set_last_msg(msg); -// } + // copy the new definition + *me->def.mutable_custom_def() = update.custom(); + me->services->report_definition(me->def.custom_def()); + initialize_child_builder(me->services->order_factory()); + } + me->order_state.set_price(update.price()); + me->order_state.set_quantity(update.quantity()); + return report_and_return(); -// void IcebergOrder2::report_state() { -// if (me->child.state.filled_quantity()) { -// api::orderman::OrderState merged_state; -// merge_states(me->order_state, me->child.state, &merged_state); -// me->services->report_state(merged_state); -// } else -// me->services->report_state(me->order_state); -// } + case InternalStatus::COMPLETED: + return report_and_return(ORDER_ERROR_INVALID_OP, + "Order is already completed"); -// IcebergOrderDefinition &IcebergOrder2::iceberg_def() { -// return *me->def.mutable_custom_def()->mutable_iceberg(); -// } + case InternalStatus::INACTIVE: + bts_assert(false); + return report_and_return(); + } +} -// OrderOpResult IcebergOrder2::on_cancel() { -// switch (me->state) { -// case State::PAUSED: -// transition(State::COMPLETED, ORDER_STATUS_CANCELED); -// return OrderOpResult{}; -// case State::WORKING: -// me->child.order.cancel(); -// transition(State::COMPLETED, ORDER_STATUS_CANCELED); -// return OrderOpResult{}; -// case State::COMPLETED: -// return OrderOpResult{ORDER_ERROR_INVALID_OP, -// "Order is already completed"}; -// } -// } +void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { + switch (me->internal_status) { -// void IcebergOrder2::send_next_child_order() { -// bts_assert(me->order_state.quantity() > me->order_state.filled_quantity()); + case InternalStatus::PAUSED: + case InternalStatus::COMPLETED: + LOG(OrderMan, Info, + "Iceberg order {} received unexpected child update for child " + "{}." + "update state = {}", + key().value(), ev.key.value(), + utils::pb::to_string(ev.rebuild_state())); + return; -// auto remaining = -// me->order_state.quantity() - me->order_state.filled_quantity(); -// auto to_send = std::min(remaining, (uint32_t)iceberg_def().show_quantity()); + case InternalStatus::WORKING: + if (ev.key != me->active_child.key) { + LOG(OrderMan, Info, + "Iceberg order {} received child update from unexpected child " + "{}." + "update state = {}", + key().value(), ev.key.value(), + utils::pb::to_string(ev.rebuild_state())); + return; + } -// me->child.order = me->child_builder.build(); -// me->child.key = me->child.order.key(); + me->active_child.state = ev.rebuild_state(); -// LOG(OrderMan, Info, -// "Iceberg order {} creating new child order {} with size " -// "{} price {}. Filled {} so far out of {}", -// key().value(), me->child.key.value(), to_send, me->order_state.price(), -// me->order_state.filled_quantity(), me->order_state.quantity()); + // Child Order state + switch (ev.status) { -// me->child.order.activate( -// Price(me->order_state.price()), Quantity(to_send), -// [this](auto const &op) { this->on_order_op_completed(op); }); -// } + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + // nothing to do but report new state + report_and_return(); + return; -// void IcebergOrder2::on_order_op_completed(OrderOpResult r) { -// if (r.error == ORDER_ERROR_OK) -// return; + case ORDER_STATUS_COMPLETED: { + // Child has completed, merge its fills and average price + // into our own and decide wheter to terminate, pause or + // work some more + api::orderman::OrderState merged_state; + merge_states(me->order_state, me->active_child.state, &merged_state); + me->order_state = merged_state; + if (me->order_state.quantity() > me->order_state.filled_quantity()) + pause(); + else + terminate(ORDER_STATUS_COMPLETED); + report_and_return(); + return; + } -// switch (me->state) { -// case State::PAUSED: -// transition(State::COMPLETED, ORDER_STATUS_ERROR, -// std::string ("Child order operation failed: ") + -// r.error_msg); -// break; -// case State::WORKING: -// me->child.order.cancel(); -// transition(State::COMPLETED, ORDER_STATUS_ERROR, -// std::string ("Child order operation failed: ") + -// r.error_msg); -// break; -// case State::COMPLETED: -// break; -// } -// } + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_ERROR: + LOG(OrderMan, Info, + "Unexpected child order state {} in Iceberg Order {}. " + "Canceling parent. Child state: {}", + ev.key.value(), key().value(), + utils::pb::to_string(me->active_child.state)); + terminate(ORDER_STATUS_ERROR, "Unexpected child order state"); + report_and_return(); + return; -// void IcebergOrder2::initialize_child_builder(IOrderFactory &of) { -// // Copy parent definition to child, so the child inherits all the -// // standard properties of the parent (side, security, TIF, etc) -// auto child_def = me->def; -// // Copy the custom part of the child order definition to our child -// *child_def.mutable_custom_def() = iceberg_def().child(); + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + return; + } // End WORKING internal state + case InternalStatus::INACTIVE: + bts_assert(false); + return; + } +} -// // Build our child builder -// me->child_builder = OrderBuilder(key(), child_def, of, 1); -// if (me->services) -// me->child_builder.activate(*me->services); -// } +orderman::OrderOpResult orderman::IcebergOrder2::on_cancel() { + switch (me->internal_status) { + case InternalStatus::PAUSED: + case InternalStatus::WORKING: + terminate(ORDER_STATUS_CANCELED); + return report_and_return(); + case InternalStatus::COMPLETED: + return report_and_return(ORDER_ERROR_INVALID_OP, + "Order is already completed"); + case InternalStatus::INACTIVE: + bts_assert(false); + return report_and_return(); + } +} -// void IcebergOrder2::merge_states(api::orderman::OrderState const &iceberg_state, -// api::orderman::OrderState const &child_state, -// api::orderman::OrderState *merged) { -// auto child_order_fills = child_state.filled_quantity(); -// auto child_order_avg_price = child_state.avg_price(); -// auto child_order_last_price = child_state.last_price(); +void orderman::IcebergOrder2::send_next_child_order() { + bts_assert(me->order_state.quantity() > me->order_state.filled_quantity()); + bts_assert(me->internal_status == InternalStatus::WORKING); -// auto iceberg_fills = iceberg_state.filled_quantity(); -// auto iceberg_avg_price = iceberg_state.avg_price(); + auto remaining = + me->order_state.quantity() - me->order_state.filled_quantity(); + auto to_send = + std::min(remaining, (uint32_t)me->iceberg_def().show_quantity()); -// *merged = iceberg_state; -// merged->set_filled_quantity(child_order_fills + iceberg_fills); -// merged->set_last_price(child_order_last_price); -// merged->set_avg_price((child_order_fills * child_order_avg_price + -// iceberg_fills * iceberg_avg_price) / -// (child_order_fills + iceberg_fills)); -// } + me->active_child.order = me->child_builder.build(); + me->active_child.key = me->active_child.order.key(); -// const char *IcebergOrder2::state_name(State st) { -// switch (st) { -// case State::PAUSED: -// return "PAUSED"; -// case State::COMPLETED: -// return "COMPLETED"; -// case State::WORKING: -// return "WORKING"; -// } -// } + LOG(OrderMan, Info, + "Iceberg order {} creating new child order {} with size " + "{} price {}. Filled {} so far out of {}", + key().value(), me->active_child.key.value(), to_send, + me->order_state.price(), me->order_state.filled_quantity(), + me->order_state.quantity()); -// } // namespace orderman -// } // namespace bts + me->active_child.order.activate( + Price(me->order_state.price()), Quantity(to_send), + [this](auto const &op) { this->on_child_activate_completed(op); }); +} + +void IcebergOrder2::work() { + switch (me->internal_status) { + + case InternalStatus::PAUSED: + case InternalStatus::INACTIVE: + bts_assert(me->order_state.quantity() > + me->order_state.filled_quantity()); + bts_assert(me->active_child.is_empty()); + bts_assert(me->services); + + transition(InternalStatus::WORKING); + send_next_child_order(); + break; + + case InternalStatus::WORKING: + case InternalStatus::COMPLETED: + bts_assert(false); + break; + } +} + +void IcebergOrder2::pause() { + switch (me->internal_status) { + + case InternalStatus::WORKING: + bts_assert(me->order_state.quantity() > + me->order_state.filled_quantity()); + bts_assert(!me->active_child.is_empty()); + bts_assert(me->services); + + transition(InternalStatus::PAUSED); + me->start_of_pause = Timer::now(); + me->active_child.reset(); + on_time(); + break; + + case InternalStatus::INACTIVE: + case InternalStatus::PAUSED: + case InternalStatus::COMPLETED: + bts_assert(false); + break; + } +} + +void IcebergOrder2::terminate(api::orderman::OrderStatus reason, + std::string const &msg) { + switch (me->internal_status) { + case InternalStatus::INACTIVE: + case InternalStatus::PAUSED: + case InternalStatus::WORKING: + if (!me->active_child.is_empty()) { + me->active_child.order.cancel(); + me->active_child.reset(); + } + + me->set_external_status(reason); + if (msg.size()) + me->order_state.set_last_msg(msg); + transition(InternalStatus::COMPLETED); + break; + + case InternalStatus::COMPLETED: + bts_assert(false); + break; + } +} + +void orderman::IcebergOrder2::transition(InternalStatus status) { + LOG(OrderMan, Info, "Transitioning iceberg order {} from {} to {}", + key().value(), internal_status_name(me->internal_status), + internal_status_name(status)); + me->internal_status = status; +} + +void orderman::IcebergOrder2::report_state() { + if (me->active_child.state.filled_quantity()) { + api::orderman::OrderState merged_state; + merge_states(me->order_state, me->active_child.state, &merged_state); + me->services->report_state(merged_state); + } else + me->services->report_state(me->order_state); +} + +void orderman::IcebergOrder2::on_child_activate_completed(OrderOpResult r) { + if (r.error == ORDER_ERROR_OK) + return; + + switch (me->internal_status) { + case InternalStatus::PAUSED: + case InternalStatus::WORKING: + terminate(ORDER_STATUS_ERROR, + std::string("Child order operation failed: ") + r.error_msg); + report_and_return(); + return; + case InternalStatus::COMPLETED: + return; + case InternalStatus::INACTIVE: + bts_assert(false); + return; + } +} + +void orderman::IcebergOrder2::initialize_child_builder(IOrderFactory &of) { + // Copy parent definition to child, so the child inherits all the + // standard properties of the parent (side, security, TIF, etc) + auto child_def = me->def; + // Copy the custom part of the child order definition to our child + *child_def.mutable_custom_def() = me->iceberg_def().child(); + + // Build our child builder + me->child_builder = OrderBuilder(key(), child_def, of, 1); + if (me->services) + me->child_builder.activate(*me->services); +} + +void orderman::IcebergOrder2::merge_states( + api::orderman::OrderState const &iceberg_state, + api::orderman::OrderState const &child_state, + api::orderman::OrderState *merged) { + auto child_order_fills = child_state.filled_quantity(); + auto child_order_avg_price = child_state.avg_price(); + auto child_order_last_price = child_state.last_price(); + + auto iceberg_fills = iceberg_state.filled_quantity(); + auto iceberg_avg_price = iceberg_state.avg_price(); + + *merged = iceberg_state; + merged->set_filled_quantity(child_order_fills + iceberg_fills); + merged->set_last_price(child_order_last_price); + merged->set_avg_price((child_order_fills * child_order_avg_price + + iceberg_fills * iceberg_avg_price) / + (child_order_fills + iceberg_fills)); +} + +OrderOpResult IcebergOrder2::report_and_return(api::orderman::OrderError e, + std::string const &msg) { + if (!me->active_child.is_empty()) { + api::orderman::OrderState merged_state; + merge_states(me->order_state, me->active_child.state, &merged_state); + me->services->report_state(merged_state); + } else + me->services->report_state(me->order_state); + return OrderOpResult{e, msg}; +} + +std::string orderman::IcebergOrder2::internal_status_name(InternalStatus st) { + switch (st) { + case InternalStatus::INACTIVE: + return "INACTIVE"; + case InternalStatus::PAUSED: + return "PAUSED"; + case InternalStatus::COMPLETED: + return "COMPLETED"; + case InternalStatus::WORKING: + return "WORKING"; + } +} + +void IcebergOrder2::on_time() { + switch (me->internal_status) { + case InternalStatus::PAUSED: + if (ms_diff(Timer::now(), me->start_of_pause) >= + me->iceberg_def().pause_between_orders_ms()) + work(); + break; + case InternalStatus::INACTIVE: + case InternalStatus::COMPLETED: + case InternalStatus::WORKING: + break; + } +} + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h index f22297007..8a24574a7 100644 --- a/src/lib/orderman/orders/IcebergOrder2.h +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -34,22 +34,32 @@ class IcebergOrder2 : public Order { OrderOpResult on_cancel() override; private: - enum class State; + enum class InternalStatus; struct ActiveChild; struct PImpl; std::unique_ptr me; api::orderman::IcebergOrderDefinition &iceberg_def(); - void initialize_child_builder(IOrderFactory&); - void transition(State state, api::orderman::OrderStatus,std::string const&msg=""); - void on_time(mercury::TimerEvent const &t); + void initialize_child_builder(IOrderFactory &); + + // state transitions + void terminate(api::orderman::OrderStatus reason, + std::string const &msg = ""); + void pause(); + void work(); + void transition(InternalStatus); + + void on_time(); void on_child_order_update(OrderStateUpdateEvent const &ev); void report_state(); void send_next_child_order(); - const char* state_name (State); + std::string internal_status_name(InternalStatus); void merge_states(api::orderman::OrderState const &iceberg_state, api::orderman::OrderState const &child_state, api::orderman::OrderState *merged); - void on_order_op_completed(OrderOpResult); + void on_child_activate_completed(OrderOpResult); + OrderOpResult + report_and_return(api::orderman::OrderError = api::orderman::ORDER_ERROR_OK, + std::string const &error_msg = ""); }; } // namespace orderman From b4ba527c121033d9dc63a1d3d0c85afb6ac0a992 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 14 Feb 2019 12:34:08 -0500 Subject: [PATCH 080/218] Generalized dynamic order mechanism to support any order. --- src/lib/orderman/order_factory/DynamicOrderBuilder.h | 4 ++-- src/lib/orderman/order_factory/DynamicOrderRegistry.cpp | 2 +- src/lib/orderman/order_factory/DynamicOrderRegistry.h | 2 +- src/lib/plugin/SparkServices.cpp | 2 +- src/lib/plugin/SparkServices.h | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/orderman/order_factory/DynamicOrderBuilder.h b/src/lib/orderman/order_factory/DynamicOrderBuilder.h index 9a2262396..602c70138 100644 --- a/src/lib/orderman/order_factory/DynamicOrderBuilder.h +++ b/src/lib/orderman/order_factory/DynamicOrderBuilder.h @@ -7,8 +7,8 @@ namespace bts { namespace orderman { -class DynamicOrder; +class Order; -using DynamicOrderBuilder = std::function()>; +using DynamicOrderBuilder = std::function()>; }} diff --git a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp index a2fda91b4..df2f1b71c 100644 --- a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp +++ b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp @@ -22,7 +22,7 @@ void DynamicOrderRegistry::register_dynamic_order( me->dyn_orders[desc.dynamic_order_type()] = std::make_pair(b, desc); } -std::unique_ptr +std::unique_ptr DynamicOrderRegistry::build(std::string const &dynamic_order_type) const { auto it = me->dyn_orders.find(dynamic_order_type); if (it != me->dyn_orders.end()) diff --git a/src/lib/orderman/order_factory/DynamicOrderRegistry.h b/src/lib/orderman/order_factory/DynamicOrderRegistry.h index 9a53edd2f..be39a26e0 100644 --- a/src/lib/orderman/order_factory/DynamicOrderRegistry.h +++ b/src/lib/orderman/order_factory/DynamicOrderRegistry.h @@ -16,7 +16,7 @@ public: DynamicOrderBuilder const&builder); // can return a null if no such order type exists - std::unique_ptr build(std::string const&dynamic_order_type) const; + std::unique_ptr build(std::string const&dynamic_order_type) const; std::vector get_all_dynamic_order_types() const; private: diff --git a/src/lib/plugin/SparkServices.cpp b/src/lib/plugin/SparkServices.cpp index 444b3a1e8..2c2a0537a 100644 --- a/src/lib/plugin/SparkServices.cpp +++ b/src/lib/plugin/SparkServices.cpp @@ -17,7 +17,7 @@ SparkServices::~SparkServices() {} void SparkServices::register_dynamic_order( api::orderman::DynamicOrderDescriptor const &desc, - std::function()> const &builder) { + std::function()> const &builder) { me->dyn_order_registry.register_dynamic_order(desc, builder); } diff --git a/src/lib/plugin/SparkServices.h b/src/lib/plugin/SparkServices.h index 36f13df24..f40bf533f 100644 --- a/src/lib/plugin/SparkServices.h +++ b/src/lib/plugin/SparkServices.h @@ -8,7 +8,7 @@ namespace bts { namespace orderman { -class DynamicOrder; +class Order; class DynamicOrderRegistry; } // namespace orderman @@ -19,7 +19,7 @@ class SparkServices { void register_dynamic_order( api::orderman::DynamicOrderDescriptor const &desc, - std::function()> const &builder); + std::function()> const &builder); private: struct PImpl; From 7ccbb69f5cbd1aeb14b94d9adbf2c439d5dfb027 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 14 Feb 2019 12:37:19 -0500 Subject: [PATCH 081/218] Made native order ignore any bad updates/cancels after it terminates. --- src/lib/orderman/orders/NativeOrder.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index e26d8ec9f..cc49fc8c5 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -577,11 +577,13 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q) { case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_PENDING_WORKING: + transition(me->state.status(), "Cannot update order"); + break; + case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: case ORDER_STATUS_CANCELED: case ORDER_STATUS_ERROR: - transition(me->state.status(), "Cannot update order"); break; case ORDER_STATUS_INACTIVE: @@ -614,12 +616,14 @@ OrderOpResult NativeOrder::on_cancel() { break; } - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_CANCELED: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: case ORDER_STATUS_ERROR: + break; + + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_PENDING_WORKING: transition(me->state.status(), "Cannot cancel order"); break; From 7740f64bfd12c3a1a0b819d9d74c8d04d7722f84 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 14 Feb 2019 12:40:15 -0500 Subject: [PATCH 082/218] Iceberg2 is working. --- .../actors/order_manager/OrderBuilder.h | 41 ++-- src/lib/orderman/orders/IcebergOrder2.cpp | 222 ++++++++++++------ src/lib/orderman/orders/IcebergOrder2.h | 3 +- src/server/sparkd/cmds/Run.cpp | 18 ++ 4 files changed, 194 insertions(+), 90 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 92b1a1161..78e705570 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -13,50 +13,51 @@ namespace bts { namespace orderman { class OrderBuilder { - public: +public: OrderBuilder() - : _parent_key(null_order_key()), _definition(), _reserve_sz(0), - _order_stash(), _builder_id(), _order_services(nullptr) {} + : _parent_key(null_order_key()), _definition(), _reserve_sz(0), + _order_stash(), _builder_id(), _order_services(nullptr) {} OrderBuilder(OrderBuilder &&src) { operator=(std::move(src)); } OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, IOrderFactory &factory, size_t reserve_sz = 1) - : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), - _order_stash(), _builder_id(++_current_builder_id), - _order_services(nullptr) + : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), + _order_stash(), _builder_id(++_current_builder_id), + _order_services(nullptr) { bts_assert(parent_key != null_order_key()); while (_order_stash.size() != reserve_sz) - _order_stash.push_back( - &factory.create(parent_key, _definition)); + _order_stash.push_back(&factory.create(parent_key, _definition)); } OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, size_t reserve_sz = 1) - : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), - _order_stash(), _builder_id(++_current_builder_id), - _order_services(nullptr) + : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), + _order_stash(), _builder_id(++_current_builder_id), + _order_services(nullptr) { bts_assert(parent_key != null_order_key()); } + bool is_activated() { return _order_services != nullptr; } + void activate(OrderServices &order_services) { bts_assert(!_order_services); _order_services = &order_services; _order_services->subscribe_to_order_creation_reply( - _builder_id, [this](auto const &order_ev) { - _order_stash.insert(_order_stash.end(), order_ev.orders.begin(), - order_ev.orders.end()); - }); + _builder_id, [this](auto const &order_ev) { + _order_stash.insert(_order_stash.end(), order_ev.orders.begin(), + order_ev.orders.end()); + }); } ChildOrder build() { bts_assert_msg( - _order_services, - "OrderBuilder::activate() must be called before orders can be built"); + _order_services, + "OrderBuilder::activate() must be called before orders can be built"); ChildOrder result; if (_order_stash.size()) { @@ -69,8 +70,8 @@ class OrderBuilder { "This will have an impact on performance", _parent_key); result = ChildOrder( - _order_services->order_factory().create(_parent_key, _definition), - *_order_services); + _order_services->order_factory().create(_parent_key, _definition), + *_order_services); } if (_reserve_sz > _order_stash.size()) { auto need = _reserve_sz - _order_stash.size(); @@ -85,7 +86,7 @@ class OrderBuilder { return *this; } - private: +private: void move_here(OrderBuilder &src) { bts_assert(!_order_services); _parent_key = src._parent_key; diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index 99ac7a95f..bd43b6089 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -1,6 +1,9 @@ #include "IcebergOrder2.h" +#include "lib/config/config.h" +#include "lib/config/protos/system.pb.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/plugin/SparkServices.h" #include "lib/utils/PBUtils.h" #include @@ -55,9 +58,20 @@ IcebergOrder2::~IcebergOrder2() {} void IcebergOrder2::on_init_new(OrderDefinition const &def, const PreActivationOrderServices &services) { + // Save our order definition me->def = def; + if (def.custom_def().has_dynamic()) { + me->def = def; + auto &ice = *me->def.mutable_custom_def()->mutable_iceberg(); + auto &dice = def.custom_def().dynamic(); + ice.set_show_quantity(dice.order_params().at("show_size").as_uint32()); + ice.set_pause_between_orders_ms( + dice.order_params().at("pause_ms").as_uint32()); + *ice.mutable_child() = dice.order_params().at("child").as_order_def(); + } + // Initialize mutable iceberg component of our state report me->order_state.mutable_iceberg(); @@ -140,6 +154,10 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, bts_assert(false); return report_and_return(); } + + // compiler + bts_assert(false); + return report_and_return(); } OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { @@ -177,13 +195,15 @@ OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { else if (had_time_sub && !needs_time_sub) me->services->unsubscribe_from_time(); - // copy the new definition + // Copy the new definition and report it *me->def.mutable_custom_def() = update.custom(); - me->services->report_definition(me->def.custom_def()); initialize_child_builder(me->services->order_factory()); + me->services->report_definition(me->def.custom_def()); } me->order_state.set_price(update.price()); me->order_state.set_quantity(update.quantity()); + if (me->order_state.quantity() <= me->order_state.filled_quantity()) + terminate(ORDER_STATUS_COMPLETED); return report_and_return(); case InternalStatus::COMPLETED: @@ -193,21 +213,40 @@ OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { case InternalStatus::INACTIVE: bts_assert(false); return report_and_return(); + break; } + + // compiler + bts_assert(false); + return report_and_return(); +} + +orderman::OrderOpResult orderman::IcebergOrder2::on_cancel() { + switch (me->internal_status) { + case InternalStatus::PAUSED: + case InternalStatus::WORKING: + terminate(ORDER_STATUS_CANCELED); + return report_and_return(); + case InternalStatus::COMPLETED: + return report_and_return(ORDER_ERROR_INVALID_OP, + "Order is already completed"); + case InternalStatus::INACTIVE: + bts_assert(false); + return report_and_return(); + } + + // compiler + bts_assert(false); + return OrderOpResult{}; } void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { - switch (me->internal_status) { - case InternalStatus::PAUSED: - case InternalStatus::COMPLETED: - LOG(OrderMan, Info, - "Iceberg order {} received unexpected child update for child " - "{}." - "update state = {}", - key().value(), ev.key.value(), - utils::pb::to_string(ev.rebuild_state())); - return; + LOG(OrderMan, Info, "Iceberg order {} in {} state received child update: {}", + key().value(), internal_status_name(me->internal_status), + utils::pb::to_string(ev.rebuild_state())); + + switch (me->internal_status) { case InternalStatus::WORKING: if (ev.key != me->active_child.key) { @@ -227,17 +266,19 @@ void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - // nothing to do but report new state + // Nothing to do but report new state (meaning the iceberg + // order state, which hasn't changed, merged with the child + // state, which might have) report_and_return(); return; case ORDER_STATUS_COMPLETED: { // Child has completed, merge its fills and average price - // into our own and decide wheter to terminate, pause or - // work some more + // into our own and decide wheter to terminate or pause api::orderman::OrderState merged_state; merge_states(me->order_state, me->active_child.state, &merged_state); me->order_state = merged_state; + me->active_child.reset(); if (me->order_state.quantity() > me->order_state.filled_quantity()) pause(); else @@ -247,6 +288,16 @@ void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { } case ORDER_STATUS_CANCELED: + LOG(OrderMan, Info, + "Unexpected child order cancelation for child {} in Iceberg Order {}. " + "Canceling parent. Child state: {}", + ev.key.value(), key().value(), + utils::pb::to_string(me->active_child.state)); + me->active_child.reset(); + terminate(ORDER_STATUS_ERROR, "Unexpected child order state"); + report_and_return(); + return; + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_ERROR: @@ -265,30 +316,60 @@ void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { bts_assert(false); return; } // End WORKING internal state + bts_assert(false); + return; + + case InternalStatus::PAUSED: + case InternalStatus::COMPLETED: + LOG(OrderMan, Info, + "Iceberg order {} received unexpected child update for child " + "{}." + "update state = {}", + key().value(), ev.key.value(), + utils::pb::to_string(ev.rebuild_state())); + return; + case InternalStatus::INACTIVE: bts_assert(false); return; } } -orderman::OrderOpResult orderman::IcebergOrder2::on_cancel() { +void IcebergOrder2::on_time() { + switch (me->internal_status) { + case InternalStatus::PAUSED: + if (ms_diff(Timer::now(), me->start_of_pause) >= + me->iceberg_def().pause_between_orders_ms()) + work(); + break; + case InternalStatus::INACTIVE: + case InternalStatus::COMPLETED: + case InternalStatus::WORKING: + break; + } +} + +void orderman::IcebergOrder2::on_child_activate_completed(OrderOpResult r) { + if (r.error == ORDER_ERROR_OK) + return; + switch (me->internal_status) { case InternalStatus::PAUSED: case InternalStatus::WORKING: - terminate(ORDER_STATUS_CANCELED); - return report_and_return(); + terminate(ORDER_STATUS_ERROR, + std::string("Child order operation failed: ") + r.error_msg); + report_and_return(); + return; case InternalStatus::COMPLETED: - return report_and_return(ORDER_ERROR_INVALID_OP, - "Order is already completed"); + return; case InternalStatus::INACTIVE: bts_assert(false); - return report_and_return(); + return; } } void orderman::IcebergOrder2::send_next_child_order() { bts_assert(me->order_state.quantity() > me->order_state.filled_quantity()); - bts_assert(me->internal_status == InternalStatus::WORKING); auto remaining = me->order_state.quantity() - me->order_state.filled_quantity(); @@ -315,13 +396,9 @@ void IcebergOrder2::work() { case InternalStatus::PAUSED: case InternalStatus::INACTIVE: - bts_assert(me->order_state.quantity() > - me->order_state.filled_quantity()); - bts_assert(me->active_child.is_empty()); - bts_assert(me->services); - - transition(InternalStatus::WORKING); + me->start_of_pause = TimeStamp(); send_next_child_order(); + transition(InternalStatus::WORKING); break; case InternalStatus::WORKING: @@ -335,14 +412,9 @@ void IcebergOrder2::pause() { switch (me->internal_status) { case InternalStatus::WORKING: - bts_assert(me->order_state.quantity() > - me->order_state.filled_quantity()); - bts_assert(!me->active_child.is_empty()); - bts_assert(me->services); - - transition(InternalStatus::PAUSED); me->start_of_pause = Timer::now(); me->active_child.reset(); + transition(InternalStatus::PAUSED); on_time(); break; @@ -364,7 +436,7 @@ void IcebergOrder2::terminate(api::orderman::OrderStatus reason, me->active_child.order.cancel(); me->active_child.reset(); } - + me->start_of_pause = TimeStamp(); me->set_external_status(reason); if (msg.size()) me->order_state.set_last_msg(msg); @@ -382,33 +454,41 @@ void orderman::IcebergOrder2::transition(InternalStatus status) { key().value(), internal_status_name(me->internal_status), internal_status_name(status)); me->internal_status = status; + check_invariants(); } -void orderman::IcebergOrder2::report_state() { - if (me->active_child.state.filled_quantity()) { - api::orderman::OrderState merged_state; - merge_states(me->order_state, me->active_child.state, &merged_state); - me->services->report_state(merged_state); - } else - me->services->report_state(me->order_state); -} - -void orderman::IcebergOrder2::on_child_activate_completed(OrderOpResult r) { - if (r.error == ORDER_ERROR_OK) - return; - +void IcebergOrder2::check_invariants() { switch (me->internal_status) { case InternalStatus::PAUSED: + bts_assert(me->external_status() == ORDER_STATUS_WORKING); + bts_assert(me->services); + bts_assert(me->order_state.filled_quantity() < + me->order_state.quantity()); + bts_assert(me->child_builder.is_activated()); + bts_assert(me->active_child.is_empty()); + bts_assert(me->start_of_pause != TimeStamp()); + break; case InternalStatus::WORKING: - terminate(ORDER_STATUS_ERROR, - std::string("Child order operation failed: ") + r.error_msg); - report_and_return(); - return; + bts_assert(me->external_status() == ORDER_STATUS_WORKING); + bts_assert(me->services); + bts_assert(me->order_state.filled_quantity() < + me->order_state.quantity()); + bts_assert(me->child_builder.is_activated()); + bts_assert(!me->active_child.is_empty()); + bts_assert(me->start_of_pause == TimeStamp()); + break; case InternalStatus::COMPLETED: - return; + bts_assert(me->external_status() == ORDER_STATUS_COMPLETED || + me->external_status() == ORDER_STATUS_CANCELED || + me->external_status() == ORDER_STATUS_ERROR || + me->external_status() == ORDER_STATUS_REJECTED_BY_SPARK); + bts_assert(me->active_child.is_empty()); + bts_assert(me->start_of_pause == TimeStamp()); + break; + case InternalStatus::INACTIVE: bts_assert(false); - return; + break; } } @@ -450,11 +530,27 @@ OrderOpResult IcebergOrder2::report_and_return(api::orderman::OrderError e, api::orderman::OrderState merged_state; merge_states(me->order_state, me->active_child.state, &merged_state); me->services->report_state(merged_state); - } else + + LOG(OrderMan, Info, "Iceberg order {} in {} state, publishing update: {}", + key().value(), internal_status_name(me->internal_status), + utils::pb::to_string(merged_state)); + } else { me->services->report_state(me->order_state); + + LOG(OrderMan, Info, "Iceberg order {} in {} state, publishing update: {}", + key().value(), internal_status_name(me->internal_status), + utils::pb::to_string(me->order_state)); + } return OrderOpResult{e, msg}; } +OrderOpResult IcebergOrder2::on_update(Price p, Quantity q) { + Update up; + up.set_price(p.value()); + up.set_quantity(q.value()); + return on_update(up); +} + std::string orderman::IcebergOrder2::internal_status_name(InternalStatus st) { switch (st) { case InternalStatus::INACTIVE: @@ -466,20 +562,8 @@ std::string orderman::IcebergOrder2::internal_status_name(InternalStatus st) { case InternalStatus::WORKING: return "WORKING"; } -} - -void IcebergOrder2::on_time() { - switch (me->internal_status) { - case InternalStatus::PAUSED: - if (ms_diff(Timer::now(), me->start_of_pause) >= - me->iceberg_def().pause_between_orders_ms()) - work(); - break; - case InternalStatus::INACTIVE: - case InternalStatus::COMPLETED: - case InternalStatus::WORKING: - break; - } + bts_assert(false); + return ""; } } // namespace orderman diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h index 8a24574a7..82cc01065 100644 --- a/src/lib/orderman/orders/IcebergOrder2.h +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -31,6 +31,7 @@ class IcebergOrder2 : public Order { const PreActivationOrderServices &) override; OrderOpResult on_activate(Price, Quantity, OrderServices &) override; OrderOpResult on_update(api::orderman::Update const &) override; + OrderOpResult on_update(Price, Quantity) override; OrderOpResult on_cancel() override; private: @@ -50,7 +51,6 @@ class IcebergOrder2 : public Order { void on_time(); void on_child_order_update(OrderStateUpdateEvent const &ev); - void report_state(); void send_next_child_order(); std::string internal_status_name(InternalStatus); void merge_states(api::orderman::OrderState const &iceberg_state, @@ -60,6 +60,7 @@ class IcebergOrder2 : public Order { OrderOpResult report_and_return(api::orderman::OrderError = api::orderman::ORDER_ERROR_OK, std::string const &error_msg = ""); + void check_invariants(); }; } // namespace orderman diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index a73561dec..5a7c8c06b 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -31,6 +31,8 @@ #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/AuthServiceServer.h" +#include "lib/orderman/orders/IcebergOrder2.h" + #include namespace bts { @@ -65,6 +67,22 @@ int Run::execute(std::vector const &) { orderman::DynamicOrderRegistry dyn_order_registry; SparkServices plugin_services(dyn_order_registry); plugin::init_plugins(plugin_services); + + using namespace api::orderman; + DynamicOrderDescriptor desc; + desc.set_dynamic_order_type("ice2"); + auto param = desc.add_param_desc(); + param->set_param_name("show_size"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); + param = desc.add_param_desc(); + param->set_param_name("pause_ms"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); + param = desc.add_param_desc(); + param->set_param_name("child"); + param->mutable_param_type()->set_primitive( + DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); + plugin_services.register_dynamic_order( + desc, []() { return std::make_unique(); }); // finished initializing order plugins orderman::OrderServiceServer order_service_server( From 23d7a9e1ad2633127858b53472382fb853c6979f Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 15 Feb 2019 11:27:25 -0500 Subject: [PATCH 083/218] Improved error handling in native order. --- src/lib/api/services/OrderService.proto | 3 + src/lib/orderman/orders/IcebergOrder2.cpp | 8 ++- src/lib/orderman/orders/NativeOrder.cpp | 76 ++++++++++++++++------- src/lib/orderman/orders/NativeOrder.h | 4 +- src/lib/orderman/orders/OrderOpResult.h | 3 + 5 files changed, 67 insertions(+), 27 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index fb48b3df3..10b0526cf 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -451,6 +451,9 @@ enum OrderError ORDER_ERROR_OK = 9; ORDER_ERROR_OP_NOT_SUPPORTED = 10; ORDER_ERROR_INVALID_OP = 11; + ORDER_ERROR_LIMIT_BREACH = 12; + ORDER_ERROR_MESSAGING_LIMIT_BREACH = 13; + ORDER_ERROR_UNAUTHORIZED = 14; } // Trigger Condition ///////////////////////////////// diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index bd43b6089..c40d2c8b6 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -289,7 +289,8 @@ void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { case ORDER_STATUS_CANCELED: LOG(OrderMan, Info, - "Unexpected child order cancelation for child {} in Iceberg Order {}. " + "Unexpected child order cancelation for child {} in Iceberg Order " + "{}. " "Canceling parent. Child state: {}", ev.key.value(), key().value(), utils::pb::to_string(me->active_child.state)); @@ -350,6 +351,11 @@ void IcebergOrder2::on_time() { } void orderman::IcebergOrder2::on_child_activate_completed(OrderOpResult r) { + + LOG(OrderMan, Info, + "Iceberg order {} child on_activate completed. code: {} msg: {} ", + key().value(), OrderError_Name(r.error), r.error_msg); + if (r.error == ORDER_ERROR_OK) return; diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 91a527014..4055562e8 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -292,8 +292,8 @@ void NativeOrder::warm_up_activate(OrderServicesData &data, me->services = nullptr; } -bool NativeOrder::_on_activate(Price p, Quantity q, - bts::orderman::OrderServices &services) { +OrderOpResult NativeOrder::_on_activate(Price p, Quantity q, + bts::orderman::OrderServices &services) { me->state.set_price(p.value()); me->state.set_quantity(q.value()); me->state.set_filled_quantity(0); @@ -311,8 +311,9 @@ bool NativeOrder::_on_activate(Price p, Quantity q, "Attempt to send order to a disconnected gateway. " "Dropping order {}", key().value()); - transition(ORDER_STATUS_REJECTED_BY_SPARK, "Exchange gateway is down"); - return false; + auto msg = "Exchange gateway is down"; + transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); + return OrderOpResult{ORDER_ERROR_GATEWAY_NOT_READY,msg}; } // can we trade? @@ -326,9 +327,9 @@ bool NativeOrder::_on_activate(Price p, Quantity q, me->definition.user(), me->definition.account(), lqr.error_msg, key().value()); - transition(ORDER_STATUS_REJECTED_BY_SPARK, - fmt::format("Unauthorized order: {}", lqr.error_msg)); - return false; + auto msg = fmt::format("Unauthorized order: {}", lqr.error_msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); + return OrderOpResult{ORDER_ERROR_UNAUTHORIZED,msg}; } // can we trade this security, with this size? @@ -343,9 +344,9 @@ bool NativeOrder::_on_activate(Price p, Quantity q, me->definition.user(), me->definition.account(), lqr.error_msg, key().value()); - transition(ORDER_STATUS_REJECTED_BY_SPARK, - fmt::format("Order would breach limit: {}", lqr.error_msg)); - return false; + auto msg = fmt::format("Order would breach limit: {}", lqr.error_msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); + return OrderOpResult{ORDER_ERROR_LIMIT_BREACH,msg}; } // are we under the messaging threshold? @@ -354,9 +355,9 @@ bool NativeOrder::_on_activate(Price p, Quantity q, "New order would cause breach of messaging " "limits. Dropping order {}", key().value()); - transition(ORDER_STATUS_REJECTED_BY_SPARK, - "Messaging threshold breached"); - return false; + auto msg = "Messaging threshold breached"; + transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); + return OrderOpResult(ORDER_ERROR_MESSAGING_LIMIT_BREACH,msg); } // if we are here we are good. @@ -395,20 +396,21 @@ bool NativeOrder::_on_activate(Price p, Quantity q, auto const &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite( me->create_transact_time_bm, &ts.value()[0], ts.value().size()); - return true; + return OrderOpResult{}; } OrderOpResult NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services) { bts_assert(!me->services); me->services = &services; - + auto result = OrderOpResult {}; switch (me->state.status()) { case ORDER_STATUS_INACTIVE: { // this is a brand new order - if (_on_activate(p, q, services)) { + result = _on_activate(p, q, services); + if (result.ok()) { auto scoped_log = services.log_scope("NativeOrder::on_activate", key().value()); me->services->queue_fix(*me->session_services, @@ -446,8 +448,11 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, *me->session_services, [this](auto const &gw) { this->on_gateway_status(gw); }); - if (!me->services->is_gateway_connected(*me->session_services)) + if (!me->services->is_gateway_connected(*me->session_services)) { + result.error = ORDER_ERROR_GATEWAY_NOT_READY; + result.error_msg = "Gateway is disconnected"; transition(ORDER_STATUS_DISCONNECTED); + } break; case ORDER_STATUS_DISCONNECTED: @@ -493,12 +498,13 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, break; } report_state(); - return OrderOpResult{}; + return result; } OrderOpResult NativeOrder::on_update(Price p, Quantity q) { auto scoped_log = me->services->log_scope("NativeOrder::on_update", key().value()); + auto result = OrderOpResult {}; switch (me->state.status()) { @@ -526,12 +532,16 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q) { "Order update failed due to limit breach. Order: {} Msg: {}", key().value(), lqr.error_msg); + // if we are not being driven by an algo we just signal the + // error but keep running. otherwise we stop. if (parent_key() == null_order_key()) transition(me->state.status(), msg); else { me->state.set_last_msg(msg); on_cancel(); } + result.error = api::orderman::ORDER_ERROR_LIMIT_BREACH; + result.error_msg = lqr.error_msg; break; } @@ -541,12 +551,17 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q) { "Cannot update order {} because of messaging limits. ", key().value()); auto msg = "Messaging threshold breached"; + + // if we are not being driven by an algo we just signal the + // error but keep running. otherwise we stop. if (parent_key() == null_order_key()) transition(me->state.status(), msg); else { me->state.set_last_msg(msg); on_cancel(); } + result.error = api::orderman::ORDER_ERROR_MESSAGING_LIMIT_BREACH; + result.error_msg = msg; break; } @@ -594,7 +609,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q) { break; } report_state(); - return OrderOpResult{}; + return result; } OrderOpResult NativeOrder::on_detach() { return OrderOpResult{}; } @@ -602,6 +617,8 @@ OrderOpResult NativeOrder::on_detach() { return OrderOpResult{}; } OrderOpResult NativeOrder::on_cancel() { auto scoped_log = me->services->log_scope("NativeOrder::on_cancel", key().value()); + auto result = OrderOpResult{}; + switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -621,13 +638,24 @@ OrderOpResult NativeOrder::on_cancel() { case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: case ORDER_STATUS_ERROR: + result.error = ORDER_ERROR_INVALID_OP; + result.error_msg = "Order is already terminated"; break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_PENDING_WORKING: - transition(me->state.status(), "Cannot cancel order"); + case ORDER_STATUS_DISCONNECTED: { + auto msg = "Cannot cancel order"; + result.error = ORDER_ERROR_GATEWAY_NOT_READY; + result.error_msg = msg; + transition(me->state.status(),msg); break; - + } + case ORDER_STATUS_PENDING_WORKING: { + auto msg = "Cannot cancel order"; + result.error = ORDER_ERROR_ORDER_NOT_ACK; + result.error_msg = msg; + transition(me->state.status(),msg); + break; + } case ORDER_STATUS_INACTIVE: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: @@ -635,7 +663,7 @@ OrderOpResult NativeOrder::on_cancel() { break; } report_state(); - return OrderOpResult{}; + return result; } bool NativeOrder::is_old_exe_report( diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 6fe431b0e..7acc4e92d 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -43,8 +43,8 @@ class NativeOrder : public Order { void on_cancel_reject(const CancelRejectEvent &); void on_gateway_status(const GatewayStatusChangeEvent &); void report_state(); - bool _on_activate(Price p, Quantity q, - bts::orderman::OrderServices &services); + OrderOpResult _on_activate(Price p, Quantity q, + bts::orderman::OrderServices &services); void init_fix(); void add_exchange_order_id_to_fix(); diff --git a/src/lib/orderman/orders/OrderOpResult.h b/src/lib/orderman/orders/OrderOpResult.h index 4032dc161..7905c1152 100644 --- a/src/lib/orderman/orders/OrderOpResult.h +++ b/src/lib/orderman/orders/OrderOpResult.h @@ -14,6 +14,9 @@ struct OrderOpResult { OrderOpResult(api::orderman::OrderError e) : error(e), error_msg() {} + bool ok() const {return error == api::orderman::ORDER_ERROR_OK;} + bool fail() const {return !ok();} + api::orderman::OrderError error; std::string error_msg; }; From 3dba49e899f9d027048e31119a0724c305276b88 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 19 Feb 2019 10:18:27 -0500 Subject: [PATCH 084/218] More attach/detach design docs. --- src/lib/orderman/doc/attach_detach.org | 35 +++++++++++++++++++++++- src/lib/orderman/doc/order_man_notes.org | 3 +- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/doc/attach_detach.org b/src/lib/orderman/doc/attach_detach.org index f8ffb58a9..6e11ea3f3 100644 --- a/src/lib/orderman/doc/attach_detach.org +++ b/src/lib/orderman/doc/attach_detach.org @@ -25,8 +25,41 @@ - on_detached(); message OrderDefinition { CTICode cti_code = 9; - CustomerOrFirm customer_or_firm = 10; + l CUSTOMERORFIRM customer_or_firm = 10; OrderSubType sub_type = 12; + repeated uint32 attach_to_order = 13; CustomOrderDefinition custom_def = 11; } +* Order fields +| Field | Group | Muttable | on_attach | +|------------------------+--------------+----------+-------------| +| security_key | standard def | N | from child | +| side | | N | from child | +| user | | N | from parent | +| user_id | | Y | from parent | +| account | | Y | from parent | +| account_id | | Y | from parent | +| time_in_force | | N | from child | +| manual_order_indicator | | Y | from parent | +| cti_code | | N | from child | +| customer_or_firm | | N | from child | +| sub_type | | N | | +| attach_order | | N | | +|------------------------+--------------+----------+-------------| +| custom_def | custom_def | Y | from child | +| | | | | +|------------------------+--------------+----------+-------------| +| key | order_record | N | | +| parent_key | | Y | from parent | +|------------------------+--------------+----------+-------------| +| status | order_state | Y | | +| price | | Y | | +| quantity | | Y | | +| filled_quantity | | Y | | +| last_price | | Y | | +| avg_price | | Y | | +| last_msg | | Y | | +| created | | Y | | +| last_change | | Y | | +| custom_state | custom_state | Y | | + diff --git a/src/lib/orderman/doc/order_man_notes.org b/src/lib/orderman/doc/order_man_notes.org index aa0d8df99..abd25b529 100644 --- a/src/lib/orderman/doc/order_man_notes.org +++ b/src/lib/orderman/doc/order_man_notes.org @@ -556,8 +556,7 @@ digraph G { - FIX generation - Multiple kinds of native orders - Limit enforcement + - Routing - Recovery from disk -- There should be a better correlation between an order request and - its outcome. In the case of errors its pretty lame. - Jetfix gateway threading model is wrong, cannot take one thread for each session From ba11248ac9da7fb6db893902436ef57190a7caec Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 21 Feb 2019 09:03:26 -0500 Subject: [PATCH 085/218] attach/detach --- doc/user/CMakeDeps.cmake | 2 +- src/lib/CMakeDeps.cmake | 2 +- .../actors/order_manager/ChildOrder.h | 58 +++++++----- .../actors/order_manager/OrderManager.h | 3 +- .../actors/order_manager/OrderServices.cpp | 94 +++++++++++++++++++ .../actors/order_manager/OrderServices.h | 17 +++- src/lib/orderman/orders/Order.cpp | 15 ++- src/lib/orderman/orders/Order.h | 21 ++++- 8 files changed, 174 insertions(+), 38 deletions(-) create mode 100644 src/lib/orderman/actors/order_manager/OrderServices.cpp diff --git a/doc/user/CMakeDeps.cmake b/doc/user/CMakeDeps.cmake index 00bd7e37b..0c4f30d0e 100644 --- a/doc/user/CMakeDeps.cmake +++ b/doc/user/CMakeDeps.cmake @@ -1 +1 @@ -set(sources /home/ppinto/Dropbox/bts/spark/doc/user/build.sh;/home/ppinto/Dropbox/bts/spark/doc/user/mkdocs.yml;bts-help-theme/404.html;bts-help-theme/base.html;bts-help-theme/content.html;bts-help-theme/css/base.css;bts-help-theme/css/bts.css;bts-help-theme/css/font-awesome.min.css;bts-help-theme/css/highlight.css;bts-help-theme/css/local.css;bts-help-theme/fonts/fontawesome-webfont.eot;bts-help-theme/fonts/glyphicons-halflings-regular.eot;bts-help-theme/img/favicon.ico;bts-help-theme/js/base.js;bts-help-theme/js/bootstrap-3.0.3.min.js;bts-help-theme/js/highlight.pack.js;bts-help-theme/js/jquery-1.10.2.min.js;bts-help-theme/keyboard-modal.html;bts-help-theme/main.html;bts-help-theme/nav-sub.html;bts-help-theme/nav.html;bts-help-theme/search-modal.html;bts-help-theme/toc.html;docs/Help.md;docs/Launcher.md;docs/Logging-In-to-the-System.md;docs/Market.md;docs/My-Windows.md;docs/Settings.md;docs/Spreader.md;docs/Trading.md;docs/images/image1.png;docs/images/image10.png;docs/images/image11.png;docs/images/image12.png;docs/images/image13.png;docs/images/image14.png;docs/images/image15.png;docs/images/image16.png;docs/images/image17.png;docs/images/image18.png;docs/images/image19.png;docs/images/image2.png;docs/images/image20.png;docs/images/image21.png;docs/images/image22.png;docs/images/image23.png;docs/images/image24.png;docs/images/image25.png;docs/images/image26.png;docs/images/image27.png;docs/images/image28.png;docs/images/image29.png;docs/images/image3.png;docs/images/image30.png;docs/images/image31.png;docs/images/image32.png;docs/images/image33.png;docs/images/image34.png;docs/images/image35.png;docs/images/image36.png;docs/images/image37.png;docs/images/image38.png;docs/images/image39.png;docs/images/image4.png;docs/images/image40.png;docs/images/image41.png;docs/images/image42.png;docs/images/image43.png;docs/images/image44.png;docs/images/image45.png;docs/images/image46.png;docs/images/image47.png;docs/images/image48.png;docs/images/image49.png;docs/images/image5.png;docs/images/image50.png;docs/images/image51.png;docs/images/image52.png;docs/images/image53.png;docs/images/image54.png;docs/images/image55.png;docs/images/image56.png;docs/images/image57.png;docs/images/image58.png;docs/images/image59.png;docs/images/image6.png;docs/images/image60.png;docs/images/image61.png;docs/images/image62.png;docs/images/image63.png;docs/images/image64.png;docs/images/image65.png;docs/images/image66.png;docs/images/image67.png;docs/images/image68.png;docs/images/image69.png;docs/images/image7.png;docs/images/image70.png;docs/images/image71.png;docs/images/image72.png;docs/images/image73.png;docs/images/image74.png;docs/images/image76.png;docs/images/image8.png;docs/images/image9.png;docs/index.md;docs/release_notes.md) \ No newline at end of file +set(sources /home/ppinto/Dropbox/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/index.md;content/bts_spark/Help/image32.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Help/index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Launcher/index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Logging-In-to-the-System/index.md;content/bts_spark/Market/image11.png;content/bts_spark/Market/image12.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image30.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image63.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/My-Windows/index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Settings/index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Spreader/index.md;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image22.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image26.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image36.png;content/bts_spark/Trading/image4.png;content/bts_spark/Trading/image41.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image46.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image65.png;content/bts_spark/Trading/image67.png;content/bts_spark/Trading/image71.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/index.md;content/bts_spark/_index.md;content/bts_spark_sdk/Client/Overview.md;content/bts_spark_sdk/Client/Threading.md;content/bts_spark_sdk/Client/_index.md;content/bts_spark_sdk/Server/_index.md;content/bts_spark_sdk/_index.md;content/release_notes/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html) \ No newline at end of file diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index c520a5933..e0c4c503c 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/IcebergOrder2.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/IcebergOrder2.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 716c411c4..1a25f8460 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -11,22 +11,30 @@ namespace orderman { class ChildOrder { public: ChildOrder() - : _order(nullptr), _parent_order_services(nullptr), + : _child_order(nullptr), _parent_order_services(nullptr), _child_order_services(nullptr), _active(false) {} - ChildOrder(Order &o, OrderServices &services) - : _order(&o), _parent_order_services(&services), - _child_order_services(nullptr), _active(false) {} + ChildOrder(Order &child, OrderServices &parent_services) + : _child_order(&child), _parent_order_services(&parent_services), + _child_order_services(), _active(false) {} + + // This is used in attach, where the child order is already activated + // and ready to go. + ChildOrder(OrderServices&child_services, OrderServices &parent_services) + : _child_order(child_services._owner), + _parent_order_services(&parent_services), + _child_order_services(&child_services), _active(true) + {} ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } ChildOrder &operator=(ChildOrder &&src) { - _order = src._order; + _child_order = src._child_order; _parent_order_services = src._parent_order_services; _child_order_services = src._child_order_services; _active = src._active; - src._order = nullptr; + src._child_order = nullptr; src._parent_order_services = nullptr; src._child_order_services = nullptr; src._active = false; @@ -34,27 +42,27 @@ class ChildOrder { } OrderKey key() const { - bts_assert_d(_order); - return _order->key(); + bts_assert_d(_child_order); + return _child_order->key(); } bool is_active() const { return _active; } - void warm_up_activate() { + void warm_up_activate() { bts_assert(!_active); - _parent_order_services->warm_up_activate_child(*_order); + _parent_order_services->warm_up_activate_child(*_child_order); } // Activate void activate(Price p, Quantity q) { - bts_assert(_order); + bts_assert(_child_order); bts_assert(!_active); - _parent_order_services->activate_child(*_order, p, q); - _child_order_services = _order->_services.get(); + _parent_order_services->activate_child(*_child_order, p, q); + _child_order_services = _child_order->_services.get(); _active = true; } template void activate(Price p, Quantity q, CB const &on_activate_result) { - bts_assert(_order); + bts_assert(_child_order); bts_assert(!_active); auto on_activate_result_wrapper = [this, on_activate_result]( @@ -63,21 +71,21 @@ class ChildOrder { [r, on_activate_result](auto const &) { on_activate_result(r); }); }; - _parent_order_services->activate_child(*_order, p, q, + _parent_order_services->activate_child(*_child_order, p, q, on_activate_result_wrapper); - _child_order_services = _order->_services.get(); + _child_order_services = _child_order->_services.get(); _active = true; } // End Activate // Update void update(Price p, Quantity q) { - bts_assert(_order); + bts_assert(_child_order); bts_assert(_active); _child_order_services->update(p, q); } template void update(Price p, Quantity q, CB const &on_result) { - bts_assert(_order); + bts_assert(_child_order); bts_assert(_active); auto on_result_w = [this, on_result](OrderOpResult const &r) { @@ -87,13 +95,13 @@ class ChildOrder { _child_order_services->update(p, q, on_result_w); } void update(api::orderman::Update const &update) { - bts_assert(_order); + bts_assert(_child_order); bts_assert(_active); _child_order_services->update(update); } template void update(api::orderman::Update const &update, CB const &on_result) { - bts_assert(_order); + bts_assert(_child_order); bts_assert(_active); auto on_result_w = [this, on_result](OrderOpResult const &r) { _parent_order_services->call_with_reentrancy_guard( @@ -105,12 +113,12 @@ class ChildOrder { // Detach void detach() { - bts_assert(_order); + bts_assert(_child_order); bts_assert(_active); _child_order_services->detach(); } template void detach(CB const &on_result) { - bts_assert(_order); + bts_assert(_child_order); bts_assert(_active); auto on_result_w = [this, on_result](OrderOpResult const &r) { _parent_order_services->call_with_reentrancy_guard( @@ -122,12 +130,12 @@ class ChildOrder { // Cancel void cancel() { - bts_assert(_order); + bts_assert(_child_order); bts_assert(_active); _child_order_services->cancel(); } template void cancel(CB const &on_result) { - bts_assert(_order); + bts_assert(_child_order); bts_assert(_active); auto on_result_w = [this, on_result](OrderOpResult const &r) { _parent_order_services->call_with_reentrancy_guard( @@ -139,7 +147,7 @@ class ChildOrder { private: friend class OrderBuilder; - Order *_order; + Order *_child_order; OrderServices *_parent_order_services; OrderServices *_child_order_services; bool _active; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index 0e54a2e65..83aa60f53 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -94,7 +94,8 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void after_event() override; void add_child_order(OrderServices &parent, Order &child); - + Order* lookup_order(OrderKey k); + void publish_order_def_update( OrderKey k, std::shared_ptr const &def); diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp new file mode 100644 index 000000000..17490af97 --- /dev/null +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -0,0 +1,94 @@ +#include "OrderServices.h" +#include "lib/orderman/actors/order_manager/ChildOrder.h" + +namespace bts { +namespace orderman { + +void OrderServices::attach_to_child(OrderKey child_key, + AttachCallback const &cb) { + auto child_order = _data->owner.lookup_order(child_key); + + if (child_order) { + child_order->_services->on_attach_from_parent(*this,cb); + } else { + cb({api::orderman::ORDER_ERROR_UNKNOWN_ORDER, "Unknown child order"}, + nullptr, nullptr); + } +} + +void OrderServices::on_attach_from_parent( + OrderServices &new_parent, + AttachCallback const &cb) { + + call_with_reentrancy_guard([cb, &new_parent](OrderServices &self) { + + // Make sure we can be attached to + auto check_result = self.check_is_attachable(); + if (check_result.fail()) { + cb(check_result, nullptr, nullptr); + return; + } + + self._parent = &new_parent; + self._parent_order_services = new_parent. + ChildOrder me_as_child {self,*self._parent}; + // now recover the state and definition and call on_attached() + // at this point this must work because orders cannot refusal attachments + cb(OrderOpResult(),&me_as_child,nullptr); + self._owner->on_attached(); + }); +} + +OrderOpResult OrderServices::check_is_attachable() { + + using namespace api::orderman; + + // It this order working? + switch (_owner->status()) { + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + return OrderOpResult{ORDER_ERROR_INVALID_OP, + "Cannot attach to a terminated order"}; + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_WORKING: + break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + + // this order is in a working state, to be attachable it must also + // have either no parent or a dead parent. + if (_owner->parent_key() != null_order_key()) { + auto current_parent = _data->owner.lookup_order(_owner->parent_key()); + bts_assert(current_parent); + + switch (current_parent->status()) { + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_WORKING: + return OrderOpResult{ORDER_ERROR_INVALID_OP, + "Child order already has a working parent"}; + break; + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + } + return OrderOpResult{}; // all good if we reach here +} + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index d8290fc4c..12868ddff 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -9,6 +9,7 @@ #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" + #include "lib/tracing/PerfLog.h" #include @@ -378,8 +379,9 @@ class OrderServices { // Detach void detach() { - call_with_reentrancy_guard( - [](OrderServices &self) { self._owner->on_detach(self._do_nothing); }); + call_with_reentrancy_guard([](OrderServices &self) { + self._owner->on_detach(self._do_nothing); + }); } void detach(OrderOpCallback const &on_order_op) { call_with_reentrancy_guard([on_order_op](OrderServices &self) { @@ -409,7 +411,12 @@ class OrderServices { o._services->activate(p, q, cb); } - // Child state callbacks + // attach to child + void attach_to_child(OrderKey child_key, AttachCallback const &); + void on_attach_from_parent( + OrderServices &new_parent, + AttachCallback const &); + void on_child_update(OrderStateUpdateEvent const &ev) { call_with_reentrancy_guard( [ev](OrderServices &self) { self._child_update_cb(ev); }); @@ -417,6 +424,8 @@ class OrderServices { trace::CorID corid() { return _data->cor_id; } + OrderOpResult check_is_attachable(); + bool _busy; boost::container::small_vector, 10> _pending_calls; @@ -433,6 +442,6 @@ class OrderServices { boost::container::small_vector _sessions; EventStream::SubID _time_change_sub; EventStream _create_order_reply; -}; +}; // namespace orderman } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index e0dcd3343..c5aa2b916 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -4,7 +4,13 @@ namespace bts { namespace orderman { -Order::Order() { _services = std::make_unique(*this); } +Order::Order() : + _key(null_order_key()), + _parent_key(null_order_key()), + _def(), + _status (api::orderman::ORDER_STATUS_INACTIVE), + _services (std::make_unique (*this)) +{} void Order::init_order_services(OrderServicesData &osd) { _services->init(osd); @@ -24,5 +30,12 @@ std::shared_ptr const &Order::def() { return _def; } +void Order::set_status(api::orderman::OrderStatus status) +{_status = status;} + +api::orderman::OrderStatus Order::status() const +{return _status;} + + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index c45ff4ecb..c1d075418 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -32,7 +32,11 @@ namespace orderman { class PreActivationOrderServices; class OrderServices; +class ChildOrder; using OrderOpCallback = std::function; +using AttachCallback = std::function; class Order { public: @@ -90,20 +94,27 @@ class Order { "Not implemented"}; } -protected: - virtual void warm_up_activate(OrderServicesData&,OrderServices&) {} + virtual void on_attached() { + } + + protected: + virtual void warm_up_activate(OrderServicesData &, OrderServices &) {} void init_order_services(OrderServicesData &); - void init_order_services(OrderServicesData &,OrderServices &parent); + void init_order_services(OrderServicesData &, OrderServices &parent); private: OrderKey _key; OrderKey _parent_key; - std::unique_ptr _services; std::shared_ptr _def; - + api::orderman::OrderStatus _status; + std::unique_ptr _services; + void set_def(api::orderman::OrderDefinition const &); std::shared_ptr const &def(); + void set_status(api::orderman::OrderStatus status); + api::orderman::OrderStatus status() const; + friend class OrderFactory; friend class OrderManager; friend class OrderServices; From d4caccdbfb45334e082a529678d54e2a2f07923b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 22 Feb 2019 14:50:25 -0500 Subject: [PATCH 086/218] Build. --- src/lib/api/services/OrderService.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 7d6fc744f..5dc76ddfe 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -69,7 +69,7 @@ message OrderDefinition { CTICode cti_code = 9; CustomerOrFirm customer_or_firm = 10; OrderSubType sub_type = 12; - repeated uint32 attach_order = 15; + repeated uint32 attach_order = 16; CustomOrderDefinition custom_def = 11; } From 84a5a11a9c620fd0547398dd7f4cfdb0d710a98d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 25 Feb 2019 12:49:23 -0500 Subject: [PATCH 087/218] attach/detach code complete perhaps. --- src/lib/CMakeDeps.cmake | 2 +- .../actors/order_manager/ChildOrder.h | 9 ++++ .../actors/order_manager/OrderManager.cpp | 10 ++++ .../actors/order_manager/OrderServices.cpp | 39 ++++++++++----- .../actors/order_manager/OrderServices.h | 25 +++++----- .../orderman/events/OrderStateUpdateEvent.h | 47 +++++++++++-------- src/lib/orderman/orders/Order.cpp | 2 + src/lib/orderman/orders/Order.h | 13 ++--- src/server/sparkd/CMakeDeps.cmake | 2 +- src/web/CMakeDeps.cmake | 2 +- 10 files changed, 97 insertions(+), 54 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index c3f1bef94..8d1495bf1 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStat +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/IcebergOrder2.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 1a25f8460..ce167b3f6 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -27,6 +27,7 @@ class ChildOrder { {} ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } + ChildOrder(ChildOrder const &src) { operator=(src); } ChildOrder &operator=(ChildOrder &&src) { _child_order = src._child_order; @@ -41,6 +42,14 @@ class ChildOrder { return *this; } + ChildOrder &operator=(ChildOrder const &src) { + _child_order = src._child_order; + _parent_order_services = src._parent_order_services; + _child_order_services = src._child_order_services; + _active = src._active; + return *this; + } + OrderKey key() const { bts_assert_d(_child_order); return _child_order->key(); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 0349ed84c..984ed04b6 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -319,6 +319,16 @@ void OrderManager::add_child_order(OrderServices &parent, Order &child) { bts_assert(r.second); } +Order* OrderManager::lookup_order(OrderKey k) +{ + auto it = me->orders.find(k); + if (it == me->orders.end()) { + return nullptr; + } else { + return it->second; + } +} + void OrderManager::on_new_fix_buffer( const mercury::Update &m) { if (m.events) diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index 17490af97..c475182c8 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -4,37 +4,50 @@ namespace bts { namespace orderman { -void OrderServices::attach_to_child(OrderKey child_key, - AttachCallback const &cb) { +using namespace api::orderman; + +void OrderServices::attach(OrderKey child_key, AttachCallback const &cb) { auto child_order = _data->owner.lookup_order(child_key); + auto protected_cb = + AttachCallback([cb, this](OrderOpResult r, ChildOrder const &child, + OrderDefinition const &child_def, + OrderState const &child_state) { + call_with_reentrancy_guard( + [cb, r, child, child_def, child_state](auto const &) { + cb(r, child, child_def, child_state); + }); + }); + if (child_order) { - child_order->_services->on_attach_from_parent(*this,cb); + child_order->_services->on_attach(*this, protected_cb); } else { - cb({api::orderman::ORDER_ERROR_UNKNOWN_ORDER, "Unknown child order"}, - nullptr, nullptr); + protected_cb({ORDER_ERROR_UNKNOWN_ORDER, "Unknown child order"}, {}, {},{}); } } -void OrderServices::on_attach_from_parent( - OrderServices &new_parent, - AttachCallback const &cb) { +void OrderServices::on_attach(OrderServices &new_parent, + AttachCallback const &cb) { call_with_reentrancy_guard([cb, &new_parent](OrderServices &self) { - // Make sure we can be attached to auto check_result = self.check_is_attachable(); if (check_result.fail()) { - cb(check_result, nullptr, nullptr); + cb(check_result, {},{}, {}); return; } + // Set my new parent information self._parent = &new_parent; - self._parent_order_services = new_parent. - ChildOrder me_as_child {self,*self._parent}; + self._owner->set_parent_key(new_parent._owner->key()); + + // Now create the child order what will represent us in the new + // parent + ChildOrder me_as_child{self, *self._parent}; + // now recover the state and definition and call on_attached() // at this point this must work because orders cannot refusal attachments - cb(OrderOpResult(),&me_as_child,nullptr); + cb({}, me_as_child, *self._owner->def(),self._last_update.rebuild_state()); self._owner->on_attached(); }); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 12868ddff..e0a2ac6e8 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -174,11 +174,11 @@ class OrderServices { _data->owner.publish(_data->report_order_definition_pub, _owner->key(), _owner->def()); } - void report_state(const api::orderman::OrderState &state) { - OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), state, - corid()); - _data->owner.publish(_data->report_order_state_pub, ev); + void report_state(const api::orderman::OrderState &state) { + _owner->set_status(state.status()); + _last_update.init(_owner->key(), _owner->parent_key(), state); + _data->owner.publish(_data->report_order_state_pub, _last_update); if (orderman::in_terminal_state(state.status())) { LOG(OrderMan, Info, @@ -194,7 +194,7 @@ class OrderServices { } if (_parent) - _parent->on_child_update(ev); + _parent->on_child_update(_last_update); } Limiter &limiter() { return _data->limiter; } @@ -289,6 +289,10 @@ class OrderServices { // End Subscriptions ------------------------------ + // Caller is the future parent of an existing order, + // i.e. caller will attach to an existing order. + void attach(OrderKey child_key, AttachCallback const &); + private: friend class OrderBuilder; @@ -411,12 +415,9 @@ class OrderServices { o._services->activate(p, q, cb); } - // attach to child - void attach_to_child(OrderKey child_key, AttachCallback const &); - void on_attach_from_parent( - OrderServices &new_parent, - AttachCallback const &); - + // New Parent wants to attach + void on_attach(OrderServices &new_parent, AttachCallback const &); + void on_child_update(OrderStateUpdateEvent const &ev) { call_with_reentrancy_guard( [ev](OrderServices &self) { self._child_update_cb(ev); }); @@ -434,7 +435,7 @@ class OrderServices { OrderServices *_parent; std::function _child_update_cb; std::function _do_nothing; - + OrderStateUpdateEvent _last_update; EventStream _book_updates; EventStream _ticker_updates; EventStream _settlement_updates; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index ceddf031a..414f2e17f 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -1,7 +1,8 @@ #pragma once -#include "lib/mercury/events/Event.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/mercury/events/Event.h" +#include "lib/orderman/order_factory/OrderFactory.h" #include "lib/tracing/PerfLog.h" #include @@ -12,11 +13,19 @@ namespace orderman { class OrderStateUpdateEvent : public mercury::Event { public: using SynopsisPolicy = mercury::CacheAll; - OrderStateUpdateEvent(OrderKey key, OrderKey parent_key, - api::orderman::OrderState const &state, - trace::CorID const &trace = trace::CorID()) - : key(key), parent_key(parent_key), trace(trace) { + OrderStateUpdateEvent() + : key(null_order_key()), parent_key(null_order_key()) {} + + OrderStateUpdateEvent(OrderKey k, OrderKey pk, + api::orderman::OrderState const &state) { + init(k,pk,state); + } + + void init (OrderKey k, OrderKey pk, + api::orderman::OrderState const &state) { + key = k; + parent_key = pk; status = state.status(); price = state.price(); quantity = state.quantity(); @@ -25,9 +34,9 @@ class OrderStateUpdateEvent : public mercury::Event { avg_price = state.avg_price(); last_msg = state.last_msg(); display_status = state.display_status(); - + custom = state.custom_case(); - + auto native_state = get_native_state(state); if (native_state) { exchange_order_id = native_state->exchange_order_id(); @@ -40,6 +49,7 @@ class OrderStateUpdateEvent : public mercury::Event { &last_transact_time); } } + OrderKey key; OrderKey parent_key; @@ -52,8 +62,7 @@ class OrderStateUpdateEvent : public mercury::Event { double avg_price; std::string last_msg; api::orderman::OrderState::DisplayStatus display_status; - - trace::CorID trace; + api::orderman::OrderState::CustomCase custom; // native order state @@ -75,7 +84,7 @@ class OrderStateUpdateEvent : public mercury::Event { result.set_avg_price(avg_price); result.set_last_msg(last_msg); result.set_display_status(display_status); - + switch (custom) { case api::orderman::OrderState::kMarket: rebuild_native_state(result.mutable_market()->mutable_native_state()); @@ -87,7 +96,8 @@ class OrderStateUpdateEvent : public mercury::Event { rebuild_native_state(result.mutable_stop()->mutable_native_state()); break; case api::orderman::OrderState::kStopLimit: - rebuild_native_state(result.mutable_stop_limit()->mutable_native_state()); + rebuild_native_state( + result.mutable_stop_limit()->mutable_native_state()); break; case api::orderman::OrderState::kIceberg: result.mutable_iceberg(); @@ -121,23 +131,22 @@ class OrderStateUpdateEvent : public mercury::Event { break; case api::orderman::OrderState::kOco: result.mutable_oco(); - break; + break; case api::orderman::OrderState::kPricer: result.mutable_pricer(); - break; + break; case api::orderman::OrderState::kDynamic: result.mutable_dynamic(); break; case api::orderman::OrderState::CUSTOM_NOT_SET: break; } - + return result; } -private: - void rebuild_native_state(api::orderman::NativeOrderState *st) const - { + private: + void rebuild_native_state(api::orderman::NativeOrderState *st) const { st->set_exchange_order_id(exchange_order_id); st->set_last_msg_seq_num(last_msg_seq_num); st->set_sub_error_code(sub_error_code); @@ -146,8 +155,7 @@ private: st->set_native_type(native_type); st->set_last_transact_time(to_str(last_transact_time)); } - - + api::orderman::NativeOrderState const * get_native_state(api::orderman::OrderState const &st) { switch (st.custom_case()) { @@ -163,7 +171,6 @@ private: return nullptr; }; } - }; } // namespace orderman diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index c5aa2b916..3c5384bc2 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -36,6 +36,8 @@ void Order::set_status(api::orderman::OrderStatus status) api::orderman::OrderStatus Order::status() const {return _status;} +void Order::set_parent_key(OrderKey parent_key) +{_parent_key = parent_key;} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index c1d075418..aa1de2714 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -35,8 +35,8 @@ class OrderServices; class ChildOrder; using OrderOpCallback = std::function; using AttachCallback = std::function; + OrderOpResult, ChildOrder const &, api::orderman::OrderDefinition const &, + api::orderman::OrderState const &)>; class Order { public: @@ -94,9 +94,8 @@ class Order { "Not implemented"}; } - virtual void on_attached() { - } - + virtual void on_attached() {} + protected: virtual void warm_up_activate(OrderServicesData &, OrderServices &) {} void init_order_services(OrderServicesData &); @@ -108,13 +107,15 @@ class Order { std::shared_ptr _def; api::orderman::OrderStatus _status; std::unique_ptr _services; - + void set_def(api::orderman::OrderDefinition const &); std::shared_ptr const &def(); void set_status(api::orderman::OrderStatus status); api::orderman::OrderStatus status() const; + void set_parent_key(OrderKey parent_key); + friend class OrderFactory; friend class OrderManager; friend class OrderServices; diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 079b6c049..ff557cbbe 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;algo/AlgoServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) +set(sources algo/AlgoDefinitionServiceServer.cpp;algo/AlgoServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 3e95f485d..a717036b4 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From 74066c0ffe14fe0e0e3fdee73b45855f5ffc3a26 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 25 Feb 2019 13:55:13 -0500 Subject: [PATCH 088/218] Refactored OrderServices --- .../actors/order_manager/OrderServices.cpp | 104 ++++++++++- .../actors/order_manager/OrderServices.h | 166 ++---------------- .../actors/order_manager/SessionServices.h | 108 ++++++++++++ 3 files changed, 219 insertions(+), 159 deletions(-) create mode 100644 src/lib/orderman/actors/order_manager/SessionServices.h diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index c475182c8..1bde9074a 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -6,9 +6,84 @@ namespace orderman { using namespace api::orderman; -void OrderServices::attach(OrderKey child_key, AttachCallback const &cb) { - auto child_order = _data->owner.lookup_order(child_key); +OrderServices::OrderServices(Order &owner) + : _busy(false), _pending_calls(), _owner(&owner), _data(), _parent(nullptr), + _child_update_cb([](auto const &) {}), _do_nothing([](auto const &) {}), + _book_updates(), _ticker_updates(), _settlement_updates(), _time_change(), + _sessions() {} +void OrderServices::init(OrderServicesData &data, OrderServices &parent) { + _parent = &parent; + init(data); +} + +void OrderServices::init(OrderServicesData &data) { + _data = &data; + _book_updates.init(*data.md_subs); + _ticker_updates.init(*data.ticker_subs); + _settlement_updates.init(*data.settlement_subs); + _time_change.init(*data.time_subs); + if (_sessions.empty()) + for (auto &sd : data.sessions) + _sessions.emplace_back(*sd); + _create_order_reply.init(*data.order_creation_subs); +} + +void OrderServices::report_definition( + const api::orderman::CustomOrderDefinition &cdef) { + auto new_def = *_owner->def(); + *new_def.mutable_custom_def() = cdef; + _owner->set_def(new_def); + _data->owner.publish(_data->report_order_definition_pub, _owner->key(), + _owner->def()); +} + +void OrderServices::report_state(const api::orderman::OrderState &state) { + _owner->set_status(state.status()); + _last_update.init(_owner->key(), _owner->parent_key(), state); + _data->owner.publish(_data->report_order_state_pub, _last_update); + + if (orderman::in_terminal_state(state.status())) { + LOG(OrderMan, Info, + "Order {} transitioned to a terminal state. Canceling all " + "subscriptions", + _owner->key().value()); + unsubscribe_from_child_updates(); + _book_updates.unsub_all(); + _ticker_updates.unsub_all(); + _settlement_updates.unsub_all(); + _time_change.unsub_all(); + _create_order_reply.unsub_all(); + } + + if (_parent) + _parent->on_child_update(_last_update); +} + +SessionServices & +OrderServices::get_session_services(std::string const &for_session) { + for (auto &s : _sessions) + if (s.session_name() == for_session) + return s; + bts_assert(false); +} + +void OrderServices::unsubscribe_from_order_creation_reply( + CreateOrderReplySubID sid) { + _create_order_reply.unsub(sid); +} + +void OrderServices::send_order_create_req( + size_t builder_id, OrderKey pk, api::orderman::OrderDefinition const &def, + size_t n_orders) { + _data->owner.publish(_data->create_order_req_pub, builder_id, pk, def, + n_orders); +} + +// Called by user code when attempting to attach to an existing order +void OrderServices::attach(OrderKey child_key, AttachCallback const &cb) { + + // wrap the user provided callback so we avoid reentrancy issues. auto protected_cb = AttachCallback([cb, this](OrderOpResult r, ChildOrder const &child, OrderDefinition const &child_def, @@ -19,13 +94,23 @@ void OrderServices::attach(OrderKey child_key, AttachCallback const &cb) { }); }); + // lookup the order we are supposed to attach to + auto child_order = _data->owner.lookup_order(child_key); + + // if we found a matching order, try to attach to it, passing the + // return CB so that the child order on_attach call can report on + // the attachment success or failure if (child_order) { child_order->_services->on_attach(*this, protected_cb); } else { - protected_cb({ORDER_ERROR_UNKNOWN_ORDER, "Unknown child order"}, {}, {},{}); + // if we cannot find a matching child then we abort the + // attachment attempt + protected_cb({ORDER_ERROR_UNKNOWN_ORDER, "Unknown child order"}, {}, {}, + {}); } } +// Called by parent order to try to attach to this order void OrderServices::on_attach(OrderServices &new_parent, AttachCallback const &cb) { @@ -33,7 +118,7 @@ void OrderServices::on_attach(OrderServices &new_parent, // Make sure we can be attached to auto check_result = self.check_is_attachable(); if (check_result.fail()) { - cb(check_result, {},{}, {}); + cb(check_result, {}, {}, {}); return; } @@ -41,13 +126,20 @@ void OrderServices::on_attach(OrderServices &new_parent, self._parent = &new_parent; self._owner->set_parent_key(new_parent._owner->key()); + // report our state again to make sure the new parent key is + // seen by all + self._last_update.parent_key = new_parent._owner->key(); + self._data->owner.publish(self._data->report_order_state_pub, + self._last_update); + // Now create the child order what will represent us in the new // parent ChildOrder me_as_child{self, *self._parent}; // now recover the state and definition and call on_attached() - // at this point this must work because orders cannot refusal attachments - cb({}, me_as_child, *self._owner->def(),self._last_update.rebuild_state()); + // at this point this must work because orders cannot refuse attachments + cb({}, me_as_child, *self._owner->def(), + self._last_update.rebuild_state()); self._owner->on_attached(); }); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index e0a2ac6e8..dc9adf998 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -9,6 +9,7 @@ #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" +#include "lib/orderman/actors/order_manager/SessionServices.h" #include "lib/tracing/PerfLog.h" #include @@ -18,119 +19,13 @@ namespace bts { namespace orderman { -class OrderServices; -class SessionServices { - friend class OrderServices; - EventStream _exe_reports; - EventStream _cancel_rejects; - EventStream _gateway_status; - SessionServicesData *_session_data; - EventStream::SubID - _gateway_status_sub; - - public: - SessionServices(SessionServices &&ss) { operator=(std::move(ss)); } - - SessionServices(SessionServices const &ss) { operator=(ss); } - - SessionServices(SessionServicesData &session_data) - : _exe_reports(*session_data.exe_report_subs), - _cancel_rejects(*session_data.cancel_reject_subs), - _gateway_status(*session_data.gateway_status_subs), - _session_data(&session_data), _gateway_status_sub() {} - - SessionServices &operator=(SessionServices &&src) { - _exe_reports = std::move(src._exe_reports); - _cancel_rejects = std::move(src._cancel_rejects); - _gateway_status = std::move(src._gateway_status); - _session_data = src._session_data; - src._session_data = nullptr; - _gateway_status_sub = src._gateway_status_sub; - return *this; - } - - SessionServices &operator=(SessionServices const &src) { - _exe_reports = src._exe_reports; - _cancel_rejects = src._cancel_rejects; - _gateway_status = src._gateway_status; - _session_data = src._session_data; - _gateway_status_sub = src._gateway_status_sub; - return *this; - } - - protected: - std::string const &session_name() const { return _session_data->session; } - - config::JetFIX::Connection const &session_cfg() const { - return _session_data->cfg; - } - - void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, - trace::CorID const &corid) { - auto &stream = _session_data->current_buffer->first_stream(); - stream.new_msg(mt).append(f); - - if (stream.n_msgs() == 1) - _session_data->current_trace = corid; - } - - bool is_gateway_connected() const { return _session_data->gw_connected; } - Governor &governor() { return _session_data->governor; } - - // Subscriptions - using ExeReportSubID = EventStream::SubID; - using CancelRejectSubID = EventStream::SubID; - - template - ExeReportSubID subscribe_to_exe_report(OrderKey k, CB &&cb) { - return _exe_reports.sub(k, std::forward(cb)); - } - void unsubscribe_from_exe_report(ExeReportSubID sid) { - _exe_reports.unsub(sid); - } - - template - CancelRejectSubID subscribe_to_cancel_reject(OrderKey k, CB &&cb) { - return _cancel_rejects.sub(k, std::forward(cb)); - } - void unsubscribe_from_cancel_reject(CancelRejectSubID sid) { - _cancel_rejects.unsub(sid); - } - - template void subscribe_to_gateway_status(CB &&cb) { - _gateway_status_sub = _gateway_status.sub(std::forward(cb)); - } - void unsubscribe_from_gateway_status() { - _gateway_status.unsub(_gateway_status_sub); - } -}; - class OrderServices { friend class OrderManager; public: - OrderServices(Order &owner) - : _busy(false), _pending_calls(), _owner(&owner), _data(), - _parent(nullptr), _child_update_cb([](auto const &) {}), - _do_nothing([](auto const &) {}), _book_updates(), _ticker_updates(), - _settlement_updates(), _time_change(), _sessions() {} - - void init(OrderServicesData &data, OrderServices &parent) { - _parent = &parent; - init(data); - } - - void init(OrderServicesData &data) { - _data = &data; - _book_updates.init(*data.md_subs); - _ticker_updates.init(*data.ticker_subs); - _settlement_updates.init(*data.settlement_subs); - _time_change.init(*data.time_subs); - if (_sessions.empty()) - for (auto &sd : data.sessions) - _sessions.emplace_back(*sd); - _create_order_reply.init(*data.order_creation_subs); - } + OrderServices(Order &owner); + void init(OrderServicesData &, OrderServices &) ; + void init(OrderServicesData &) ; securities::ISecurityDB &sec_db() { return _data->sec_db; } IOrderFactory &order_factory() { return _data->order_factory; } @@ -167,44 +62,13 @@ class OrderServices { uint64_1, txt_1, uint32_1); } - void report_definition(const api::orderman::CustomOrderDefinition &cdef) { - auto new_def = *_owner->def(); - *new_def.mutable_custom_def() = cdef; - _owner->set_def(new_def); - _data->owner.publish(_data->report_order_definition_pub, _owner->key(), - _owner->def()); - } - - void report_state(const api::orderman::OrderState &state) { - _owner->set_status(state.status()); - _last_update.init(_owner->key(), _owner->parent_key(), state); - _data->owner.publish(_data->report_order_state_pub, _last_update); - - if (orderman::in_terminal_state(state.status())) { - LOG(OrderMan, Info, - "Order {} transitioned to a terminal state. Canceling all " - "subscriptions", - _owner->key().value()); - unsubscribe_from_child_updates(); - _book_updates.unsub_all(); - _ticker_updates.unsub_all(); - _settlement_updates.unsub_all(); - _time_change.unsub_all(); - _create_order_reply.unsub_all(); - } - - if (_parent) - _parent->on_child_update(_last_update); - } + void report_definition(const api::orderman::CustomOrderDefinition &) ; + + void report_state(const api::orderman::OrderState &); Limiter &limiter() { return _data->limiter; } - SessionServices &get_session_services(std::string const &for_session) { - for (auto &s : _sessions) - if (s.session_name() == for_session) - return s; - bts_assert(false); - } + SessionServices &get_session_services(std::string const &for_session) ; // Subscriptions ------------------------------ @@ -331,16 +195,12 @@ class OrderServices { CB &&cb) { return _create_order_reply.sub(req_id, std::forward(cb)); } - void unsubscribe_from_order_creation_reply(CreateOrderReplySubID sid) { - _create_order_reply.unsub(sid); - } - void send_order_create_req(size_t builder_id, OrderKey pk, - api::orderman::OrderDefinition const &def, - size_t n_orders) { - _data->owner.publish(_data->create_order_req_pub, builder_id, pk, def, - n_orders); - } + void unsubscribe_from_order_creation_reply(CreateOrderReplySubID ) ; + + void send_order_create_req(size_t builder_id, OrderKey , + api::orderman::OrderDefinition const &, + size_t n_orders) ; friend class ChildOrder; diff --git a/src/lib/orderman/actors/order_manager/SessionServices.h b/src/lib/orderman/actors/order_manager/SessionServices.h new file mode 100644 index 000000000..eab64257e --- /dev/null +++ b/src/lib/orderman/actors/order_manager/SessionServices.h @@ -0,0 +1,108 @@ +#pragma once + +#include "lib/api/services/OrderService.pb.h" +#include "lib/jetfix/common/OutFIX.h" +#include "lib/logging/logging.h" +#include "lib/orderman/actors/order_manager/OrderManager.h" +#include "lib/orderman/actors/order_manager/OrderServicesData.h" +#include "lib/orderman/events/TickerUpdateEvent.h" +#include "lib/orderman/governor/Governor.h" +#include "lib/orderman/orderman_utils/EventStream.h" +#include "lib/orderman/orders/Order.h" + +#include "lib/tracing/PerfLog.h" +#include + +#include + +namespace bts { +namespace orderman { + +class OrderServices; +class SessionServices { + friend class OrderServices; + EventStream _exe_reports; + EventStream _cancel_rejects; + EventStream _gateway_status; + SessionServicesData *_session_data; + EventStream::SubID + _gateway_status_sub; + + public: + SessionServices(SessionServices &&ss) { operator=(std::move(ss)); } + + SessionServices(SessionServices const &ss) { operator=(ss); } + + SessionServices(SessionServicesData &session_data) + : _exe_reports(*session_data.exe_report_subs), + _cancel_rejects(*session_data.cancel_reject_subs), + _gateway_status(*session_data.gateway_status_subs), + _session_data(&session_data), _gateway_status_sub() {} + + SessionServices &operator=(SessionServices &&src) { + _exe_reports = std::move(src._exe_reports); + _cancel_rejects = std::move(src._cancel_rejects); + _gateway_status = std::move(src._gateway_status); + _session_data = src._session_data; + src._session_data = nullptr; + _gateway_status_sub = src._gateway_status_sub; + return *this; + } + + SessionServices &operator=(SessionServices const &src) { + _exe_reports = src._exe_reports; + _cancel_rejects = src._cancel_rejects; + _gateway_status = src._gateway_status; + _session_data = src._session_data; + _gateway_status_sub = src._gateway_status_sub; + return *this; + } + + protected: + std::string const &session_name() const { return _session_data->session; } + + config::JetFIX::Connection const &session_cfg() const { + return _session_data->cfg; + } + + void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, + trace::CorID const &corid) { + auto &stream = _session_data->current_buffer->first_stream(); + stream.new_msg(mt).append(f); + + if (stream.n_msgs() == 1) + _session_data->current_trace = corid; + } + + bool is_gateway_connected() const { return _session_data->gw_connected; } + Governor &governor() { return _session_data->governor; } + + // Subscriptions + using ExeReportSubID = EventStream::SubID; + using CancelRejectSubID = EventStream::SubID; + + template + ExeReportSubID subscribe_to_exe_report(OrderKey k, CB &&cb) { + return _exe_reports.sub(k, std::forward(cb)); + } + void unsubscribe_from_exe_report(ExeReportSubID sid) { + _exe_reports.unsub(sid); + } + + template + CancelRejectSubID subscribe_to_cancel_reject(OrderKey k, CB &&cb) { + return _cancel_rejects.sub(k, std::forward(cb)); + } + void unsubscribe_from_cancel_reject(CancelRejectSubID sid) { + _cancel_rejects.unsub(sid); + } + + template void subscribe_to_gateway_status(CB &&cb) { + _gateway_status_sub = _gateway_status.sub(std::forward(cb)); + } + void unsubscribe_from_gateway_status() { + _gateway_status.unsub(_gateway_status_sub); + } +}; + +}} From 1a8a492ef778b328b7b7e86f46240ae28e538a84 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 26 Feb 2019 09:56:24 -0500 Subject: [PATCH 089/218] Attach/detach tweaks. --- src/lib/orderman/actors/order_manager/OrderManager.h | 5 ++--- .../orderman/actors/order_manager/OrderServices.cpp | 4 ++-- src/lib/orderman/events/OrderStateUpdateEvent.h | 12 ++++++++---- src/lib/orderman/orders/Order.cpp | 2 +- src/lib/orderman/orders/Order.h | 4 ++-- .../orders/spreader_orders/SpreaderOrder.cpp | 5 +++-- .../orderman/orders/spreader_orders/SpreaderOrder.h | 1 + .../orders/spreader_orders/tests/tests_common.h | 2 +- 8 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index 83aa60f53..b6ed5497d 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -48,12 +48,11 @@ namespace orderman { // - an order factory (OrderFactory) // - a security database (SecurityDB) // - a limiter which enforces risk limits (Limiter) +// - a set of execution gateways // - subscriptions to interesting events such as: -// - execution gateway messages (execution reports, rejects, etc) // - market data book updates -// - security creation events +// - security discuovery events // - timer updates -// - order state changes // // Additionally handles order maintenance events: // - create diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index 1bde9074a..547bdde11 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -40,7 +40,7 @@ void OrderServices::report_definition( void OrderServices::report_state(const api::orderman::OrderState &state) { _owner->set_status(state.status()); - _last_update.init(_owner->key(), _owner->parent_key(), state); + _last_update.init(_owner->key(), _owner->parent_key(), _owner->def(),state); _data->owner.publish(_data->report_order_state_pub, _last_update); if (orderman::in_terminal_state(state.status())) { @@ -140,7 +140,7 @@ void OrderServices::on_attach(OrderServices &new_parent, // at this point this must work because orders cannot refuse attachments cb({}, me_as_child, *self._owner->def(), self._last_update.rebuild_state()); - self._owner->on_attached(); + self._owner->on_attached(new_parent._owner->def()); }); } diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 414f2e17f..01e1ec0e4 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -18,14 +18,17 @@ class OrderStateUpdateEvent : public mercury::Event { : key(null_order_key()), parent_key(null_order_key()) {} OrderStateUpdateEvent(OrderKey k, OrderKey pk, + std::shared_ptr const &def, api::orderman::OrderState const &state) { - init(k,pk,state); + init(k, pk, def,state); } - void init (OrderKey k, OrderKey pk, - api::orderman::OrderState const &state) { + void init(OrderKey k, OrderKey pk, + std::shared_ptr const &def, + api::orderman::OrderState const &state) { key = k; parent_key = pk; + definition = def; status = state.status(); price = state.price(); quantity = state.quantity(); @@ -52,7 +55,8 @@ class OrderStateUpdateEvent : public mercury::Event { OrderKey key; OrderKey parent_key; - + std::shared_ptr definition; + // common state api::orderman::OrderStatus status; double price; diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index 3c5384bc2..b7da739d7 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -26,7 +26,7 @@ void Order::set_def(api::orderman::OrderDefinition const &def) { _def = std::make_shared(def); } -std::shared_ptr const &Order::def() { +std::shared_ptr const &Order::def() const { return _def; } diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index aa1de2714..f9f8d899b 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -45,6 +45,7 @@ class Order { OrderKey key() const { return _key; } OrderKey parent_key() const { return _parent_key; } + std::shared_ptr const &def() const; // Construction, the order is not yet live and it may never // be. This can be slow. @@ -94,7 +95,7 @@ class Order { "Not implemented"}; } - virtual void on_attached() {} + virtual void on_attached(std::shared_ptr const&) {} protected: virtual void warm_up_activate(OrderServicesData &, OrderServices &) {} @@ -109,7 +110,6 @@ class Order { std::unique_ptr _services; void set_def(api::orderman::OrderDefinition const &); - std::shared_ptr const &def(); void set_status(api::orderman::OrderStatus status); api::orderman::OrderStatus status() const; diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index baca509a9..d866db317 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -162,8 +162,9 @@ void SpreaderOrder::_keep_hedging_path_hot(){ state.set_filled_quantity(q_ord.current_fills().value()); state.set_last_price(q_ord.last_update_filled_price().value()); OrderStateUpdateEvent ord_ev (q_ord.order_key(), - key(), - state); + key(), + def(), + state); ord_ev.status=q_ord.status(); ord_ev.price=q_ord.last_reported_order_price().value(); _on_child_order_update(ord_ev); diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 602936667..f49e9c755 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -348,6 +348,7 @@ public: order_state.set_price(avg_price.value()); OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), + def(), order_state); _on_child_order_update (ord_ev); } diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index d515aeacd..4f105e96c 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -114,7 +114,7 @@ void on_order_update (SpreaderChildOrderState& order, //order_state.set_filled_quantity (order.current_fills().value() + last_filled_quantity.value()); order_state.set_filled_quantity (filled_quantity.value()); bts::api::orderman::OrderDefinition order_def; - OrderStateUpdateEvent e (OrderKey(),OrderKey(),order_state); + OrderStateUpdateEvent e (OrderKey(),OrderKey(),std::make_shared (order_def),order_state); order.on_order_update(e); } /**********************************************************************/ From 0ab628fb6c053555d46c4562ee205a8d6c579d50 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 26 Feb 2019 11:43:10 -0500 Subject: [PATCH 090/218] Allow orders to change their full definition. --- src/lib/orderman/actors/order_manager/OrderServices.cpp | 6 ++---- src/lib/orderman/actors/order_manager/OrderServices.h | 2 +- src/lib/orderman/orders/IcebergOrder2.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index 547bdde11..310e002e2 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -30,10 +30,8 @@ void OrderServices::init(OrderServicesData &data) { } void OrderServices::report_definition( - const api::orderman::CustomOrderDefinition &cdef) { - auto new_def = *_owner->def(); - *new_def.mutable_custom_def() = cdef; - _owner->set_def(new_def); + const api::orderman::OrderDefinition &def) { + _owner->set_def(def); _data->owner.publish(_data->report_order_definition_pub, _owner->key(), _owner->def()); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index dc9adf998..a3876aefc 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -62,7 +62,7 @@ class OrderServices { uint64_1, txt_1, uint32_1); } - void report_definition(const api::orderman::CustomOrderDefinition &) ; + void report_definition(const api::orderman::OrderDefinition &) ; void report_state(const api::orderman::OrderState &); diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index c40d2c8b6..b088b5113 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -198,7 +198,7 @@ OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { // Copy the new definition and report it *me->def.mutable_custom_def() = update.custom(); initialize_child_builder(me->services->order_factory()); - me->services->report_definition(me->def.custom_def()); + me->services->report_definition(me->def); } me->order_state.set_price(update.price()); me->order_state.set_quantity(update.quantity()); From d52347cd714b633a2d7b168e188ebaee5815b009 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 26 Feb 2019 11:57:11 -0500 Subject: [PATCH 091/218] Trigger state update on new definition in OM. --- .../actors/order_manager/OrderServices.cpp | 27 ++++++++++++++----- .../actors/order_manager/OrderServices.h | 3 ++- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index 310e002e2..188517d11 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -10,13 +10,19 @@ OrderServices::OrderServices(Order &owner) : _busy(false), _pending_calls(), _owner(&owner), _data(), _parent(nullptr), _child_update_cb([](auto const &) {}), _do_nothing([](auto const &) {}), _book_updates(), _ticker_updates(), _settlement_updates(), _time_change(), - _sessions() {} + _sessions() { + _last_state_update.key = null_order_key(); +} void OrderServices::init(OrderServicesData &data, OrderServices &parent) { _parent = &parent; init(data); } +bool OrderServices:: has_reported_state() const { + return _last_state_update.key != null_order_key(); +} + void OrderServices::init(OrderServicesData &data) { _data = &data; _book_updates.init(*data.md_subs); @@ -34,12 +40,19 @@ void OrderServices::report_definition( _owner->set_def(def); _data->owner.publish(_data->report_order_definition_pub, _owner->key(), _owner->def()); + + // Force re-publication of state when we get a new definition + // (provided we previously reported a state, so that we do not end + // up publishing an empty state object) + if (has_reported_state()) { + auto st = _last_state_update.rebuild_state(); + report_state(st); + } } void OrderServices::report_state(const api::orderman::OrderState &state) { _owner->set_status(state.status()); - _last_update.init(_owner->key(), _owner->parent_key(), _owner->def(),state); - _data->owner.publish(_data->report_order_state_pub, _last_update); + _last_state_update.init(_owner->key(), _owner->parent_key(), _owner->def(),state); if (orderman::in_terminal_state(state.status())) { LOG(OrderMan, Info, @@ -55,7 +68,7 @@ void OrderServices::report_state(const api::orderman::OrderState &state) { } if (_parent) - _parent->on_child_update(_last_update); + _parent->on_child_update(_last_state_update); } SessionServices & @@ -126,9 +139,9 @@ void OrderServices::on_attach(OrderServices &new_parent, // report our state again to make sure the new parent key is // seen by all - self._last_update.parent_key = new_parent._owner->key(); + self._last_state_update.parent_key = new_parent._owner->key(); self._data->owner.publish(self._data->report_order_state_pub, - self._last_update); + self._last_state_update); // Now create the child order what will represent us in the new // parent @@ -137,7 +150,7 @@ void OrderServices::on_attach(OrderServices &new_parent, // now recover the state and definition and call on_attached() // at this point this must work because orders cannot refuse attachments cb({}, me_as_child, *self._owner->def(), - self._last_update.rebuild_state()); + self._last_state_update.rebuild_state()); self._owner->on_attached(new_parent._owner->def()); }); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index a3876aefc..b6b10c2c0 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -286,6 +286,7 @@ class OrderServices { trace::CorID corid() { return _data->cor_id; } OrderOpResult check_is_attachable(); + bool has_reported_state() const; bool _busy; boost::container::small_vector, 10> @@ -295,7 +296,7 @@ class OrderServices { OrderServices *_parent; std::function _child_update_cb; std::function _do_nothing; - OrderStateUpdateEvent _last_update; + OrderStateUpdateEvent _last_state_update; EventStream _book_updates; EventStream _ticker_updates; EventStream _settlement_updates; From 0f13d27efe0a2645437928460683aae3765aad99 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 26 Feb 2019 15:42:39 -0500 Subject: [PATCH 092/218] Improvements on attach/detach API --- src/lib/api/services/OrderService.proto | 6 +- src/lib/orderman/actors/ServiceBridge.cpp | 2 +- .../actors/order_manager/ChildOrder.h | 32 +++++- .../actors/order_manager/OrderManager.cpp | 38 ++++--- .../actors/order_manager/OrderServices.cpp | 21 ++-- .../actors/order_manager/OrderServices.h | 98 +++++++++---------- src/lib/orderman/events/ActivateOrderEvent.h | 10 +- .../orderman/order_factory/OrderFactory.cpp | 7 +- .../orderman/orderman_utils/orderman_utils.h | 21 ++-- src/lib/orderman/orders/IcebergOrder2.cpp | 48 +++++++-- src/lib/orderman/orders/IcebergOrder2.h | 3 +- src/lib/orderman/orders/Order.cpp | 50 +++++++--- src/lib/orderman/orders/Order.h | 45 ++------- 13 files changed, 218 insertions(+), 163 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 5dc76ddfe..917126c11 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -38,7 +38,9 @@ message Create { OrderDefinition new_order = 1; double price = 2; uint32 quantity = 3; + uint32 attach_target_order_key = 4; } + message Update { CustomOrderDefinition custom = 4; double price = 2; @@ -69,8 +71,8 @@ message OrderDefinition { CTICode cti_code = 9; CustomerOrFirm customer_or_firm = 10; OrderSubType sub_type = 12; - repeated uint32 attach_order = 16; - + + bool attach_on_launch = 16; CustomOrderDefinition custom_def = 11; } diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 8e6296843..961ee9fae 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -141,7 +141,7 @@ void ServiceBridge::create_order(uint32_t rid, api::orderman::Create const &c) { me->order_factory.create(null_order_key(), c.new_order()); me->known_orders.insert(order.key()); publish(me->activate_order_pub, rid, order, Price(c.price()), - Quantity(c.quantity()), trace::CorID()); + Quantity(c.quantity()), OrderKey(c.attach_target_order_key())); } else me->on_order_op_result(OrderOpResultEvent( null_order_key(), rid, diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index ce167b3f6..900b4199a 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -20,11 +20,10 @@ class ChildOrder { // This is used in attach, where the child order is already activated // and ready to go. - ChildOrder(OrderServices&child_services, OrderServices &parent_services) + ChildOrder(OrderServices &child_services, OrderServices &parent_services) : _child_order(child_services._owner), _parent_order_services(&parent_services), - _child_order_services(&child_services), _active(true) - {} + _child_order_services(&child_services), _active(true) {} ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } ChildOrder(ChildOrder const &src) { operator=(src); } @@ -60,6 +59,7 @@ class ChildOrder { bts_assert(!_active); _parent_order_services->warm_up_activate_child(*_child_order); } + // Activate void activate(Price p, Quantity q) { bts_assert(_child_order); @@ -69,6 +69,15 @@ class ChildOrder { _child_order_services = _child_order->_services.get(); _active = true; } + void activate_attach(Price p, Quantity q, OrderKey attach_target) { + bts_assert(_child_order); + bts_assert(!_active); + + _parent_order_services->activate_attach_child(*_child_order, p, q, + attach_target); + _child_order_services = _child_order->_services.get(); + _active = true; + } template void activate(Price p, Quantity q, CB const &on_activate_result) { bts_assert(_child_order); @@ -85,6 +94,23 @@ class ChildOrder { _child_order_services = _child_order->_services.get(); _active = true; } + template + void activate_attach(Price p, Quantity q, OrderKey attach_target, + CB const &on_activate_result) { + bts_assert(_child_order); + bts_assert(!_active); + + auto on_activate_result_wrapper = [this, on_activate_result]( + OrderOpResult const &r) { + _parent_order_services->call_with_reentrancy_guard( + [r, on_activate_result](auto const &) { on_activate_result(r); }); + }; + + _parent_order_services->activate_attach_child( + *_child_order, p, q, attach_target, on_activate_result_wrapper); + _child_order_services = _child_order->_services.get(); + _active = true; + } // End Activate // Update diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 984ed04b6..59f58782d 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -5,10 +5,10 @@ #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" #include "lib/orderman/events/NewAdminDataEvent.h" +#include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/StoredFillEvent.h" #include "lib/orderman/events/StoredOrderEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/orders/Order.h" #include "lib/orderman/securities/ISecurityDB.h" @@ -32,8 +32,9 @@ enum class OrderManager::State { }; struct OrderManager::PImpl { - PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l, md::SecurityOracle o) - : state(State::WAIT_ADMIN), services_data(owner, b, l, o) {} + PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l, + md::SecurityOracle o) + : state(State::WAIT_ADMIN), services_data(owner, b, l, o) {} State state; std::unordered_map orders; @@ -43,7 +44,8 @@ struct OrderManager::PImpl { mercury::Stream pub_ready; }; -OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l, md::SecurityOracle o) +OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l, + md::SecurityOracle o) : me(new PImpl(*this, b, l, o)) {} OrderManager::~OrderManager() {} @@ -210,12 +212,16 @@ void OrderManager::on_activate_order( auto rid = ev.req_id; auto k = order->key(); - order->_services->activate( - ev.price, ev.quantity, - [this, rid, k](auto const &order_op_result) { - publish(me->services_data.report_order_op_result_pub, k, rid, - order_op_result); - }); + auto on_response = [this, rid, k](auto const &order_op_result) { + publish(me->services_data.report_order_op_result_pub, k, rid, + order_op_result); + }; + if (ev.attach_target == null_order_key()) { + order->_services->activate(ev.price, ev.quantity, on_response); + } else { + order->_services->activate_attach(ev.price, ev.quantity, + ev.attach_target, on_response); + } } } @@ -319,8 +325,7 @@ void OrderManager::add_child_order(OrderServices &parent, Order &child) { bts_assert(r.second); } -Order* OrderManager::lookup_order(OrderKey k) -{ +Order *OrderManager::lookup_order(OrderKey k) { auto it = me->orders.find(k); if (it == me->orders.end()) { return nullptr; @@ -475,10 +480,10 @@ void OrderManager::init_order_services() { // md subs are peculiar in that we try to make them on demand, so // we publish an event announcing the subscription std::function on_md_sub = [this](SecurityKey k) { - publish(me->services_data.md_request_pub, k,MDRequestType::BOOK); + publish(me->services_data.md_request_pub, k, MDRequestType::BOOK); }; std::function on_ticker_sub = [this](SecurityKey k) { - publish(me->services_data.md_request_pub, k,MDRequestType::TICKER); + publish(me->services_data.md_request_pub, k, MDRequestType::TICKER); }; std::function on_settlement_sub = [this](SecurityKey k) { publish(me->services_data.settlement_request_pub, k); @@ -496,7 +501,8 @@ void OrderManager::init_order_services() { std::make_unique>(*this, on_md_sub, on_book_update); me->services_data.ticker_subs = - std::make_unique>(*this, on_ticker_sub); + std::make_unique>(*this, + on_ticker_sub); me->services_data.settlement_subs = std::make_unique>( *this, on_settlement_sub); @@ -508,7 +514,7 @@ void OrderManager::init_order_services() { void OrderManager::after_event() { if (me->state == State::READY) { - me->services_data.cor_id = trace::CorID {}; + me->services_data.cor_id = trace::CorID{}; for (auto &osd : me->services_data.sessions) { auto &fix_stream = osd->current_buffer->first_stream(); if (fix_stream.n_msgs()) { diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index 188517d11..d8272cca7 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -6,11 +6,13 @@ namespace orderman { using namespace api::orderman; +std::function OrderServices::ignore = + [](auto const &) {}; + OrderServices::OrderServices(Order &owner) : _busy(false), _pending_calls(), _owner(&owner), _data(), _parent(nullptr), - _child_update_cb([](auto const &) {}), _do_nothing([](auto const &) {}), - _book_updates(), _ticker_updates(), _settlement_updates(), _time_change(), - _sessions() { + _child_update_cb([](auto const &) {}), _book_updates(), _ticker_updates(), + _settlement_updates(), _time_change(), _sessions() { _last_state_update.key = null_order_key(); } @@ -19,7 +21,7 @@ void OrderServices::init(OrderServicesData &data, OrderServices &parent) { init(data); } -bool OrderServices:: has_reported_state() const { +bool OrderServices::has_reported_state() const { return _last_state_update.key != null_order_key(); } @@ -52,7 +54,11 @@ void OrderServices::report_definition( void OrderServices::report_state(const api::orderman::OrderState &state) { _owner->set_status(state.status()); - _last_state_update.init(_owner->key(), _owner->parent_key(), _owner->def(),state); + _last_state_update.init(_owner->key(), _owner->parent_key(), _owner->def(), + state); + _data->owner.publish(_data->report_order_state_pub, _last_state_update); + if (_parent) + _parent->on_child_update(_last_state_update); if (orderman::in_terminal_state(state.status())) { LOG(OrderMan, Info, @@ -66,9 +72,6 @@ void OrderServices::report_state(const api::orderman::OrderState &state) { _time_change.unsub_all(); _create_order_reply.unsub_all(); } - - if (_parent) - _parent->on_child_update(_last_state_update); } SessionServices & @@ -151,7 +154,7 @@ void OrderServices::on_attach(OrderServices &new_parent, // at this point this must work because orders cannot refuse attachments cb({}, me_as_child, *self._owner->def(), self._last_state_update.rebuild_state()); - self._owner->on_attached(new_parent._owner->def()); + self._owner->on_attached(*new_parent._owner->def()); }); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index b6b10c2c0..1ec53209e 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -5,11 +5,11 @@ #include "lib/logging/logging.h" #include "lib/orderman/actors/order_manager/OrderManager.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" +#include "lib/orderman/actors/order_manager/SessionServices.h" #include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" -#include "lib/orderman/actors/order_manager/SessionServices.h" #include "lib/tracing/PerfLog.h" #include @@ -24,8 +24,8 @@ class OrderServices { public: OrderServices(Order &owner); - void init(OrderServicesData &, OrderServices &) ; - void init(OrderServicesData &) ; + void init(OrderServicesData &, OrderServices &); + void init(OrderServicesData &); securities::ISecurityDB &sec_db() { return _data->sec_db; } IOrderFactory &order_factory() { return _data->order_factory; } @@ -62,13 +62,13 @@ class OrderServices { uint64_1, txt_1, uint32_1); } - void report_definition(const api::orderman::OrderDefinition &) ; - + void report_definition(const api::orderman::OrderDefinition &); + void report_state(const api::orderman::OrderState &); Limiter &limiter() { return _data->limiter; } - SessionServices &get_session_services(std::string const &for_session) ; + SessionServices &get_session_services(std::string const &for_session); // Subscriptions ------------------------------ @@ -196,93 +196,83 @@ class OrderServices { return _create_order_reply.sub(req_id, std::forward(cb)); } - void unsubscribe_from_order_creation_reply(CreateOrderReplySubID ) ; + void unsubscribe_from_order_creation_reply(CreateOrderReplySubID); - void send_order_create_req(size_t builder_id, OrderKey , + void send_order_create_req(size_t builder_id, OrderKey, api::orderman::OrderDefinition const &, - size_t n_orders) ; + size_t n_orders); friend class ChildOrder; - // Activate - void activate(Price p, Quantity q) { - call_with_reentrancy_guard([p, q](OrderServices &self) { - self._owner->on_activate(p, q, self, self._do_nothing); - }); - } + // Activate this order template - void activate(Price p, Quantity q, CB const &on_order_op) { + void activate(Price p, Quantity q, CB const &on_order_op = ignore) { call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { - self._owner->on_activate(p, q, self, on_order_op); + on_order_op(self._owner->on_activate(p, q, self)); + }); + } + + // Activate/Attach this order + template + void activate_attach(Price p, Quantity q, OrderKey k, + CB const &on_order_op = ignore) { + call_with_reentrancy_guard([p, q, k, on_order_op](OrderServices &self) { + on_order_op(self._owner->on_activate_attach(p, q, k, self)); }); } - void warm_up_activate_child(Order &o) { o.warm_up_activate(*_data, *this); } // Update - void update(Price p, Quantity q) { - call_with_reentrancy_guard([p, q](OrderServices &self) { - self._owner->on_update(p, q, self._do_nothing); - }); - } - void update(Price p, Quantity q, OrderOpCallback const &on_order_op) { + void update(Price p, Quantity q, + OrderOpCallback const &on_order_op = ignore) { call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { - self._owner->on_update(p, q, on_order_op); - }); - } - void update(api::orderman::Update const &update) { - call_with_reentrancy_guard([update](OrderServices &self) { - self._owner->on_update(update, self._do_nothing); + on_order_op(self._owner->on_update(p, q)); }); } void update(api::orderman::Update const &update, - OrderOpCallback const &on_order_op) { + OrderOpCallback const &on_order_op = ignore) { call_with_reentrancy_guard([update, on_order_op](OrderServices &self) { - self._owner->on_update(update, on_order_op); + on_order_op(self._owner->on_update(update)); }); } // Detach - void detach() { - call_with_reentrancy_guard([](OrderServices &self) { - self._owner->on_detach(self._do_nothing); - }); - } - void detach(OrderOpCallback const &on_order_op) { + void detach(OrderOpCallback const &on_order_op = ignore) { call_with_reentrancy_guard([on_order_op](OrderServices &self) { - self._owner->on_detach(on_order_op); + on_order_op(self._owner->on_detach()); }); } // Cancel - void cancel() { - call_with_reentrancy_guard([](OrderServices &self) { - self._owner->on_cancel(self._do_nothing); - }); - } - void cancel(OrderOpCallback const &on_order_op) { + void cancel(OrderOpCallback const &on_order_op = ignore) { call_with_reentrancy_guard([on_order_op](OrderServices &self) { - self._owner->on_cancel(on_order_op); + on_order_op(self._owner->on_cancel()); }); } - // Activate child - void activate_child(Order &o, Price p, Quantity q) { - _data->owner.add_child_order(*this, o); - o._services->activate(p, q, _do_nothing); - } + // Activate a child of this order void activate_child(Order &o, Price p, Quantity q, - OrderOpCallback const &cb) { + OrderOpCallback const &cb = ignore) { _data->owner.add_child_order(*this, o); o._services->activate(p, q, cb); } - // New Parent wants to attach + // Activate/Attach a child of this order + void activate_attach_child(Order &o, Price p, Quantity q, OrderKey child, + OrderOpCallback const &cb = ignore) { + _data->owner.add_child_order(*this, o); + o._services->activate_attach(p, q, child,cb); + } + + // Notify this order that a new parent wants to attach void on_attach(OrderServices &new_parent, AttachCallback const &); + // Notify this order that one of its children updated void on_child_update(OrderStateUpdateEvent const &ev) { call_with_reentrancy_guard( [ev](OrderServices &self) { self._child_update_cb(ev); }); } + void warm_up_activate_child(Order &o) { o.warm_up_activate(*_data, *this); } + trace::CorID corid() { return _data->cor_id; } OrderOpResult check_is_attachable(); @@ -295,7 +285,7 @@ class OrderServices { OrderServicesData *_data; OrderServices *_parent; std::function _child_update_cb; - std::function _do_nothing; + static std::function ignore; OrderStateUpdateEvent _last_state_update; EventStream _book_updates; EventStream _ticker_updates; diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib/orderman/events/ActivateOrderEvent.h index c53592fed..1eb35457e 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib/orderman/events/ActivateOrderEvent.h @@ -14,18 +14,16 @@ class ActivateOrderEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; - ActivateOrderEvent(uint32_t req_id, Order &o, Price p, Quantity q) - : req_id(req_id),order(&o), price(p), quantity(q), trace() {} - ActivateOrderEvent(uint32_t req_id, Order &o, Price p, Quantity q, - trace::CorID trace) - : req_id(req_id), order(&o), price(p), quantity(q), trace(trace) {} + OrderKey attach_target) + : req_id(req_id), order(&o), price(p), quantity(q), + attach_target(attach_target) {} uint32_t req_id; Order *order; Price price; Quantity quantity; - trace::CorID trace; + OrderKey attach_target; }; } // namespace orderman diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index ae22142c6..ad9f2b0b3 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -77,12 +77,15 @@ Order &OrderFactory::create(OrderKey parent, api::orderman::OrderDefinition corrected_def; // For non native orders we force the ManualOrderIndicator to be - // 'N' since anything that is not a native orders is an algo and we + // 'N' since anything that is not a native order is an algo and we // would rather not depend on the shell and every algo setting this - // field correctly + // field correctly. Algos will just propagate the value of this + // field down so eventually native orders launched by algos will + // get the right value. if (dynamic_cast(&order) == nullptr && def.manual_order_indicator() == api::orderman::MANUAL_ORDER_INDICATOR_YES) { + // An algo order incorrectly marked as a manual order corrected_def = def; corrected_def.set_manual_order_indicator( api::orderman::MANUAL_ORDER_INDICATOR_NO); diff --git a/src/lib/orderman/orderman_utils/orderman_utils.h b/src/lib/orderman/orderman_utils/orderman_utils.h index 32194c4c3..d4021bff0 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.h +++ b/src/lib/orderman/orderman_utils/orderman_utils.h @@ -1,30 +1,29 @@ #include "lib/api/services/OrderService.pb.h" -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { using namespace bts::api::orderman; -inline bool order_in_error_state(OrderStatus order_status){ +inline bool order_in_error_state(OrderStatus order_status) { return order_status == OrderStatus::ORDER_STATUS_ERROR || order_status == OrderStatus::ORDER_STATUS_DISCONNECTED || order_status == OrderStatus::ORDER_STATUS_REJECTED_BY_SPARK; } -inline bool order_in_working_state(OrderStatus order_status){ +inline bool order_in_working_state(OrderStatus order_status) { return order_status == OrderStatus::ORDER_STATUS_WORKING || order_status == OrderStatus::ORDER_STATUS_PENDING_WORKING; } -inline bool is_exchange_order(const OrderState& state){ - return state.has_market() || - state.has_limit() || - state.has_stop() || +inline bool is_exchange_order(const OrderState &state) { + return state.has_market() || state.has_limit() || state.has_stop() || state.has_stop_limit(); } -inline bool is_parent_order(const OrderRecord& ord){ - return ord.parent_key()==0; +inline bool is_parent_order(const OrderRecord &ord) { + return ord.parent_key() == 0; } -}} \ No newline at end of file +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index b088b5113..088ec1b11 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -82,12 +82,22 @@ void IcebergOrder2::on_init_new(OrderDefinition const &def, "Show quantity must be greater than 0"); return; } - if (!ib.has_child()) { + if (!ib.has_child() && !def.attach_on_launch()) { terminate(ORDER_STATUS_REJECTED_BY_SPARK, - "Iceberg order must have a child order definition"); + "Iceberg order must have a child order definition or attach to " + "an existing order"); return; } - initialize_child_builder(services.order_factory); + if (!def.attach_on_launch()) + initialize_child_builder(services.order_factory); + else { + // If we are attaching we might not need an order builder, it + // depends on wheter we will consume the attached order or + // forward that attachment to our child. We can infer that we + // are consuming the attachment directly if we have no child + // definition or if the child definition is for a "bottom + // order", that is a native or spreader. + } } void IcebergOrder2::on_init_recovered(OrderRecord const &rec, @@ -134,7 +144,15 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, case InternalStatus::INACTIVE: me->order_state.set_price(p.value()); me->order_state.set_quantity(q.value()); - if (q.value()) { + + if (me->def.attach_on_launch()) { + // We were expecting on_activate_attach to be called since + // the order definition stated that we were going to be + // attached to an existing order. + auto msg = "Expected an order to attach to"; + terminate(ORDER_STATUS_REJECTED_BY_SPARK, msg); + return report_and_return(ORDER_ERROR_INVALID_OP, msg); + } else if (q.value()) { if (me->iceberg_def().pause_between_orders_ms()) services.subscribe_to_time( [this](auto const &) { this->on_time(); }); @@ -142,9 +160,11 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, [this](auto const &os) { this->on_child_order_update(os); }); me->set_external_status(ORDER_STATUS_WORKING); work(); - } else + return report_and_return(); + } else { terminate(ORDER_STATUS_COMPLETED); - return report_and_return(); + return report_and_return(); + } case InternalStatus::COMPLETED: return report_and_return(); @@ -160,6 +180,15 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, return report_and_return(); } +OrderOpResult IcebergOrder2::on_activate_attach(Price, Quantity, OrderKey, + OrderServices &) { + // Should we consume or forward the attachment? If our child does + // not exist or is a bottom order (spreader or native) then we + // assume we want to attach directly otherwise we will forward the + // attachment to our child, after we created it. + return OrderOpResult{}; +} + OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { switch (me->internal_status) { @@ -498,15 +527,16 @@ void IcebergOrder2::check_invariants() { } } -void orderman::IcebergOrder2::initialize_child_builder(IOrderFactory &of) { +void orderman::IcebergOrder2::initialize_child_builder(IOrderFactory &factory) { + // Copy parent definition to child, so the child inherits all the // standard properties of the parent (side, security, TIF, etc) auto child_def = me->def; // Copy the custom part of the child order definition to our child *child_def.mutable_custom_def() = me->iceberg_def().child(); - // Build our child builder - me->child_builder = OrderBuilder(key(), child_def, of, 1); + // Make the child builder + me->child_builder = OrderBuilder(key(), child_def, factory, 1); if (me->services) me->child_builder.activate(*me->services); } diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h index 82cc01065..d0203e1fb 100644 --- a/src/lib/orderman/orders/IcebergOrder2.h +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -30,6 +30,7 @@ class IcebergOrder2 : public Order { void on_init_recovered(api::orderman::OrderRecord const &, const PreActivationOrderServices &) override; OrderOpResult on_activate(Price, Quantity, OrderServices &) override; + OrderOpResult on_activate_attach(Price, Quantity, OrderKey, OrderServices &) override; OrderOpResult on_update(api::orderman::Update const &) override; OrderOpResult on_update(Price, Quantity) override; OrderOpResult on_cancel() override; @@ -48,7 +49,7 @@ class IcebergOrder2 : public Order { void pause(); void work(); void transition(InternalStatus); - + void on_time(); void on_child_order_update(OrderStateUpdateEvent const &ev); void send_next_child_order(); diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index b7da739d7..565c8f045 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -4,13 +4,10 @@ namespace bts { namespace orderman { -Order::Order() : - _key(null_order_key()), - _parent_key(null_order_key()), - _def(), - _status (api::orderman::ORDER_STATUS_INACTIVE), - _services (std::make_unique (*this)) -{} +Order::Order() + : _key(null_order_key()), _parent_key(null_order_key()), _def(), + _status(api::orderman::ORDER_STATUS_INACTIVE), + _services(std::make_unique(*this)) {} void Order::init_order_services(OrderServicesData &osd) { _services->init(osd); @@ -26,18 +23,43 @@ void Order::set_def(api::orderman::OrderDefinition const &def) { _def = std::make_shared(def); } -std::shared_ptr const &Order::def() const { +std::shared_ptr const & +Order::def() const { return _def; } -void Order::set_status(api::orderman::OrderStatus status) -{_status = status;} +void Order::set_status(api::orderman::OrderStatus status) { _status = status; } -api::orderman::OrderStatus Order::status() const -{return _status;} +api::orderman::OrderStatus Order::status() const { return _status; } -void Order::set_parent_key(OrderKey parent_key) -{_parent_key = parent_key;} +void Order::set_parent_key(OrderKey parent_key) { _parent_key = parent_key; } + +// Many algos will not support attach. To provide a meaningfull +// default implementation we must report the state of the order, so +// that the UI and monitoring algos are aware this order was rejected. +OrderOpResult Order::on_activate_attach(Price, Quantity, OrderKey, + OrderServices &services) { + + api::orderman::OrderState state; + state.set_status(api::orderman::ORDER_STATUS_REJECTED_BY_SPARK); + state.set_last_msg("Order does not support attachment"); + services.report_state(state); + + return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Not implemented"}; +} + +OrderOpResult Order::on_update(api::orderman::Update const &) { + return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Not implemented"}; +} + +OrderOpResult Order::on_detach() { + return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, + "Not implemented"}; +} + +void Order::on_attached(api::orderman::OrderDefinition const &) {} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index f9f8d899b..9b2741104 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -55,47 +55,22 @@ class Order { const PreActivationOrderServices &) = 0; // Activation, the order is now live, these should be fast - virtual void on_activate(Price p, Quantity q, OrderServices &s, - OrderOpCallback const &cb) { - cb(on_activate(p, q, s)); - } - virtual OrderOpResult on_activate(Price, Quantity, OrderServices &) { - return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, - "Not implemented"}; - } + virtual OrderOpResult on_activate(Price, Quantity, OrderServices &) = 0; + virtual OrderOpResult on_activate_attach(Price, Quantity, OrderKey target, + OrderServices &); - // Update - virtual void on_update(Price p, Quantity q, OrderOpCallback const &cb) { - cb(on_update(p, q)); - } - virtual OrderOpResult on_update(Price, Quantity) { - return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, - "Not implemented"}; - } - virtual void on_update(api::orderman::Update const &u, - OrderOpCallback const &cb) { - cb(on_update(u)); - } - virtual OrderOpResult on_update(api::orderman::Update const &) { - return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, - "Not implemented"}; - } + // Order Updates, post activation + virtual OrderOpResult on_update(Price, Quantity) = 0; + virtual OrderOpResult on_update(api::orderman::Update const &); // Detach - virtual void on_detach(OrderOpCallback const &cb) { cb(on_detach()); } - virtual OrderOpResult on_detach() { - return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, - "Not implemented"}; - } + virtual OrderOpResult on_detach(); // Cancel - virtual void on_cancel(OrderOpCallback const &cb) { cb(on_cancel()); } - virtual OrderOpResult on_cancel() { - return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, - "Not implemented"}; - } + virtual OrderOpResult on_cancel() = 0; - virtual void on_attached(std::shared_ptr const&) {} + // Order has been attached to + virtual void on_attached(api::orderman::OrderDefinition const &); protected: virtual void warm_up_activate(OrderServicesData &, OrderServices &) {} From c2f954a79da842d9efbbcf274dc512ec357498df Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 28 Feb 2019 13:07:24 -0500 Subject: [PATCH 093/218] More changes to attach/detach API --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/OrderService.proto | 4 +- .../actors/order_manager/OrderServices.cpp | 1 + .../actors/order_manager/OrderServices.h | 4 +- .../orderman_utils/orderman_utils.cpp | 44 ++++++ .../orderman/orderman_utils/orderman_utils.h | 14 +- src/lib/orderman/orders/IcebergOrder2.cpp | 129 ++++++++++++------ src/lib/orderman/orders/IcebergOrder2.h | 10 +- src/lib/orderman/orders/Order.h | 5 +- 9 files changed, 161 insertions(+), 52 deletions(-) create mode 100644 src/lib/orderman/orderman_utils/orderman_utils.cpp diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 8d1495bf1..6d1d72764 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/IcebergOrder2.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/IcebergOrder2.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 917126c11..6fb84a155 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -38,7 +38,6 @@ message Create { OrderDefinition new_order = 1; double price = 2; uint32 quantity = 3; - uint32 attach_target_order_key = 4; } message Update { @@ -71,8 +70,7 @@ message OrderDefinition { CTICode cti_code = 9; CustomerOrFirm customer_or_firm = 10; OrderSubType sub_type = 12; - - bool attach_on_launch = 16; + uint32 attach_target_order_key = 16; CustomOrderDefinition custom_def = 11; } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index d8272cca7..b13464b34 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -154,6 +154,7 @@ void OrderServices::on_attach(OrderServices &new_parent, // at this point this must work because orders cannot refuse attachments cb({}, me_as_child, *self._owner->def(), self._last_state_update.rebuild_state()); + self._owner->on_attached(*new_parent._owner->def()); }); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 1ec53209e..02cea9d33 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -155,7 +155,7 @@ class OrderServices { // Caller is the future parent of an existing order, // i.e. caller will attach to an existing order. - void attach(OrderKey child_key, AttachCallback const &); + void attach(OrderKey attach_target, AttachCallback const &); private: friend class OrderBuilder; @@ -207,6 +207,8 @@ class OrderServices { // Activate this order template void activate(Price p, Quantity q, CB const &on_order_op = ignore) { + bts_assert(_owner->def()); + if (_owner->def()- n call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { on_order_op(self._owner->on_activate(p, q, self)); }); diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp new file mode 100644 index 000000000..e59f80c24 --- /dev/null +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -0,0 +1,44 @@ +#include "orderman_utils.h" +#include "lib/utils/bts_assert.h" + +using namespace bts::api::orderman; + +namespace bts { +namespace orderman { + +bool should_forward_attachment(const api::orderman::CustomOrderDefinition &cdef) { + switch (cdef.custom_case()) { + case CustomOrderDefinition::kMarket: + case CustomOrderDefinition::kLimit: + case CustomOrderDefinition::kStop: + case CustomOrderDefinition::kStopLimit: + case CustomOrderDefinition::kSpreader: + return false; + + case CustomOrderDefinition::kIceberg: + return + !cdef.iceberg().has_child() || + !should_forward_attachment(cdef.iceberg().child()); + + case CustomOrderDefinition::kTimeBox: + case CustomOrderDefinition::kTick: + case CustomOrderDefinition::kLean: + case CustomOrderDefinition::kJoin: + case CustomOrderDefinition::kTop: + case CustomOrderDefinition::kTrigger: + case CustomOrderDefinition::kCover: + case CustomOrderDefinition::kOffset: + case CustomOrderDefinition::kOco: + case CustomOrderDefinition::kPricer: + case CustomOrderDefinition::kDynamic: + return false; + + case CustomOrderDefinition::CUSTOM_NOT_SET: + bts_assert(false); + return false; + } +} + + +}} + diff --git a/src/lib/orderman/orderman_utils/orderman_utils.h b/src/lib/orderman/orderman_utils/orderman_utils.h index d4021bff0..32d5d1939 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.h +++ b/src/lib/orderman/orderman_utils/orderman_utils.h @@ -3,27 +3,31 @@ namespace bts { namespace orderman { -using namespace bts::api::orderman; -inline bool order_in_error_state(OrderStatus order_status) { +inline bool order_in_error_state(bts::api::orderman::OrderStatus order_status) { + using namespace bts::api::orderman; return order_status == OrderStatus::ORDER_STATUS_ERROR || order_status == OrderStatus::ORDER_STATUS_DISCONNECTED || order_status == OrderStatus::ORDER_STATUS_REJECTED_BY_SPARK; } -inline bool order_in_working_state(OrderStatus order_status) { +inline bool order_in_working_state(bts::api::orderman::OrderStatus order_status) { + using namespace bts::api::orderman; return order_status == OrderStatus::ORDER_STATUS_WORKING || order_status == OrderStatus::ORDER_STATUS_PENDING_WORKING; } -inline bool is_exchange_order(const OrderState &state) { +inline bool is_exchange_order(const bts::api::orderman::OrderState &state) { + using namespace bts::api::orderman; return state.has_market() || state.has_limit() || state.has_stop() || state.has_stop_limit(); } -inline bool is_parent_order(const OrderRecord &ord) { +inline bool is_parent_order(const bts::api::orderman::OrderRecord &ord) { return ord.parent_key() == 0; } +bool should_forward_attachment(const api::orderman::CustomOrderDefinition &def); + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index cd9f9cc6a..0fb90a444 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -3,6 +3,7 @@ #include "lib/config/protos/system.pb.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/plugin/SparkServices.h" #include "lib/utils/PBUtils.h" @@ -14,6 +15,7 @@ namespace orderman { using namespace api::orderman; enum class IcebergOrder2::InternalStatus { INACTIVE, + PENDING_ATTACH, PAUSED, WORKING, COMPLETED @@ -93,10 +95,13 @@ void IcebergOrder2::on_init_new(OrderDefinition const &def, else { // If we are attaching we might not need an order builder, it // depends on wheter we will consume the attached order or - // forward that attachment to our child. We can infer that we - // are consuming the attachment directly if we have no child + // forward the attachment target to our child. We can infer that + // we are consuming the attachment directly if we have no child // definition or if the child definition is for a "bottom // order", that is a native or spreader. + if (should_forward_attachment(def.custom_def())) { + initialize_child_builder(services.order_factory); + } } } @@ -110,6 +115,7 @@ void IcebergOrder2::on_init_recovered(OrderRecord const &rec, switch (me->external_status()) { case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: terminate(ORDER_STATUS_REJECTED_BY_SPARK, "System restarted with active iceberg order"); return; @@ -123,7 +129,6 @@ void IcebergOrder2::on_init_recovered(OrderRecord const &rec, break; case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_PENDING_WORKING: case ORDER_STATUS_INACTIVE: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: @@ -137,11 +142,12 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, OrderServices &services) { bts_assert(!me->services); me->services = &services; - me->child_builder.activate(services); switch (me->internal_status) { case InternalStatus::INACTIVE: + me->child_builder.activate(services); + me->order_state.set_price(p.value()); me->order_state.set_quantity(q.value()); @@ -152,25 +158,27 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, auto msg = "Expected an order to attach to"; terminate(ORDER_STATUS_REJECTED_BY_SPARK, msg); return report_and_return(ORDER_ERROR_INVALID_OP, msg); - } else if (q.value()) { - if (me->iceberg_def().pause_between_orders_ms()) - services.subscribe_to_time( - [this](auto const &) { this->on_time(); }); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); - me->set_external_status(ORDER_STATUS_WORKING); - work(); - return report_and_return(); - } else { + } + + if (q.value() == 0) { terminate(ORDER_STATUS_COMPLETED); return report_and_return(); } + if (me->iceberg_def().pause_between_orders_ms()) + services.subscribe_to_time([this](auto const &) { this->on_time(); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + me->set_external_status(ORDER_STATUS_WORKING); + work(); + return report_and_return(); + case InternalStatus::COMPLETED: return report_and_return(); case InternalStatus::WORKING: case InternalStatus::PAUSED: + case InternalStatus::PENDING_ATTACH: bts_assert(false); return report_and_return(); } @@ -181,16 +189,10 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, } OrderOpResult IcebergOrder2::on_activate_attach(Price p, Quantity q, - OrderKey attach_to_target, + OrderKey attach_target, OrderServices &services) { - // Should we consume or forward the attachment? If our child does - // not exist or is a bottom order (spreader or native) then we - // assume we want to attach directly otherwise we will forward the - // attachment to our child, after we created it. - bts_assert(!me->services); me->services = &services; - me->child_builder.activate(services); switch (me->internal_status) { @@ -205,25 +207,35 @@ OrderOpResult IcebergOrder2::on_activate_attach(Price p, Quantity q, auto msg = "Unexpected attach call"; terminate(ORDER_STATUS_REJECTED_BY_SPARK, msg); return report_and_return(ORDER_ERROR_INVALID_OP, msg); - } else if (q.value()) { - if (me->iceberg_def().pause_between_orders_ms()) - services.subscribe_to_time( - [this](auto const &) { this->on_time(); }); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); - me->set_external_status(ORDER_STATUS_WORKING); - work(); - return report_and_return(); - } else { + } + + if (q.value() == 0) { terminate(ORDER_STATUS_COMPLETED); return report_and_return(); } + if (me->iceberg_def().pause_between_orders_ms()) + services.subscribe_to_time([this](auto const &) { this->on_time(); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + + if (should_forward_attachment(me->def.custom_def())) { + // We are not attaching directly, but our child will + me->set_external_status(ORDER_STATUS_WORKING); + work(attach_target); + } else { + // We are attaching directly + me->set_external_status(ORDER_STATUS_PENDING_WORKING); + attach(attach_target); + } + return report_and_return(); + case InternalStatus::COMPLETED: return report_and_return(); case InternalStatus::WORKING: case InternalStatus::PAUSED: + case InternalStatus::PENDING_ATTACH: bts_assert(false); return report_and_return(); } @@ -231,7 +243,6 @@ OrderOpResult IcebergOrder2::on_activate_attach(Price p, Quantity q, // compiler bts_assert(false); return report_and_return(); - return OrderOpResult{}; } OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { @@ -284,6 +295,11 @@ OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { return report_and_return(ORDER_ERROR_INVALID_OP, "Order is already completed"); + case InternalStatus::PENDING_ATTACH: + return report_and_return( + ORDER_ERROR_INVALID_OP, + "Order cannot be modified while waiting for attach to complete"); + case InternalStatus::INACTIVE: bts_assert(false); return report_and_return(); @@ -299,6 +315,7 @@ orderman::OrderOpResult orderman::IcebergOrder2::on_cancel() { switch (me->internal_status) { case InternalStatus::PAUSED: case InternalStatus::WORKING: + case InternalStatus::PENDING_ATTACH: terminate(ORDER_STATUS_CANCELED); return report_and_return(); case InternalStatus::COMPLETED: @@ -405,6 +422,7 @@ void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { return; case InternalStatus::INACTIVE: + case InternalStatus::PENDING_ATTACH: bts_assert(false); return; } @@ -420,6 +438,7 @@ void IcebergOrder2::on_time() { case InternalStatus::INACTIVE: case InternalStatus::COMPLETED: case InternalStatus::WORKING: + case InternalStatus::PENDING_ATTACH: break; } } @@ -443,12 +462,13 @@ void orderman::IcebergOrder2::on_child_activate_completed(OrderOpResult r) { case InternalStatus::COMPLETED: return; case InternalStatus::INACTIVE: + case InternalStatus::PENDING_ATTACH: bts_assert(false); return; } } -void orderman::IcebergOrder2::send_next_child_order() { +void orderman::IcebergOrder2::send_next_child_order(OrderKey attach_target) { bts_assert(me->order_state.quantity() > me->order_state.filled_quantity()); auto remaining = @@ -466,18 +486,26 @@ void orderman::IcebergOrder2::send_next_child_order() { me->order_state.price(), me->order_state.filled_quantity(), me->order_state.quantity()); - me->active_child.order.activate( - Price(me->order_state.price()), Quantity(to_send), - [this](auto const &op) { this->on_child_activate_completed(op); }); + if (attach_target == null_order_key()) { + me->active_child.order.activate( + Price(me->order_state.price()), Quantity(to_send), + [this](auto const &op) { this->on_child_activate_completed(op); }); + } else { + // Forward attachment + me->active_child.order.activate_attach( + Price(me->order_state.price()), Quantity(to_send), attach_target, + [this](auto const &op) { this->on_child_activate_completed(op); }); + } } -void IcebergOrder2::work() { +void IcebergOrder2::work(OrderKey attach_target) { switch (me->internal_status) { case InternalStatus::PAUSED: case InternalStatus::INACTIVE: + case InternalStatus::PENDING_ATTACH: me->start_of_pause = TimeStamp(); - send_next_child_order(); + send_next_child_order(attach_target); transition(InternalStatus::WORKING); break; @@ -488,6 +516,18 @@ void IcebergOrder2::work() { } } +void IcebergOrder2::attach(OrderKey target) { + bts_assert(me->internal_status == InternalStatus::INACTIVE); + + AttachCallback cb([this](auto result, auto const &child_order, + auto const &child_def, auto const &child_state) { + on_attach_complete(result, child_order, child_def, child_state); + }); + + me->services->attach(target, cb); + transition(InternalStatus::PENDING_ATTACH); +} + void IcebergOrder2::pause() { switch (me->internal_status) { @@ -500,6 +540,7 @@ void IcebergOrder2::pause() { case InternalStatus::INACTIVE: case InternalStatus::PAUSED: + case InternalStatus::PENDING_ATTACH: case InternalStatus::COMPLETED: bts_assert(false); break; @@ -512,6 +553,7 @@ void IcebergOrder2::terminate(api::orderman::OrderStatus reason, case InternalStatus::INACTIVE: case InternalStatus::PAUSED: case InternalStatus::WORKING: + case InternalStatus::PENDING_ATTACH: if (!me->active_child.is_empty()) { me->active_child.order.cancel(); me->active_child.reset(); @@ -565,7 +607,14 @@ void IcebergOrder2::check_invariants() { bts_assert(me->active_child.is_empty()); bts_assert(me->start_of_pause == TimeStamp()); break; - + case InternalStatus::PENDING_ATTACH: + bts_assert(me->external_status() == ORDER_STATUS_PENDING_WORKING); + bts_assert(me->active_child.is_empty()); + bts_assert(me->start_of_pause == TimeStamp()); + bts_assert(!me->child_builder.is_activated()); + bts_assert(me->order_state.filled_quantity() == 0); + bts_assert(me->order_state.quantity() > 0); + break; case InternalStatus::INACTIVE: bts_assert(false); break; @@ -642,6 +691,8 @@ std::string orderman::IcebergOrder2::internal_status_name(InternalStatus st) { return "COMPLETED"; case InternalStatus::WORKING: return "WORKING"; + case InternalStatus::PENDING_ATTACH: + return "PENDING_ATTACH"; } bts_assert(false); return ""; diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h index d0203e1fb..592c283df 100644 --- a/src/lib/orderman/orders/IcebergOrder2.h +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -30,7 +30,8 @@ class IcebergOrder2 : public Order { void on_init_recovered(api::orderman::OrderRecord const &, const PreActivationOrderServices &) override; OrderOpResult on_activate(Price, Quantity, OrderServices &) override; - OrderOpResult on_activate_attach(Price, Quantity, OrderKey, OrderServices &) override; + OrderOpResult on_activate_attach(Price, Quantity, OrderKey, + OrderServices &) override; OrderOpResult on_update(api::orderman::Update const &) override; OrderOpResult on_update(Price, Quantity) override; OrderOpResult on_cancel() override; @@ -48,11 +49,18 @@ class IcebergOrder2 : public Order { std::string const &msg = ""); void pause(); void work(); + void work(OrderKey attach_target); + void attach(OrderKey attach_target); void transition(InternalStatus); void on_time(); void on_child_order_update(OrderStateUpdateEvent const &ev); + void on_attach_complete(OrderOpResult, ChildOrder const &, + api::orderman::OrderDefinition const &, + api::orderman::OrderState const &); + void send_next_child_order(); + void send_next_child_order(OrderKey attach_target); std::string internal_status_name(InternalStatus); void merge_states(api::orderman::OrderState const &iceberg_state, api::orderman::OrderState const &child_state, diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 9b2741104..538b66378 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -56,8 +56,6 @@ class Order { // Activation, the order is now live, these should be fast virtual OrderOpResult on_activate(Price, Quantity, OrderServices &) = 0; - virtual OrderOpResult on_activate_attach(Price, Quantity, OrderKey target, - OrderServices &); // Order Updates, post activation virtual OrderOpResult on_update(Price, Quantity) = 0; @@ -72,6 +70,9 @@ class Order { // Order has been attached to virtual void on_attached(api::orderman::OrderDefinition const &); + // Order types have to explicitly opt in to support attachment + virtual bool supports_attachment() {return false;} + protected: virtual void warm_up_activate(OrderServicesData &, OrderServices &) {} void init_order_services(OrderServicesData &); From af253198d2fd0ecc6ff636b52a26326feab7cf7c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Mar 2019 08:55:36 -0500 Subject: [PATCH 094/218] Iceberg that can attach. --- src/lib/orderman/actors/ServiceBridge.cpp | 2 +- .../actors/order_manager/ChildOrder.h | 32 +---- .../actors/order_manager/OrderManager.cpp | 7 +- .../actors/order_manager/OrderServices.h | 37 +++--- src/lib/orderman/events/ActivateOrderEvent.h | 8 +- src/lib/orderman/orders/IcebergOrder2.cpp | 124 +++++------------- src/lib/orderman/orders/IcebergOrder2.h | 6 +- src/lib/orderman/orders/NativeOrder.cpp | 63 +++++---- src/lib/orderman/orders/NativeOrder.h | 6 +- src/lib/orderman/orders/Order.cpp | 15 --- 10 files changed, 107 insertions(+), 193 deletions(-) diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 961ee9fae..372d5b4d3 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -141,7 +141,7 @@ void ServiceBridge::create_order(uint32_t rid, api::orderman::Create const &c) { me->order_factory.create(null_order_key(), c.new_order()); me->known_orders.insert(order.key()); publish(me->activate_order_pub, rid, order, Price(c.price()), - Quantity(c.quantity()), OrderKey(c.attach_target_order_key())); + Quantity(c.quantity())); } else me->on_order_op_result(OrderOpResultEvent( null_order_key(), rid, diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 900b4199a..176a37770 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -28,6 +28,12 @@ class ChildOrder { ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } ChildOrder(ChildOrder const &src) { operator=(src); } + ChildOrder(api::orderman::OrderDefinition const &def, + OrderServices &parent_services) + : _child_order(&parent_services.make_child(def)), + _parent_order_services(&parent_services), _child_order_services(), + _active(false) {} + ChildOrder &operator=(ChildOrder &&src) { _child_order = src._child_order; _parent_order_services = src._parent_order_services; @@ -69,15 +75,6 @@ class ChildOrder { _child_order_services = _child_order->_services.get(); _active = true; } - void activate_attach(Price p, Quantity q, OrderKey attach_target) { - bts_assert(_child_order); - bts_assert(!_active); - - _parent_order_services->activate_attach_child(*_child_order, p, q, - attach_target); - _child_order_services = _child_order->_services.get(); - _active = true; - } template void activate(Price p, Quantity q, CB const &on_activate_result) { bts_assert(_child_order); @@ -94,23 +91,6 @@ class ChildOrder { _child_order_services = _child_order->_services.get(); _active = true; } - template - void activate_attach(Price p, Quantity q, OrderKey attach_target, - CB const &on_activate_result) { - bts_assert(_child_order); - bts_assert(!_active); - - auto on_activate_result_wrapper = [this, on_activate_result]( - OrderOpResult const &r) { - _parent_order_services->call_with_reentrancy_guard( - [r, on_activate_result](auto const &) { on_activate_result(r); }); - }; - - _parent_order_services->activate_attach_child( - *_child_order, p, q, attach_target, on_activate_result_wrapper); - _child_order_services = _child_order->_services.get(); - _active = true; - } // End Activate // Update diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 59f58782d..50c050ef7 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -216,12 +216,7 @@ void OrderManager::on_activate_order( publish(me->services_data.report_order_op_result_pub, k, rid, order_op_result); }; - if (ev.attach_target == null_order_key()) { - order->_services->activate(ev.price, ev.quantity, on_response); - } else { - order->_services->activate_attach(ev.price, ev.quantity, - ev.attach_target, on_response); - } + order->_services->activate(ev.price, ev.quantity, on_response); } } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 02cea9d33..105349105 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -29,6 +29,10 @@ class OrderServices { securities::ISecurityDB &sec_db() { return _data->sec_db; } IOrderFactory &order_factory() { return _data->order_factory; } + + Order &make_child (api::orderman::OrderDefinition const&def) { + return _data->order_factory.create (_owner->key(),def); + } mercury::TimeStampStr const &get_time_str() const { return _data->last_timer_ev.ts_str; @@ -204,25 +208,29 @@ class OrderServices { friend class ChildOrder; - // Activate this order + // Activate this order template void activate(Price p, Quantity q, CB const &on_order_op = ignore) { bts_assert(_owner->def()); - if (_owner->def()- n + + if (_owner->def()->attach_target_order_key() != + null_order_key().value() && + !_owner->supports_attachment()) { + auto msg = "Order does not support attachment"; + on_order_op(OrderOpResult {api::orderman::ORDER_ERROR_INVALID_OP,msg}); + + api::orderman::OrderState state; + state.set_status(api::orderman::ORDER_STATUS_REJECTED_BY_SPARK); + state.set_last_msg("Order does not support attachment"); + report_state(state); + return; + } + call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { on_order_op(self._owner->on_activate(p, q, self)); }); } - // Activate/Attach this order - template - void activate_attach(Price p, Quantity q, OrderKey k, - CB const &on_order_op = ignore) { - call_with_reentrancy_guard([p, q, k, on_order_op](OrderServices &self) { - on_order_op(self._owner->on_activate_attach(p, q, k, self)); - }); - } - // Update void update(Price p, Quantity q, OrderOpCallback const &on_order_op = ignore) { @@ -257,13 +265,6 @@ class OrderServices { o._services->activate(p, q, cb); } - // Activate/Attach a child of this order - void activate_attach_child(Order &o, Price p, Quantity q, OrderKey child, - OrderOpCallback const &cb = ignore) { - _data->owner.add_child_order(*this, o); - o._services->activate_attach(p, q, child,cb); - } - // Notify this order that a new parent wants to attach void on_attach(OrderServices &new_parent, AttachCallback const &); diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib/orderman/events/ActivateOrderEvent.h index 1eb35457e..991e1850e 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib/orderman/events/ActivateOrderEvent.h @@ -14,16 +14,14 @@ class ActivateOrderEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; - ActivateOrderEvent(uint32_t req_id, Order &o, Price p, Quantity q, - OrderKey attach_target) - : req_id(req_id), order(&o), price(p), quantity(q), - attach_target(attach_target) {} + ActivateOrderEvent(uint32_t req_id, Order &o, Price p, Quantity q) + : req_id(req_id), order(&o), price(p), quantity(q) + {} uint32_t req_id; Order *order; Price price; Quantity quantity; - OrderKey attach_target; }; } // namespace orderman diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index 0fb90a444..21d4d99b2 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -84,24 +84,18 @@ void IcebergOrder2::on_init_new(OrderDefinition const &def, "Show quantity must be greater than 0"); return; } - if (!ib.has_child() && !def.attach_on_launch()) { + auto attach_target = OrderKey(def.attach_target_order_key()); + if (!ib.has_child() && attach_target == null_order_key()) { terminate(ORDER_STATUS_REJECTED_BY_SPARK, "Iceberg order must have a child order definition or attach to " "an existing order"); return; } - if (!def.attach_on_launch()) + if (attach_target == null_order_key() || + should_forward_attachment(me->def.custom_def())) initialize_child_builder(services.order_factory); else { - // If we are attaching we might not need an order builder, it - // depends on wheter we will consume the attached order or - // forward the attachment target to our child. We can infer that - // we are consuming the attachment directly if we have no child - // definition or if the child definition is for a "bottom - // order", that is a native or spreader. - if (should_forward_attachment(def.custom_def())) { - initialize_child_builder(services.order_factory); - } + // when attaching directly we do not need an order builder } } @@ -145,21 +139,12 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, switch (me->internal_status) { - case InternalStatus::INACTIVE: + case InternalStatus::INACTIVE: { me->child_builder.activate(services); me->order_state.set_price(p.value()); me->order_state.set_quantity(q.value()); - if (me->def.attach_on_launch()) { - // We were expecting on_activate_attach to be called since - // the order definition stated that we were going to be - // attached to an existing order. - auto msg = "Expected an order to attach to"; - terminate(ORDER_STATUS_REJECTED_BY_SPARK, msg); - return report_and_return(ORDER_ERROR_INVALID_OP, msg); - } - if (q.value() == 0) { terminate(ORDER_STATUS_COMPLETED); return report_and_return(); @@ -169,10 +154,16 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, services.subscribe_to_time([this](auto const &) { this->on_time(); }); services.subscribe_to_child_updates( [this](auto const &os) { this->on_child_order_update(os); }); - me->set_external_status(ORDER_STATUS_WORKING); - work(); - return report_and_return(); + auto ak = OrderKey(me->def.attach_target_order_key()); + if (ak != null_order_key()) { + return on_activate_attach(ak); + } else { + me->set_external_status(ORDER_STATUS_WORKING); + work(); + return report_and_return(); + } + } case InternalStatus::COMPLETED: return report_and_return(); @@ -188,60 +179,22 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, return report_and_return(); } -OrderOpResult IcebergOrder2::on_activate_attach(Price p, Quantity q, - OrderKey attach_target, - OrderServices &services) { - bts_assert(!me->services); - me->services = &services; +OrderOpResult IcebergOrder2::on_activate_attach(OrderKey attach_target) { + bts_assert(me->services); + bts_assert(me->internal_status == InternalStatus::INACTIVE); + bts_assert(!me->child_builder.is_activated()); + bts_assert(me->def.attach_target_order_key() != null_order_key().value()); - switch (me->internal_status) { - - case InternalStatus::INACTIVE: - me->order_state.set_price(p.value()); - me->order_state.set_quantity(q.value()); - - if (!me->def.attach_on_launch()) { - // We were expecting on_activate to be called since the order - // definition stated that we were going to be attached to an - // existing order. - auto msg = "Unexpected attach call"; - terminate(ORDER_STATUS_REJECTED_BY_SPARK, msg); - return report_and_return(ORDER_ERROR_INVALID_OP, msg); - } - - if (q.value() == 0) { - terminate(ORDER_STATUS_COMPLETED); - return report_and_return(); - } - - if (me->iceberg_def().pause_between_orders_ms()) - services.subscribe_to_time([this](auto const &) { this->on_time(); }); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); - - if (should_forward_attachment(me->def.custom_def())) { - // We are not attaching directly, but our child will - me->set_external_status(ORDER_STATUS_WORKING); - work(attach_target); - } else { - // We are attaching directly - me->set_external_status(ORDER_STATUS_PENDING_WORKING); - attach(attach_target); - } - return report_and_return(); - - case InternalStatus::COMPLETED: - return report_and_return(); - - case InternalStatus::WORKING: - case InternalStatus::PAUSED: - case InternalStatus::PENDING_ATTACH: - bts_assert(false); - return report_and_return(); + if (should_forward_attachment(me->def.custom_def())) { + // We are not attaching directly, but our child will + bts_assert(me->def.attach_target_order_key() != null_order_key().value()); + me->set_external_status(ORDER_STATUS_WORKING); + work(); + } else { + // We are attaching directly + me->set_external_status(ORDER_STATUS_PENDING_WORKING); + attach(attach_target); } - - // compiler - bts_assert(false); return report_and_return(); } @@ -468,7 +421,7 @@ void orderman::IcebergOrder2::on_child_activate_completed(OrderOpResult r) { } } -void orderman::IcebergOrder2::send_next_child_order(OrderKey attach_target) { +void orderman::IcebergOrder2::send_next_child_order() { bts_assert(me->order_state.quantity() > me->order_state.filled_quantity()); auto remaining = @@ -486,26 +439,19 @@ void orderman::IcebergOrder2::send_next_child_order(OrderKey attach_target) { me->order_state.price(), me->order_state.filled_quantity(), me->order_state.quantity()); - if (attach_target == null_order_key()) { - me->active_child.order.activate( - Price(me->order_state.price()), Quantity(to_send), - [this](auto const &op) { this->on_child_activate_completed(op); }); - } else { - // Forward attachment - me->active_child.order.activate_attach( - Price(me->order_state.price()), Quantity(to_send), attach_target, - [this](auto const &op) { this->on_child_activate_completed(op); }); - } + me->active_child.order.activate( + Price(me->order_state.price()), Quantity(to_send), + [this](auto const &op) { this->on_child_activate_completed(op); }); } -void IcebergOrder2::work(OrderKey attach_target) { +void IcebergOrder2::work() { switch (me->internal_status) { case InternalStatus::PAUSED: case InternalStatus::INACTIVE: case InternalStatus::PENDING_ATTACH: me->start_of_pause = TimeStamp(); - send_next_child_order(attach_target); + send_next_child_order(); transition(InternalStatus::WORKING); break; diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h index 592c283df..5a6fdf97b 100644 --- a/src/lib/orderman/orders/IcebergOrder2.h +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -30,8 +30,6 @@ class IcebergOrder2 : public Order { void on_init_recovered(api::orderman::OrderRecord const &, const PreActivationOrderServices &) override; OrderOpResult on_activate(Price, Quantity, OrderServices &) override; - OrderOpResult on_activate_attach(Price, Quantity, OrderKey, - OrderServices &) override; OrderOpResult on_update(api::orderman::Update const &) override; OrderOpResult on_update(Price, Quantity) override; OrderOpResult on_cancel() override; @@ -42,6 +40,8 @@ class IcebergOrder2 : public Order { struct PImpl; std::unique_ptr me; api::orderman::IcebergOrderDefinition &iceberg_def(); + + OrderOpResult on_activate_attach(OrderKey attach_target); void initialize_child_builder(IOrderFactory &); // state transitions @@ -49,7 +49,6 @@ class IcebergOrder2 : public Order { std::string const &msg = ""); void pause(); void work(); - void work(OrderKey attach_target); void attach(OrderKey attach_target); void transition(InternalStatus); @@ -60,7 +59,6 @@ class IcebergOrder2 : public Order { api::orderman::OrderState const &); void send_next_child_order(); - void send_next_child_order(OrderKey attach_target); std::string internal_status_name(InternalStatus); void merge_states(api::orderman::OrderState const &iceberg_state, api::orderman::OrderState const &child_state, diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 4055562e8..7abcb46fd 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -1,10 +1,10 @@ #include "NativeOrder.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/Security.h" #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/logging/logging.h" -#include "lib/domain_model/Security.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" @@ -282,7 +282,7 @@ void NativeOrder::warm_up_activate(OrderServicesData &data, bts_assert(!me->services); me->services = &services; init_order_services(data, services); - _on_activate(Price(0), Quantity(0), services); + _on_activate(NoLog, NoLog, Price(0), Quantity(0), services); me->services->unsubscribe_from_exe_report(*me->session_services, me->exe_report_sid); @@ -292,8 +292,10 @@ void NativeOrder::warm_up_activate(OrderServicesData &data, me->services = nullptr; } -OrderOpResult NativeOrder::_on_activate(Price p, Quantity q, - bts::orderman::OrderServices &services) { +OrderOpResult +NativeOrder::_on_activate(log::Level reject_level, log::Level transition_level, + Price p, Quantity q, + bts::orderman::OrderServices &services) { me->state.set_price(p.value()); me->state.set_quantity(q.value()); me->state.set_filled_quantity(0); @@ -307,13 +309,13 @@ OrderOpResult NativeOrder::_on_activate(Price p, Quantity q, // is our gateway connected? if (!me->services->is_gateway_connected(*me->session_services)) { - LOG(OrderMan, Warn, + LOG(OrderMan, reject_level, "Attempt to send order to a disconnected gateway. " "Dropping order {}", key().value()); - auto msg = "Exchange gateway is down"; - transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); - return OrderOpResult{ORDER_ERROR_GATEWAY_NOT_READY,msg}; + auto msg = "Exchange gateway is down"; + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); + return OrderOpResult{ORDER_ERROR_GATEWAY_NOT_READY, msg}; } // can we trade? @@ -321,15 +323,15 @@ OrderOpResult NativeOrder::_on_activate(Price p, Quantity q, UserID(me->definition.user_id()), AccountID(me->definition.account_id())); if (!lqr.ok) { - LOG(OrderMan, Warn, + LOG(OrderMan, reject_level, "Unauthorized order attempted. User: {} on " "Account: {}. Msg: {} Order: {}. Dropping order", me->definition.user(), me->definition.account(), lqr.error_msg, key().value()); auto msg = fmt::format("Unauthorized order: {}", lqr.error_msg); - transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); - return OrderOpResult{ORDER_ERROR_UNAUTHORIZED,msg}; + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); + return OrderOpResult{ORDER_ERROR_UNAUTHORIZED, msg}; } // can we trade this security, with this size? @@ -338,26 +340,26 @@ OrderOpResult NativeOrder::_on_activate(Price p, Quantity q, q); if (!lqr.ok) { - LOG(OrderMan, Warn, + LOG(OrderMan, reject_level, "New order would breach limit. User: {} Account: " "{} Msg: {} Order: {}. Dropping order", me->definition.user(), me->definition.account(), lqr.error_msg, key().value()); auto msg = fmt::format("Order would breach limit: {}", lqr.error_msg); - transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); - return OrderOpResult{ORDER_ERROR_LIMIT_BREACH,msg}; + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); + return OrderOpResult{ORDER_ERROR_LIMIT_BREACH, msg}; } // are we under the messaging threshold? if (!me->services->governor(*me->session_services).can_send()) { - LOG(OrderMan, Warn, + LOG(OrderMan, reject_level, "New order would cause breach of messaging " "limits. Dropping order {}", key().value()); auto msg = "Messaging threshold breached"; - transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); - return OrderOpResult(ORDER_ERROR_MESSAGING_LIMIT_BREACH,msg); + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); + return OrderOpResult(ORDER_ERROR_MESSAGING_LIMIT_BREACH, msg); } // if we are here we are good. @@ -403,16 +405,16 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services) { bts_assert(!me->services); me->services = &services; - auto result = OrderOpResult {}; + auto result = OrderOpResult{}; switch (me->state.status()) { case ORDER_STATUS_INACTIVE: { // this is a brand new order - result = _on_activate(p, q, services); + result = _on_activate(Warn, Info, p, q, services); if (result.ok()) { auto scoped_log = - services.log_scope("NativeOrder::on_activate", key().value()); + services.log_scope("NativeOrder::on_activate", key().value()); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::NewOrderSingle, me->create_encoding); @@ -504,7 +506,7 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, OrderOpResult NativeOrder::on_update(Price p, Quantity q) { auto scoped_log = me->services->log_scope("NativeOrder::on_update", key().value()); - auto result = OrderOpResult {}; + auto result = OrderOpResult{}; switch (me->state.status()) { @@ -618,7 +620,7 @@ OrderOpResult NativeOrder::on_cancel() { auto scoped_log = me->services->log_scope("NativeOrder::on_cancel", key().value()); auto result = OrderOpResult{}; - + switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -641,19 +643,19 @@ OrderOpResult NativeOrder::on_cancel() { result.error = ORDER_ERROR_INVALID_OP; result.error_msg = "Order is already terminated"; break; - + case ORDER_STATUS_DISCONNECTED: { auto msg = "Cannot cancel order"; result.error = ORDER_ERROR_GATEWAY_NOT_READY; result.error_msg = msg; - transition(me->state.status(),msg); + transition(me->state.status(), msg); break; } case ORDER_STATUS_PENDING_WORKING: { auto msg = "Cannot cancel order"; result.error = ORDER_ERROR_ORDER_NOT_ACK; result.error_msg = msg; - transition(me->state.status(),msg); + transition(me->state.status(), msg); break; } case ORDER_STATUS_INACTIVE: @@ -1087,10 +1089,17 @@ bool NativeOrder::has_exchange_order_id() { void NativeOrder::transition(api::orderman::OrderStatus new_status, std::string const &msg) { + transition(Info,new_status,msg); +} + +void NativeOrder::transition(log::Level level, + api::orderman::OrderStatus new_status, + std::string const &msg) { auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); - LOG(OrderMan, Info, "Transitioning order {} from {} to {}. Msg: {}", - key().value(), from, to, msg); + if (from != to) + LOG(OrderMan, level, "Transitioning order {} from {} to {}. Msg: {}", + key().value(), from, to, msg); me->state.set_status(new_status); me->state.set_last_msg(msg); } diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 2b79388a9..291c924a9 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -44,12 +44,14 @@ class NativeOrder : public Order { void on_gateway_status(const GatewayStatusChangeEvent &); void report_state(); OrderOpResult _on_activate(log::Level reject_level, - log::Level transition_level, - Price p, Quantity q, + log::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices &services); void init_fix(); void add_exchange_order_id_to_fix(); + void transition(log::Level, + api::orderman::OrderStatus new_state, + std::string const &msg); void transition(api::orderman::OrderStatus new_state, std::string const &msg); void transition(api::orderman::OrderStatus new_state); diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index 565c8f045..98db21101 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -34,21 +34,6 @@ api::orderman::OrderStatus Order::status() const { return _status; } void Order::set_parent_key(OrderKey parent_key) { _parent_key = parent_key; } -// Many algos will not support attach. To provide a meaningfull -// default implementation we must report the state of the order, so -// that the UI and monitoring algos are aware this order was rejected. -OrderOpResult Order::on_activate_attach(Price, Quantity, OrderKey, - OrderServices &services) { - - api::orderman::OrderState state; - state.set_status(api::orderman::ORDER_STATUS_REJECTED_BY_SPARK); - state.set_last_msg("Order does not support attachment"); - services.report_state(state); - - return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, - "Not implemented"}; -} - OrderOpResult Order::on_update(api::orderman::Update const &) { return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP, "Not implemented"}; From 0c063a38764783afe783fdb7f3a859aefa147448 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Mar 2019 11:31:06 -0500 Subject: [PATCH 095/218] Iceberg with attach is code complete. --- src/lib/orderman/orders/IcebergOrder2.cpp | 168 +++++++++++++++++++--- src/lib/orderman/orders/IcebergOrder2.h | 14 +- 2 files changed, 154 insertions(+), 28 deletions(-) diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index 21d4d99b2..c5cee99c3 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -16,6 +16,7 @@ using namespace api::orderman; enum class IcebergOrder2::InternalStatus { INACTIVE, PENDING_ATTACH, + PENDING_ATTACH_FORWARDING, PAUSED, WORKING, COMPLETED @@ -91,11 +92,10 @@ void IcebergOrder2::on_init_new(OrderDefinition const &def, "an existing order"); return; } - if (attach_target == null_order_key() || - should_forward_attachment(me->def.custom_def())) + if (attach_target == null_order_key()) initialize_child_builder(services.order_factory); else { - // when attaching directly we do not need an order builder + // when attaching we do not use an order builder } } @@ -155,9 +155,10 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, services.subscribe_to_child_updates( [this](auto const &os) { this->on_child_order_update(os); }); + // Are we attaching to an existing order? auto ak = OrderKey(me->def.attach_target_order_key()); if (ak != null_order_key()) { - return on_activate_attach(ak); + return on_activate_attach(); } else { me->set_external_status(ORDER_STATUS_WORKING); work(); @@ -170,6 +171,7 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, case InternalStatus::WORKING: case InternalStatus::PAUSED: case InternalStatus::PENDING_ATTACH: + case InternalStatus::PENDING_ATTACH_FORWARDING: bts_assert(false); return report_and_return(); } @@ -179,21 +181,55 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, return report_and_return(); } -OrderOpResult IcebergOrder2::on_activate_attach(OrderKey attach_target) { +OrderOpResult IcebergOrder2::on_activate_attach() { bts_assert(me->services); bts_assert(me->internal_status == InternalStatus::INACTIVE); - bts_assert(!me->child_builder.is_activated()); bts_assert(me->def.attach_target_order_key() != null_order_key().value()); + bts_assert(!me->child_builder.is_activated()); + auto attach_target = me->def.attach_target_order_key(); if (should_forward_attachment(me->def.custom_def())) { - // We are not attaching directly, but our child will - bts_assert(me->def.attach_target_order_key() != null_order_key().value()); - me->set_external_status(ORDER_STATUS_WORKING); - work(); + + // The first order we launch is going to handle the attachment + // while subsquent childen (if any) will not. So we do not use a + // OrderBuilder or send_next_child_order and instead build and + // launch the first child order directly below. + auto attaching_child = make_child_def(); + attaching_child.set_attach_target_order_key(attach_target); + me->active_child.order = ChildOrder{attaching_child, *me->services}; + me->active_child.key = me->active_child.order.key(); + + auto to_send = std::min(me->order_state.quantity(), + (uint32_t)me->iceberg_def().show_quantity()); + + me->active_child.order.activate( + Price(me->order_state.price()), Quantity(to_send), + [this](auto const &op) { this->on_child_activate_completed(op); }); + + me->set_external_status(ORDER_STATUS_PENDING_WORKING); + + LOG(OrderMan, Info, + "Iceberg order {} forwarding attachment to {} to first child" + " order {} with size {} price {}", + key().value(), attach_target, me->active_child.key.value(), to_send, + me->order_state.price()); + transition(InternalStatus::PENDING_ATTACH_FORWARDING); + } else { // We are attaching directly me->set_external_status(ORDER_STATUS_PENDING_WORKING); - attach(attach_target); + me->services->attach( + OrderKey(attach_target), + [this](auto result, auto const &child_order, auto const &child_def, + auto const &child_state) { + on_attach_complete(result, child_order, child_def, child_state); + }); + + LOG(OrderMan, Info, + "Iceberg order {} attempting to attach to {} " + " order {}", + key().value(), attach_target); + transition(InternalStatus::PENDING_ATTACH); } return report_and_return(); } @@ -249,6 +285,7 @@ OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { "Order is already completed"); case InternalStatus::PENDING_ATTACH: + case InternalStatus::PENDING_ATTACH_FORWARDING: return report_and_return( ORDER_ERROR_INVALID_OP, "Order cannot be modified while waiting for attach to complete"); @@ -269,6 +306,7 @@ orderman::OrderOpResult orderman::IcebergOrder2::on_cancel() { case InternalStatus::PAUSED: case InternalStatus::WORKING: case InternalStatus::PENDING_ATTACH: + case InternalStatus::PENDING_ATTACH_FORWARDING: terminate(ORDER_STATUS_CANCELED); return report_and_return(); case InternalStatus::COMPLETED: @@ -292,7 +330,20 @@ void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { switch (me->internal_status) { + case InternalStatus::PENDING_ATTACH_FORWARDING: case InternalStatus::WORKING: + + // When we forward an attachment we use the first order update + // to fill in our own order definition, from the definition + // provided by the child that we forwarded the attachment to. + if (me->internal_status == InternalStatus::PENDING_ATTACH_FORWARDING) { + complete_def_from_child(*ev.definition); + initialize_child_builder(me->services->order_factory()); + + // now we are effectively in the WORKING state + transition(InternalStatus::WORKING); + } + if (ev.key != me->active_child.key) { LOG(OrderMan, Info, "Iceberg order {} received child update from unexpected child " @@ -392,6 +443,7 @@ void IcebergOrder2::on_time() { case InternalStatus::COMPLETED: case InternalStatus::WORKING: case InternalStatus::PENDING_ATTACH: + case InternalStatus::PENDING_ATTACH_FORWARDING: break; } } @@ -408,6 +460,7 @@ void orderman::IcebergOrder2::on_child_activate_completed(OrderOpResult r) { switch (me->internal_status) { case InternalStatus::PAUSED: case InternalStatus::WORKING: + case InternalStatus::PENDING_ATTACH_FORWARDING: terminate(ORDER_STATUS_ERROR, std::string("Child order operation failed: ") + r.error_msg); report_and_return(); @@ -449,29 +502,71 @@ void IcebergOrder2::work() { case InternalStatus::PAUSED: case InternalStatus::INACTIVE: - case InternalStatus::PENDING_ATTACH: me->start_of_pause = TimeStamp(); send_next_child_order(); transition(InternalStatus::WORKING); break; case InternalStatus::WORKING: + case InternalStatus::PENDING_ATTACH: + case InternalStatus::PENDING_ATTACH_FORWARDING: case InternalStatus::COMPLETED: bts_assert(false); break; } } -void IcebergOrder2::attach(OrderKey target) { - bts_assert(me->internal_status == InternalStatus::INACTIVE); +void IcebergOrder2::on_attach_complete( + OrderOpResult r, ChildOrder const &child, + api::orderman::OrderDefinition const &child_def, + api::orderman::OrderState const &child_state) { - AttachCallback cb([this](auto result, auto const &child_order, - auto const &child_def, auto const &child_state) { - on_attach_complete(result, child_order, child_def, child_state); - }); + switch (me->internal_status) { - me->services->attach(target, cb); - transition(InternalStatus::PENDING_ATTACH); + case InternalStatus::PENDING_ATTACH: + if (r.ok()) { + + // Cache the attached order + me->active_child.order = child; + me->active_child.key = child.key(); + + // Complete our definition by extracting some of the elements + // of the child we attached to + complete_def_from_child(child_def); + + // Initialize our child builder with the definition of the + // next child we expect to create after the one we just + // attached to completes. + initialize_child_builder(me->services->order_factory()); + + // Now we are effectively in the working state + me->set_external_status(ORDER_STATUS_WORKING); + transition(InternalStatus::WORKING); + + // Now we simulate an update so we can reflect the state of + // the child order on our own + on_child_order_update( + {child.key(), key(), + std::make_shared(child_def), + child_state}); + } else { + terminate(ORDER_STATUS_ERROR, + fmt::format("Failed to attach: {}", r.error_msg)); + } + break; + + case InternalStatus::COMPLETED: + break; + + case InternalStatus::PENDING_ATTACH_FORWARDING: + case InternalStatus::INACTIVE: + case InternalStatus::PAUSED: + case InternalStatus::WORKING: + bts_assert(false); + break; + } + + report_and_return(); } void IcebergOrder2::pause() { @@ -487,6 +582,7 @@ void IcebergOrder2::pause() { case InternalStatus::INACTIVE: case InternalStatus::PAUSED: case InternalStatus::PENDING_ATTACH: + case InternalStatus::PENDING_ATTACH_FORWARDING: case InternalStatus::COMPLETED: bts_assert(false); break; @@ -500,6 +596,7 @@ void IcebergOrder2::terminate(api::orderman::OrderStatus reason, case InternalStatus::PAUSED: case InternalStatus::WORKING: case InternalStatus::PENDING_ATTACH: + case InternalStatus::PENDING_ATTACH_FORWARDING: if (!me->active_child.is_empty()) { me->active_child.order.cancel(); me->active_child.reset(); @@ -561,19 +658,36 @@ void IcebergOrder2::check_invariants() { bts_assert(me->order_state.filled_quantity() == 0); bts_assert(me->order_state.quantity() > 0); break; + case InternalStatus::PENDING_ATTACH_FORWARDING: + bts_assert(me->external_status() == ORDER_STATUS_PENDING_WORKING); + bts_assert(!me->active_child.is_empty()); + bts_assert(me->start_of_pause == TimeStamp()); + bts_assert(!me->child_builder.is_activated()); + bts_assert(me->order_state.filled_quantity() == 0); + bts_assert(me->order_state.quantity() > 0); + break; case InternalStatus::INACTIVE: bts_assert(false); break; } } -void orderman::IcebergOrder2::initialize_child_builder(IOrderFactory &factory) { - +api::orderman::OrderDefinition IcebergOrder2::make_child_def() { // Copy parent definition to child, so the child inherits all the // standard properties of the parent (side, security, TIF, etc) auto child_def = me->def; + // make sure to skip the attach target if present in the parent + // since attach forwarding is handled specially + child_def.clear_attach_target_order_key(); + // Copy the custom part of the child order definition to our child *child_def.mutable_custom_def() = me->iceberg_def().child(); + return child_def; +} + +void orderman::IcebergOrder2::initialize_child_builder(IOrderFactory &factory) { + + auto child_def = make_child_def(); // Make the child builder me->child_builder = OrderBuilder(key(), child_def, factory, 1); @@ -627,6 +741,14 @@ OrderOpResult IcebergOrder2::on_update(Price p, Quantity q) { return on_update(up); } +void IcebergOrder2::complete_def_from_child( + api::orderman::OrderDefinition const &child) { + me->def.set_security_key(child.security_key()); + me->def.set_side(child.side()); + me->def.set_time_in_force(child.time_in_force()); + me->services->report_definition(me->def); +} + std::string orderman::IcebergOrder2::internal_status_name(InternalStatus st) { switch (st) { case InternalStatus::INACTIVE: @@ -639,6 +761,8 @@ std::string orderman::IcebergOrder2::internal_status_name(InternalStatus st) { return "WORKING"; case InternalStatus::PENDING_ATTACH: return "PENDING_ATTACH"; + case InternalStatus::PENDING_ATTACH_FORWARDING: + return "PENDING_ATTACH_FORWARDING"; } bts_assert(false); return ""; diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h index 5a6fdf97b..cc019167c 100644 --- a/src/lib/orderman/orders/IcebergOrder2.h +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -22,7 +22,7 @@ class OrderStateUpdateEvent; class IOrderFactory; class IcebergOrder2 : public Order { - public: +public: IcebergOrder2(); ~IcebergOrder2(); void on_init_new(api::orderman::OrderDefinition const &, @@ -34,22 +34,22 @@ class IcebergOrder2 : public Order { OrderOpResult on_update(Price, Quantity) override; OrderOpResult on_cancel() override; - private: +private: enum class InternalStatus; struct ActiveChild; struct PImpl; std::unique_ptr me; api::orderman::IcebergOrderDefinition &iceberg_def(); - OrderOpResult on_activate_attach(OrderKey attach_target); + OrderOpResult on_activate_attach(); void initialize_child_builder(IOrderFactory &); - + void complete_def_from_child(api::orderman::OrderDefinition const&child); + // state transitions void terminate(api::orderman::OrderStatus reason, std::string const &msg = ""); void pause(); void work(); - void attach(OrderKey attach_target); void transition(InternalStatus); void on_time(); @@ -58,6 +58,8 @@ class IcebergOrder2 : public Order { api::orderman::OrderDefinition const &, api::orderman::OrderState const &); + api::orderman::OrderDefinition make_child_def(); + void send_next_child_order(); std::string internal_status_name(InternalStatus); void merge_states(api::orderman::OrderState const &iceberg_state, @@ -66,7 +68,7 @@ class IcebergOrder2 : public Order { void on_child_activate_completed(OrderOpResult); OrderOpResult report_and_return(api::orderman::OrderError = api::orderman::ORDER_ERROR_OK, - std::string const &error_msg = ""); + std::string const & = ""); void check_invariants(); }; From 345f6ed9fe5b7e1738903b32a232870b3ae7006b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Mar 2019 14:44:42 -0500 Subject: [PATCH 096/218] Added detach handling to iceberg --- src/lib/orderman/orders/IcebergOrder2.cpp | 26 +++++++++++++++++++++++ src/lib/orderman/orders/IcebergOrder2.h | 1 + 2 files changed, 27 insertions(+) diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index c5cee99c3..58fa54b2e 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -322,6 +322,32 @@ orderman::OrderOpResult orderman::IcebergOrder2::on_cancel() { return OrderOpResult{}; } +orderman::OrderOpResult orderman::IcebergOrder2::on_detach() { + switch (me->internal_status) { + case InternalStatus::PAUSED: + case InternalStatus::PENDING_ATTACH: + terminate(ORDER_STATUS_CANCELED); + return report_and_return(); + + case InternalStatus::WORKING: + case InternalStatus::PENDING_ATTACH_FORWARDING: + me->active_child.reset(); + terminate(ORDER_STATUS_CANCELED); + return report_and_return(); + + case InternalStatus::COMPLETED: + return report_and_return(ORDER_ERROR_INVALID_OP, + "Order is already completed"); + case InternalStatus::INACTIVE: + bts_assert(false); + return report_and_return(); + } + + // compiler + bts_assert(false); + return OrderOpResult{}; +} + void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { LOG(OrderMan, Info, "Iceberg order {} in {} state received child update: {}", diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h index cc019167c..401de782a 100644 --- a/src/lib/orderman/orders/IcebergOrder2.h +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -33,6 +33,7 @@ public: OrderOpResult on_update(api::orderman::Update const &) override; OrderOpResult on_update(Price, Quantity) override; OrderOpResult on_cancel() override; + OrderOpResult on_detach() override; private: enum class InternalStatus; From 299d46aa2c74748c7633009a729cc61bc98f04bc Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 5 Mar 2019 15:44:01 -0500 Subject: [PATCH 097/218] Attach/Detach passes initial tests. --- .../actors/order_manager/OrderBuilder.h | 1 + .../actors/order_manager/OrderServices.h | 14 --- .../orderman_utils/orderman_utils.cpp | 46 +++----- src/lib/orderman/orders/IcebergOrder2.cpp | 102 +++++------------- src/lib/orderman/orders/Order.h | 3 - src/server/sparkd/cmds/Run.cpp | 3 + 6 files changed, 49 insertions(+), 120 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 78e705570..32183bf42 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -89,6 +89,7 @@ public: private: void move_here(OrderBuilder &src) { bts_assert(!_order_services); + _order_services = src._order_services; _parent_key = src._parent_key; _definition = src._definition; _reserve_sz = src._reserve_sz; diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 105349105..a1d6b51ca 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -212,20 +212,6 @@ class OrderServices { template void activate(Price p, Quantity q, CB const &on_order_op = ignore) { bts_assert(_owner->def()); - - if (_owner->def()->attach_target_order_key() != - null_order_key().value() && - !_owner->supports_attachment()) { - auto msg = "Order does not support attachment"; - on_order_op(OrderOpResult {api::orderman::ORDER_ERROR_INVALID_OP,msg}); - - api::orderman::OrderState state; - state.set_status(api::orderman::ORDER_STATUS_REJECTED_BY_SPARK); - state.set_last_msg("Order does not support attachment"); - report_state(state); - return; - } - call_with_reentrancy_guard([p, q, on_order_op](OrderServices &self) { on_order_op(self._owner->on_activate(p, q, self)); }); diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index ec3b07c6b..2d973cdfa 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -6,40 +6,28 @@ using namespace bts::api::orderman; namespace bts { namespace orderman { -bool should_forward_attachment(const api::orderman::CustomOrderDefinition &cdef) { - switch (cdef.custom_case()) { - case CustomOrderDefinition::kMarket: - case CustomOrderDefinition::kLimit: - case CustomOrderDefinition::kStop: - case CustomOrderDefinition::kStopLimit: - case CustomOrderDefinition::kSpreader: - return false; - +bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase order_kind) { + switch (order_kind) { case CustomOrderDefinition::kIceberg: - return - !cdef.iceberg().has_child() || - !should_forward_attachment(cdef.iceberg().child()); - - case CustomOrderDefinition::kTimeBox: - case CustomOrderDefinition::kTick: - case CustomOrderDefinition::kLean: - case CustomOrderDefinition::kJoin: - case CustomOrderDefinition::kTop: - case CustomOrderDefinition::kTrigger: - case CustomOrderDefinition::kCover: - case CustomOrderDefinition::kOffset: - case CustomOrderDefinition::kOco: - case CustomOrderDefinition::kPricer: case CustomOrderDefinition::kDynamic: - return false; - - case CustomOrderDefinition::CUSTOM_NOT_SET: - bts_assert(false); + return true; + default: return false; } - return false; } +bool should_forward_attachment( + const api::orderman::CustomOrderDefinition &cdef) { -}} + switch (cdef.custom_case()) { + case CustomOrderDefinition::kIceberg: + return + cdef.iceberg().has_child() && + can_consume_attachment(cdef.iceberg().child().custom_case()); + default: + return false; + } +} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index 58fa54b2e..345cdaa9f 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -16,7 +16,6 @@ using namespace api::orderman; enum class IcebergOrder2::InternalStatus { INACTIVE, PENDING_ATTACH, - PENDING_ATTACH_FORWARDING, PAUSED, WORKING, COMPLETED @@ -66,15 +65,19 @@ void IcebergOrder2::on_init_new(OrderDefinition const &def, me->def = def; if (def.custom_def().has_dynamic()) { - me->def = def; auto &ice = *me->def.mutable_custom_def()->mutable_iceberg(); auto &dice = def.custom_def().dynamic(); + if (!def.attach_target_order_key()) + me->def.set_attach_target_order_key( + dice.order_params().at("attach_target").as_uint32()); ice.set_show_quantity(dice.order_params().at("show_size").as_uint32()); ice.set_pause_between_orders_ms( dice.order_params().at("pause_ms").as_uint32()); *ice.mutable_child() = dice.order_params().at("child").as_order_def(); } + LOG(OrderMan, Info,"on_init_new: {}", utils::pb::to_string(me->def)); + // Initialize mutable iceberg component of our state report me->order_state.mutable_iceberg(); @@ -85,18 +88,14 @@ void IcebergOrder2::on_init_new(OrderDefinition const &def, "Show quantity must be greater than 0"); return; } - auto attach_target = OrderKey(def.attach_target_order_key()); + auto attach_target = OrderKey(me->def.attach_target_order_key()); if (!ib.has_child() && attach_target == null_order_key()) { terminate(ORDER_STATUS_REJECTED_BY_SPARK, "Iceberg order must have a child order definition or attach to " "an existing order"); return; } - if (attach_target == null_order_key()) - initialize_child_builder(services.order_factory); - else { - // when attaching we do not use an order builder - } + initialize_child_builder(services.order_factory); } void IcebergOrder2::on_init_recovered(OrderRecord const &rec, @@ -140,10 +139,9 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, switch (me->internal_status) { case InternalStatus::INACTIVE: { - me->child_builder.activate(services); - me->order_state.set_price(p.value()); me->order_state.set_quantity(q.value()); + me->child_builder.activate(services); if (q.value() == 0) { terminate(ORDER_STATUS_COMPLETED); @@ -171,12 +169,11 @@ OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, case InternalStatus::WORKING: case InternalStatus::PAUSED: case InternalStatus::PENDING_ATTACH: - case InternalStatus::PENDING_ATTACH_FORWARDING: bts_assert(false); return report_and_return(); } - // compiler + // Compiler bts_assert(false); return report_and_return(); } @@ -185,15 +182,18 @@ OrderOpResult IcebergOrder2::on_activate_attach() { bts_assert(me->services); bts_assert(me->internal_status == InternalStatus::INACTIVE); bts_assert(me->def.attach_target_order_key() != null_order_key().value()); - bts_assert(!me->child_builder.is_activated()); + bts_assert(me->child_builder.is_activated()); auto attach_target = me->def.attach_target_order_key(); if (should_forward_attachment(me->def.custom_def())) { + // We are fowarding the attachment to our new child + // The first order we launch is going to handle the attachment - // while subsquent childen (if any) will not. So we do not use a - // OrderBuilder or send_next_child_order and instead build and - // launch the first child order directly below. + // while subsquent childen (if any) will not. So we do not use + // our OrderBuilder, which is primed for spawning subsquent + // children, and instead build and launch the first child order + // directly below. auto attaching_child = make_child_def(); attaching_child.set_attach_target_order_key(attach_target); me->active_child.order = ChildOrder{attaching_child, *me->services}; @@ -206,14 +206,15 @@ OrderOpResult IcebergOrder2::on_activate_attach() { Price(me->order_state.price()), Quantity(to_send), [this](auto const &op) { this->on_child_activate_completed(op); }); - me->set_external_status(ORDER_STATUS_PENDING_WORKING); - LOG(OrderMan, Info, "Iceberg order {} forwarding attachment to {} to first child" " order {} with size {} price {}", key().value(), attach_target, me->active_child.key.value(), to_send, me->order_state.price()); - transition(InternalStatus::PENDING_ATTACH_FORWARDING); + + me->set_external_status(ORDER_STATUS_WORKING); + me->start_of_pause = TimeStamp(); + transition(InternalStatus::WORKING); } else { // We are attaching directly @@ -226,8 +227,7 @@ OrderOpResult IcebergOrder2::on_activate_attach() { }); LOG(OrderMan, Info, - "Iceberg order {} attempting to attach to {} " - " order {}", + "Iceberg order {} attempting to attach to {} ", key().value(), attach_target); transition(InternalStatus::PENDING_ATTACH); } @@ -285,7 +285,6 @@ OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { "Order is already completed"); case InternalStatus::PENDING_ATTACH: - case InternalStatus::PENDING_ATTACH_FORWARDING: return report_and_return( ORDER_ERROR_INVALID_OP, "Order cannot be modified while waiting for attach to complete"); @@ -306,7 +305,6 @@ orderman::OrderOpResult orderman::IcebergOrder2::on_cancel() { case InternalStatus::PAUSED: case InternalStatus::WORKING: case InternalStatus::PENDING_ATTACH: - case InternalStatus::PENDING_ATTACH_FORWARDING: terminate(ORDER_STATUS_CANCELED); return report_and_return(); case InternalStatus::COMPLETED: @@ -330,11 +328,10 @@ orderman::OrderOpResult orderman::IcebergOrder2::on_detach() { return report_and_return(); case InternalStatus::WORKING: - case InternalStatus::PENDING_ATTACH_FORWARDING: me->active_child.reset(); terminate(ORDER_STATUS_CANCELED); return report_and_return(); - + case InternalStatus::COMPLETED: return report_and_return(ORDER_ERROR_INVALID_OP, "Order is already completed"); @@ -356,20 +353,8 @@ void IcebergOrder2::on_child_order_update(OrderStateUpdateEvent const &ev) { switch (me->internal_status) { - case InternalStatus::PENDING_ATTACH_FORWARDING: case InternalStatus::WORKING: - // When we forward an attachment we use the first order update - // to fill in our own order definition, from the definition - // provided by the child that we forwarded the attachment to. - if (me->internal_status == InternalStatus::PENDING_ATTACH_FORWARDING) { - complete_def_from_child(*ev.definition); - initialize_child_builder(me->services->order_factory()); - - // now we are effectively in the WORKING state - transition(InternalStatus::WORKING); - } - if (ev.key != me->active_child.key) { LOG(OrderMan, Info, "Iceberg order {} received child update from unexpected child " @@ -469,7 +454,6 @@ void IcebergOrder2::on_time() { case InternalStatus::COMPLETED: case InternalStatus::WORKING: case InternalStatus::PENDING_ATTACH: - case InternalStatus::PENDING_ATTACH_FORWARDING: break; } } @@ -486,7 +470,6 @@ void orderman::IcebergOrder2::on_child_activate_completed(OrderOpResult r) { switch (me->internal_status) { case InternalStatus::PAUSED: case InternalStatus::WORKING: - case InternalStatus::PENDING_ATTACH_FORWARDING: terminate(ORDER_STATUS_ERROR, std::string("Child order operation failed: ") + r.error_msg); report_and_return(); @@ -535,7 +518,6 @@ void IcebergOrder2::work() { case InternalStatus::WORKING: case InternalStatus::PENDING_ATTACH: - case InternalStatus::PENDING_ATTACH_FORWARDING: case InternalStatus::COMPLETED: bts_assert(false); break; @@ -552,20 +534,15 @@ void IcebergOrder2::on_attach_complete( case InternalStatus::PENDING_ATTACH: if (r.ok()) { + LOG(OrderMan, Info, "Iceberg order {} successfully attached to {}", + key().value(), child.key().value()); + // Cache the attached order me->active_child.order = child; me->active_child.key = child.key(); - // Complete our definition by extracting some of the elements - // of the child we attached to - complete_def_from_child(child_def); - - // Initialize our child builder with the definition of the - // next child we expect to create after the one we just - // attached to completes. - initialize_child_builder(me->services->order_factory()); - // Now we are effectively in the working state + me->start_of_pause = TimeStamp(); me->set_external_status(ORDER_STATUS_WORKING); transition(InternalStatus::WORKING); @@ -584,7 +561,6 @@ void IcebergOrder2::on_attach_complete( case InternalStatus::COMPLETED: break; - case InternalStatus::PENDING_ATTACH_FORWARDING: case InternalStatus::INACTIVE: case InternalStatus::PAUSED: case InternalStatus::WORKING: @@ -608,7 +584,6 @@ void IcebergOrder2::pause() { case InternalStatus::INACTIVE: case InternalStatus::PAUSED: case InternalStatus::PENDING_ATTACH: - case InternalStatus::PENDING_ATTACH_FORWARDING: case InternalStatus::COMPLETED: bts_assert(false); break; @@ -622,7 +597,6 @@ void IcebergOrder2::terminate(api::orderman::OrderStatus reason, case InternalStatus::PAUSED: case InternalStatus::WORKING: case InternalStatus::PENDING_ATTACH: - case InternalStatus::PENDING_ATTACH_FORWARDING: if (!me->active_child.is_empty()) { me->active_child.order.cancel(); me->active_child.reset(); @@ -679,16 +653,7 @@ void IcebergOrder2::check_invariants() { case InternalStatus::PENDING_ATTACH: bts_assert(me->external_status() == ORDER_STATUS_PENDING_WORKING); bts_assert(me->active_child.is_empty()); - bts_assert(me->start_of_pause == TimeStamp()); - bts_assert(!me->child_builder.is_activated()); - bts_assert(me->order_state.filled_quantity() == 0); - bts_assert(me->order_state.quantity() > 0); - break; - case InternalStatus::PENDING_ATTACH_FORWARDING: - bts_assert(me->external_status() == ORDER_STATUS_PENDING_WORKING); - bts_assert(!me->active_child.is_empty()); - bts_assert(me->start_of_pause == TimeStamp()); - bts_assert(!me->child_builder.is_activated()); + bts_assert(me->child_builder.is_activated()); bts_assert(me->order_state.filled_quantity() == 0); bts_assert(me->order_state.quantity() > 0); break; @@ -703,9 +668,8 @@ api::orderman::OrderDefinition IcebergOrder2::make_child_def() { // standard properties of the parent (side, security, TIF, etc) auto child_def = me->def; // make sure to skip the attach target if present in the parent - // since attach forwarding is handled specially + // since attach forwarding is handled separately child_def.clear_attach_target_order_key(); - // Copy the custom part of the child order definition to our child *child_def.mutable_custom_def() = me->iceberg_def().child(); return child_def; @@ -767,14 +731,6 @@ OrderOpResult IcebergOrder2::on_update(Price p, Quantity q) { return on_update(up); } -void IcebergOrder2::complete_def_from_child( - api::orderman::OrderDefinition const &child) { - me->def.set_security_key(child.security_key()); - me->def.set_side(child.side()); - me->def.set_time_in_force(child.time_in_force()); - me->services->report_definition(me->def); -} - std::string orderman::IcebergOrder2::internal_status_name(InternalStatus st) { switch (st) { case InternalStatus::INACTIVE: @@ -787,8 +743,6 @@ std::string orderman::IcebergOrder2::internal_status_name(InternalStatus st) { return "WORKING"; case InternalStatus::PENDING_ATTACH: return "PENDING_ATTACH"; - case InternalStatus::PENDING_ATTACH_FORWARDING: - return "PENDING_ATTACH_FORWARDING"; } bts_assert(false); return ""; diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 538b66378..43a0346d8 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -69,9 +69,6 @@ class Order { // Order has been attached to virtual void on_attached(api::orderman::OrderDefinition const &); - - // Order types have to explicitly opt in to support attachment - virtual bool supports_attachment() {return false;} protected: virtual void warm_up_activate(OrderServicesData &, OrderServices &) {} diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 64d8abcec..5506b45fb 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -82,6 +82,9 @@ int Run::execute(std::vector const &) { param->set_param_name("pause_ms"); param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); param = desc.add_param_desc(); + param->set_param_name("attach_target"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); + param = desc.add_param_desc(); param->set_param_name("child"); param->mutable_param_type()->set_primitive( DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); From c39a510d090247517d03f66d8e9fbf014913d935 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 2 Mar 2019 19:36:19 -0600 Subject: [PATCH 098/218] refactor\cleanup OrderTypeVMBase and impls --- .../Trading/AlgoStudio/Model/AlgoData.cs | 2 +- .../AlgoStudio/Model/AlgoStructureKey.cs | 8 +- .../Orders/OrderTypeVMs/DynamicOrderHelper.cs | 48 +++- .../Orders/OrderTypeVMs/DynamicOrderVM.cs | 125 ++------- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 256 +++++++++--------- .../Orders/OrderTypeVMs/SpreaderOrderVM.cs | 39 ++- .../Orders/OrderTypeVMs/StopLimitOrderVM.cs | 5 - .../Orders/OrderTypeVMs/TimeBoxOrderVM.cs | 28 +- .../Orders/OrderTypeVMs/TriggerOrderVM.cs | 128 ++++----- .../core/Collections/ObservableAutoWrapper.cs | 12 +- .../spark/core/Utility/CollectionHelper.cs | 14 + src/client/spark/core/Utility/ProtoHelper.cs | 91 +++++++ .../spark/view/Spark/Core/OrderUtils.cs | 2 +- .../view/Spark/Utilities/OrderDataHelper.cs | 84 ++++-- .../spark_core/utils/GlobalExtensions.cs | 6 + 15 files changed, 488 insertions(+), 360 deletions(-) create mode 100644 src/client/spark/core/Utility/ProtoHelper.cs diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs index 50ad47fe2..58f92670c 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs @@ -10,7 +10,7 @@ namespace mbts.spark { public readonly AlgoKey key; public AlgoData(CustomOrderDefinitionImmutable value) - : this(value, value.CustomCase.display_name(), new AlgoKey(value.CustomCase)) { } + : this(value, value.display_name(), OrderDataHelper.get_shallow_factory_key(value)) { } public AlgoData(CustomOrderDefinitionImmutable value, string name, AlgoKey key) { this.value = value; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs index fff917a91..fb2c0666e 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs @@ -72,7 +72,7 @@ namespace mbts.spark { _build_structure(definition.CloneToMutable(), ref structure, pos); static void _build_structure(CustomOrderDefinition algo, ref int[] structure, int pos) { - var cad = OrderDataHelper.get_child_algo_data(algo.CustomCase); + var cad = OrderDataHelper.get_child_algo_data(algo); for (int di = 0; di < cad.Count; di++) { if (cad[di].get_child(algo) is CustomOrderDefinition child_algo) { ArrayHelper.ensure_capacity(ref structure, pos + 1); @@ -87,7 +87,7 @@ namespace mbts.spark { static void _build_def(int[] structure, ref int pos, ref CustomOrderDefinition algo) { for (int i = pos; i < structure.Length; i++) { - var cad = OrderDataHelper.get_child_algo_data(algo.CustomCase); + var cad = OrderDataHelper.get_child_algo_data(algo); for (int di = 0; di < cad.Count; di++) { int mask = 1 << (31 - di); if ((structure[i] & mask) == mask) { @@ -95,10 +95,10 @@ namespace mbts.spark { var child_algo = OrderDataHelper.Defaults.CustomOrderDefinition(type); pos++; _build_def(structure, ref pos, ref child_algo); - cad[di].set_child(algo, child_algo); + cad[di].assign_child(algo, child_algo); } } } } } -} \ No newline at end of file +} diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs index 298ccb345..308a29fbc 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs @@ -1,5 +1,8 @@ using bts.api; using bts.api.orderman; +using bts.utils; +using Google.Protobuf.Reflection; +using mbts.utils; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -10,6 +13,9 @@ namespace mbts.spark { [Export] public class DynamicOrderHelper { + static readonly IReadOnlyDictionary _descriptor_case_index = + ProtoHelper.get_oneof_descriptor_index(nameof(DynamicOrderParam.ValueCase)); + readonly RegisteredDynamicOrderTypes _dynamic_types; [ImportingConstructor] private DynamicOrderHelper(OrderService order_service) @@ -28,11 +34,47 @@ namespace mbts.spark { foreach(var p in d.ParamDesc) dorder.Dynamic.OrderParams.Add( p.ParamName, new DynamicOrderParam() ); defs.Add(new CustomOrderDefinitionImmutable(dorder)); - var de = get_descriptor(""); } } internal DynamicOrderDescriptor get_descriptor(string dynamic_type) => - _dynamic_types.DynamicOrderDesc.FirstOrDefault(d => d.DynamicOrderType == dynamic_type); + _dynamic_types.DynamicOrderDesc.FirstOrDefault(d => d.DynamicOrderType == dynamic_type) ?? new DynamicOrderDescriptor(); + + internal DynamicOrderDefinition create_def(string dynamic_type) { + var desc = get_descriptor(dynamic_type); + var def = new DynamicOrderDefinition(); + foreach (var p in desc.ParamDesc) { + if (_is_child_algo_desc(p)) { + def.OrderParams[p.ParamName] = new DynamicOrderParam { AsOrderDef = new CustomOrderDefinition() }; + } else if (_is_value_param_desc(p)) { + var value_case = _get_value_case(p.ParamType.Primitive); + if (_descriptor_case_index.TryGetValue(value_case, out (FieldDescriptor fd, Type type) tup)) { + var dop = new DynamicOrderParam(); + tup.fd.Accessor.SetValue(dop, ConvertUtils.get_default(tup.type)); + def.OrderParams[p.ParamName] = dop; + } + } + } + return def; + } + + static DynamicOrderParam.ValueOneofCase _get_value_case(DynamicOrderPrimitiveDescriptor primitive_descriptor_case) { + switch (primitive_descriptor_case) { + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveBool: return DynamicOrderParam.ValueOneofCase.AsBool; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return DynamicOrderParam.ValueOneofCase.AsBool; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return DynamicOrderParam.ValueOneofCase.AsInt32; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return DynamicOrderParam.ValueOneofCase.AsUint32; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return DynamicOrderParam.ValueOneofCase.AsString; + default: throw ExceptionBuilder.Argument.unexpected_case(primitive_descriptor_case, nameof(primitive_descriptor_case)); + } + } + + static bool _is_child_algo_desc(DynamicOrderParamDescriptor desc) => + desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Primitive && + desc.ParamType.Primitive == DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef; + + static bool _is_value_param_desc(DynamicOrderParamDescriptor desc) => + desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated || + (desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Primitive && desc.ParamType.Primitive != DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef); } -} \ No newline at end of file +} diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs index 62cf4c644..f436e7906 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs @@ -1,28 +1,36 @@ using bts.api.orderman; using mbts.collections; -using mbts.ui; -using mbts.ui.shell; +using mbts.spark.utilities; using mbts.ui.utility; using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; -using System.Threading.Tasks; +using System.Linq; +using System.Reactive.Linq; namespace mbts.spark { static partial class OrderTypeVMFactory { class DynamicOrderVM : OrderTypeVMBase { readonly ObservableKeyedCollection _parameters = new ObservableKeyedCollection(vm => vm.descriptor.ParamName); readonly Property _dyn_type; - OrdersModel _model; - bool _active; public DynamicOrderVM(AlgoKey key, string dyn_type, string display_name, AlgoEditingPermissions editing_permissions) : base(key, display_name, editing_permissions) { _dyn_type = add_property(nameof(this.dyn_type), DynamicOrderDefinition.DynamicOrderTypeFieldNumber, dyn_type); _parameters = new ObservableKeyedCollection(vm => vm.descriptor.ParamName); _resources.AddRange( - _dyn_type.Subscribe(_ => _reset_dynamic_types()), + _dyn_type.Subscribe(_ => { + _sync_dynamic_params(); + sync_selectors(); + }), + ObservableAutoWrapper.connect_item_hooks(_parameters.AsCollection(), pvm => { + add_property(pvm.descriptor.ParamName, mdef => mdef.OrderParams[pvm.descriptor.ParamName] = pvm.param, mdef => { + if (mdef.OrderParams.TryGetValue(pvm.descriptor.ParamName, out DynamicOrderParam p)) + pvm.param = p; + }); + return Disposable.Create(() => remove_property(pvm.descriptor.ParamName)); + }), ObservableAutoWrapper.connect_item_hooks(_parameters, p => { p.PropertyChanged += on_param_prop_changed; return Disposable.Create(() => p.PropertyChanged -= on_param_prop_changed); @@ -31,103 +39,26 @@ namespace mbts.spark { } public string dyn_type => _dyn_type.Value; - public ObservableCollection parameters { - get { - _ensure_init(); - return _parameters; + public ObservableCollection parameters => _parameters; + + protected override void on_model_internal() => + _sync_dynamic_params(); + + protected override IEnumerable get_selector_datum() => + OrderDataHelper.get_child_algo_data(new CustomOrderDefinition { + Dynamic = model?.dynamic_helper?.create_def(dyn_type) ?? new DynamicOrderDefinition() + }); + + void _sync_dynamic_params() { + if (model != null) { + var desc = model.dynamic_helper.get_descriptor(dyn_type); + _parameters.SyncWithDictionary(desc.ParamDesc.Where(_is_value_param_desc).ToDictionary(p => p.ParamName), DynamicOrderParamVM.create); } } - protected override void assign_to_internal(DynamicOrderDefinition dynamic_def) { - foreach (var vm in _parameters.Values) - dynamic_def.OrderParams[vm.descriptor.ParamName] = vm.param; - } - - protected override void load_from_internal(DynamicOrderDefinitionImmutable dyn_defi) { - foreach (var p in _parameters) { - if (dyn_defi.OrderParams.TryGetValue(p.descriptor.ParamName, out DynamicOrderParam dop)) { - p.param = dop; - } else { - p.param.ClearValue(); - } - } - } - - protected override async Task on_load_from_async(CustomOrderDefinitionImmutable defi) { - await Wait.until_true(() => _model != null, TimeSpan.FromSeconds(60)); - _ensure_init(); - } - - void _ensure_init() { - if (!_active) { - _active = true; - // lazy initialization is required to avoid a stack overflow (otherwise, the algo-hierarchy would grow recursively without stopping). - _reset_dynamic_types(); - } - } - protected override void on_model_internal(OrdersModel model) { - _model = model; - _reset_dynamic_types(); - } - - void _reset_dynamic_types() { - if (!_active) - return; - var value_descs = new Dictionary(); - var child_descs = new Dictionary(); - if (_model != null) { - var desc = _model.dynamic_helper.get_descriptor(dyn_type); - if (desc != null) { - foreach (var p in desc.ParamDesc) { - if (_is_value_param_desc(p)) { - value_descs[p.ParamName] = p; - } else if (_is_child_algo_desc(p)) { - child_descs[p.ParamName] = p; - } - } - } - } - _parameters.SyncWithDictionary(value_descs, DynamicOrderParamVM.create); - using (reset_selectors()) { - foreach (var kv in child_descs) { - add_selector(kv.Key, get_child, set_child); - // local methods - CustomOrderDefinitionImmutable? get_child(DynamicOrderDefinitionImmutable dyn_defi) { - if (dyn_defi.OrderParams.TryGetValue(kv.Key, out DynamicOrderParam p) && p.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef) - return new CustomOrderDefinitionImmutable(p.AsOrderDef); - return null; - } - void set_child(DynamicOrderDefinition dyn_def, CustomOrderDefinition child) => - dyn_def.OrderParams[kv.Key] = new DynamicOrderParam { AsOrderDef = child }; - } - } - } - - static bool _is_child_algo_desc(DynamicOrderParamDescriptor desc) => - desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Primitive && - desc.ParamType.Primitive == DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef; - static bool _is_value_param_desc(DynamicOrderParamDescriptor desc) => desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated || (desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Primitive && desc.ParamType.Primitive != DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef); - - public class SelectorVM : ViewModelBase { - readonly IAlgoSelector _selector; - - public SelectorVM(IAlgoSelector selector) { - _selector = selector; - _selector.selected_algo_changed += _on_selected_algo_changed; - } - - public IAlgoVM selected_algo { get => _selector.selected_algo; set => _selector.selected_algo = value; } - public ObservableCollection algos => _selector.algos; - - public void Dispose() => - _selector.selected_algo_changed -= _on_selected_algo_changed; - - void _on_selected_algo_changed(IAlgoVM oldval, IAlgoVM newval) => - RaisePropertyChanged(nameof(selected_algo)); - } } } } diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index dd404cc99..3dfaea3de 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -113,11 +113,12 @@ namespace mbts.spark { readonly IDictionary _children_vm = new ExpandoObject(); protected CompositeDisposable _resources = new CompositeDisposable(); - readonly List<(Action assign, Action load)> _auto_props = new List<(Action assign, Action load)>(); + readonly ObservableKeyedCollection<(string name, Action assign, Action load), string> _auto_props = new ObservableKeyedCollection<(string name, Action assign, Action load), string>(t => t.name); readonly ObservableKeyedCollection _child_algo_selector_data = new ObservableKeyedCollection(sd => sd.prop_name); readonly ObservableAutoWrapper _child_algo_selectors; readonly Property _is_expanded, _can_save_values, _can_save_structure; readonly DeferrableActionWrapper _def_change_notifier; + IDisposable _pending_load; protected OrderTypeVMBase(AlgoKey id, string display_name, AlgoEditingPermissions editing_permissions) { this.id = id; @@ -127,9 +128,7 @@ namespace mbts.spark { _can_save_values = backing(nameof(can_save_values), true); _can_save_structure = backing(nameof(can_save_structure), true); _is_expanded = backing(nameof(is_expanded)); - foreach (var c in OrderDataHelper.get_child_algo_data(order_type)) { - _children_vm[c.name] = add_selector(c.name, c.descriptor); - } + meta = OrderDataHelper.get_metadata(order_type); _def_change_notifier = new DeferrableActionWrapper(() => definition_changed?.Invoke()); PropertyChanged += (s, e) => { switch (e.PropertyName) { @@ -170,39 +169,41 @@ namespace mbts.spark { }, true)); } - public AlgoEditingPermissions editing_permissions { get; private set; } public event Action definition_changed; + // core public AlgoDefi definition => new AlgoDefi(this.created_assigned()); public AlgoType order_type => OrderDataHelper.get_order_type(new TMutable()); - public bool is_bts_type => display_name.StartsWith("BTS"); public AlgoKey id { get; } + // display + public bool is_bts_type => display_name.StartsWith("BTS"); public string display_name { get; private set; } - public OrderMetadata meta => OrderDataHelper.get_metadata(order_type); - public virtual bool can_expand => !meta.NoProps; - public virtual bool is_expanded { - get => _is_expanded.Value; - set => _is_expanded.Value = value; - } + public OrderMetadata meta { get; } + // child algos public dynamic children_vm => _children_vm; public ObservableCollection child_algo_selectors => _child_algo_selectors; + // editing permissions + public AlgoEditingPermissions editing_permissions { get; private set; } public bool can_edit_values => EnumHelper.includes_flag(editing_permissions, AlgoEditingPermissions.AllowEditValues); public bool can_edit_structure => EnumHelper.includes_flag(editing_permissions, AlgoEditingPermissions.AllowEditStructure); public bool can_save_values => _can_save_values.Value; public bool can_save_structure => _can_save_structure.Value; + // misc + public virtual bool can_expand => !meta.NoProps; + public virtual bool is_expanded { get => _is_expanded.Value; set => _is_expanded.Value = value; } + // protected (observed props) protected OrdersModel model { get; private set; } protected SecurityMD? security_md { get; private set; } protected SecurityImmutable? security => security_md?.security; public void assign_to(AlgoDef value) { var algo = new TMutable(); - foreach (var (assign, load) in _auto_props) + foreach (var (name, assign, load) in _auto_props) assign(algo); _descriptor.Accessor.SetValue(value, algo); foreach (var sd in _child_algo_selector_data) { if (sd.selector.selected_algo != null) sd.set_order(value, sd.selector.selected_algo.created_assigned()); } - assign_to_internal(algo); } public void set_permissions(AlgoEditingPermissions editing_permissions) { @@ -217,26 +218,23 @@ namespace mbts.spark { public void load_from(AlgoDefi value) { if (value.CustomCase != order_type) return; - using (_def_change_notifier.defer_execution()) { - foreach (var sd in _child_algo_selector_data) { - var inner_def = sd.get_order(value); - if (inner_def.HasValue) { - if (security.HasValue) { - inner_def = OrderDataHelper.fit_to_type(inner_def.Value, security.Value.ContractCase); - if (!inner_def.HasValue) - continue; + var algom = _descriptor.Accessor.GetValue(value.CloneToMutable()) as TMutable ?? new TMutable(); + Disposable.replace(ref _pending_load, + new CompositeDisposable( + ObservableAutoWrapper.connect_item_actions(_child_algo_selector_data.AsCollection(), sd => { + var inner_def = sd.get_order(value); + if (inner_def.HasValue) { + if (security.HasValue) { + inner_def = OrderDataHelper.fit_to_type(inner_def.Value, security.Value.ContractCase); + if (!inner_def.HasValue) + return; + } + var vm = sd.selector.algos.GetOrAdd(OrderDataHelper.get_shallow_factory_key(inner_def.Value), k => create(k, inner_def.Value.display_name(), inner_def.Value.CustomCase)); + vm.load_from(inner_def.Value); + sd.selector.selected_algo = vm; } - var vm = sd.selector.algos.GetOrAdd(OrderDataHelper.get_shallow_factory_key(inner_def.Value), k => create(k, inner_def.Value.display_name(), inner_def.Value.CustomCase)); - vm.load_from(inner_def.Value); - sd.selector.selected_algo = vm; - } - } - var algom = _descriptor.Accessor.GetValue(value.CloneToMutable()) as TMutable ?? new TMutable(); - var algoi = _create_immutable(algom); - foreach (var (assign, load) in _auto_props) - load(algom); - load_from_internal(algoi); - } + }), + ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load(algom)))); } public virtual async Task load_from_async(AlgoDefi defi) { @@ -254,92 +252,72 @@ namespace mbts.spark { } } var algom = _descriptor.Accessor.GetValue(defi.CloneToMutable()) as TMutable ?? new TMutable(); - var algoi = _create_immutable(algom); - foreach (var (assign, load) in _auto_props) + foreach (var (name, assign, load) in _auto_props) load(algom); - load_from_internal(algoi); return defi; } } protected virtual Task on_load_from_async(AlgoDefi defi) => Task.CompletedTask; - protected virtual void assign_to_internal(TMutable value) { } - protected virtual void load_from_internal(TImmutable value) { } - - protected void raise_definition_changed() => - _def_change_notifier.execute(); - - protected virtual void validate() { } protected virtual void on_permissions_changed() { foreach (var vm in child_algo_selectors.SelectMany(s => s.algos.AsCollection())) vm.set_permissions(editing_permissions); } + protected void raise_definition_changed() => + _def_change_notifier.execute(); + + protected virtual void validate() { } + protected override void Dispose(bool disposing) => Disposable.dispose(ref _resources); - #region Chidl Algo Selectors (add/remove/reset) - protected IAlgoSelector add_selector(string vm_prop_name, FieldDescriptor inner_desc) { - return add_selector(vm_prop_name, def => { - if (_descriptor.Accessor.GetValue(def.CloneToMutable()) is TMutable mval) { - if (inner_desc.Accessor.GetValue(mval) is AlgoDef inner_def) - return new AlgoDefi(inner_def); - } - return null; - }, (mdef, inner_def) => { - if (_descriptor.Accessor.GetValue(mdef) is TMutable mval) - inner_desc.Accessor.SetValue(mval, inner_def); - }); - } - - protected IAlgoSelector add_selector(string prop_name, Func get_order, Action set_order) => - add_selector(prop_name, get_order, set_order, (s, e) => validate()); - - protected IAlgoSelector add_selector(string prop_name, Func get_order, Action set_order, EventHandler on_errors_changed) { - var rv = new AlgoSelector(); - _child_algo_selector_data[prop_name] = new AlgoSelectorData(prop_name, rv, get_order, set_order); - return rv; - } - - protected IAlgoSelector add_selector(string prop_name, Func get_algo, Action set_algo) { - var rv = new AlgoSelector(); - _child_algo_selector_data[prop_name] = new AlgoSelectorData(prop_name, rv, def => _descriptor.Accessor.GetValue(def.CloneToMutable()) is TMutable mval ? get_algo(_create_immutable(mval)) : null, - (def, child_def) => { - if (_descriptor.Accessor.GetValue(def) is TMutable mval) - set_algo(mval, child_def); - }); - return rv; - } - - protected bool remove_selector(string prop_name) => - _child_algo_selector_data.Remove(prop_name); - - /// TODO: maybe should just be a protected field? - /// Conversely, it is nice to hide these sort of implementation-specific details from inheriting classes. - /// Fwiw, as of 2/12/2019, the only class that needs the ability to add/remove selectors dynamically is . - /// The other implementations simply add a whatever selectors they need in their constructor. - protected IDisposable reset_selectors() { - var to_remove = _child_algo_selector_data.Keys.ToList(); - _child_algo_selector_data.CollectionChanged += on_change; - void on_change(object sender, NotifyCollectionChangedEventArgs e) { - switch (e.Action) { - case NotifyCollectionChangedAction.Reset: - throw new InvalidOperationException($"{nameof(_child_algo_selector_data)} was reset; unable to continue processing incremental changes."); - default: - // catches Replace/Remove/Add ops (Add ops account for cases where the item was effectively replaced by a remove/re-add) - if (e.NewItems != null) { - foreach (AlgoSelectorData sd in e.NewItems) - to_remove.Remove(sd.prop_name); - } - break; + #region Child Algo Selectors + protected virtual IEnumerable get_selector_datum() => + OrderDataHelper.get_child_algo_data(order_type); + + protected void sync_selectors() { + using (reset()) { + foreach (var c in get_selector_datum()) { + _children_vm[c.name] = mk_selector(c.name, new Func(defi => { + var mchild = c.get_child(defi.CloneToMutable()); + if (mchild != null) + return new AlgoDefi(mchild); + return null; + }), + c.assign_child); } + _populate_selectors(); + } + // local methods + IDisposable reset() { + var to_remove = _child_algo_selector_data.Keys.ToList(); + _child_algo_selector_data.CollectionChanged += on_change; + void on_change(object sender, NotifyCollectionChangedEventArgs e) { + switch (e.Action) { + case NotifyCollectionChangedAction.Reset: + throw new InvalidOperationException($"{nameof(_child_algo_selector_data)} was reset; unable to continue processing incremental changes."); + default: + // catches Replace/Remove/Add ops (Add ops account for cases where the item was effectively replaced by a remove/re-add) + if (e.NewItems != null) { + foreach (AlgoSelectorData sd in e.NewItems) + to_remove.Remove(sd.prop_name); + } + break; + } + } + return Disposable.Create(() => { + _child_algo_selector_data.CollectionChanged -= on_change; + foreach (var id in to_remove) + _child_algo_selector_data.Remove(id); + }); + } + IAlgoSelector mk_selector(string prop_name, Func get_order, Action set_order) { + var rv = new AlgoSelector(); + _child_algo_selector_data[prop_name] = new AlgoSelectorData(prop_name, rv, get_order, set_order); + return rv; } - return Disposable.Create(() => { - _child_algo_selector_data.CollectionChanged -= on_change; - foreach (var id in to_remove) - _child_algo_selector_data.Remove(id); - }); } #endregion @@ -347,7 +325,7 @@ namespace mbts.spark { protected Property add_property(string prop_name, int target_field_number, T init_value = default) { var prop = backing(prop_name, init_value); var field_desc = new TMutable().Descriptor.FindFieldByNumber(target_field_number); - _auto_props.Add((mval => { + _auto_props.Add((prop_name, mval => { if (mval != null) field_desc.Accessor.SetValue(mval, prop.Value); }, mval => { @@ -356,22 +334,12 @@ namespace mbts.spark { return prop; } - protected UserProperty add_user_property(string prop_name, int target_field_number, T init_value = default) { - var prop = user_backing(prop_name, init_value); - var field_desc = new TMutable().Descriptor.FindFieldByNumber(target_field_number); - add_property( - mdef => ConvertUtils.try_convert(field_desc.Accessor.GetValue(mdef)), - (mdef, val) => field_desc.Accessor.SetValue(mdef, val), - val => prop.bypass_setter(val), - () => prop.Value); - return prop; - } - protected Property add_property(string prop_name, int target_field_number, TImmutableValue init_value = default) where TMutableValue : class, IMessage, new() where TImmutableValue : IImmutableMessage { var prop = backing(prop_name, init_value); var field_desc = new TMutable().Descriptor.FindFieldByNumber(target_field_number); var immutable_factory = OrderTypeVMUtils.immutable_factory(); add_property( + prop_name, mdef => field_desc.Accessor.GetValue(mdef) as TMutableValue, (mdef, mval) => field_desc.Accessor.SetValue(mdef, mval), mval => prop.set(immutable_factory(mval ?? new TMutableValue())), @@ -383,15 +351,36 @@ namespace mbts.spark { return prop; } - protected void add_property(Func get_from_def, Action assign_to_def, Action set_local, Func get_local) => - _auto_props.Add((def => { + protected void add_property(string prop_name, Func get_from_def, Action assign_to_def, Action set_local, Func get_local) => + _auto_props.Add(( + prop_name, + def => { assign_to_def(def, get_local()); }, def => { set_local(get_from_def(def)); })); - protected virtual void on_model_internal(OrdersModel model) { } - protected virtual void on_security_md_internal(SecurityMD? security_md) { } + protected void add_property(string prop_name, Action assign, Action load) => + _auto_props[prop_name] = (prop_name, assign, load); + + protected UserProperty add_user_property(string prop_name, int target_field_number, T init_value = default) { + var prop = user_backing(prop_name, init_value); + var field_desc = new TMutable().Descriptor.FindFieldByNumber(target_field_number); + add_property( + prop_name, + mdef => ConvertUtils.try_convert(field_desc.Accessor.GetValue(mdef)), + (mdef, val) => field_desc.Accessor.SetValue(mdef, val), + val => prop.bypass_setter(val), + () => prop.Value); + return prop; + } + + protected void remove_property(string prop_name) => + _auto_props.Remove(prop_name); + #endregion + + protected virtual void on_model_internal() { } + protected virtual void on_security_md_internal() { } // model void IObserver.OnNext(OrdersModel model) { @@ -402,36 +391,39 @@ namespace mbts.spark { return; } this.model = model; - on_model_internal(model); - _reset(); + using (_def_change_notifier.defer_execution()) { + on_model_internal(); + sync_selectors(); + } } void IObserver.OnError(Exception error) { } void IObserver.OnCompleted() { } // security md void IObserver.OnNext(SecurityMD? security_md) { this.security_md = security_md; - on_security_md_internal(security_md); - _reset(); + using (_def_change_notifier.defer_execution()) { + on_security_md_internal(); + _populate_selectors(); + } } void IObserver.OnError(Exception error) { } void IObserver.OnCompleted() { } - IDisposable _hook; - void _reset() { + IDisposable _selector_data_hooks; + void _populate_selectors() { if (model != null && security.HasValue) { var algo_data = model.factory.default_algos(security.Value); var default_algo = new AlgoKey(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.Value.ContractCase))); foreach (var sd in _child_algo_selectors) sd.load_algo_data_recursive(algo_data, default_algo); - Disposable.replace(ref _hook, ObservableAutoWrapper.connect_item_hooks(child_algo_selectors, s => { - s.load_algo_data_recursive(algo_data, default_algo); - return Disposable.empty; - })); + Disposable.replace( + ref _selector_data_hooks, + ObservableAutoWrapper.connect_item_hooks(child_algo_selectors, s => { + s.load_algo_data_recursive(algo_data, default_algo); + return Disposable.empty; + })); } } - - public IDisposable Subscribe(IObserver observer) => throw new NotImplementedException(); - #endregion } struct AlgoSelectorData { @@ -521,4 +513,4 @@ namespace mbts.spark { } #endregion } -} +} \ No newline at end of file diff --git a/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs index 194aa952b..ad61e47cc 100644 --- a/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs @@ -23,7 +23,38 @@ namespace mbts.spark { _template = backing(nameof(template)); /// depends on (i.e. initialize the latter first). _strategy_editor_wrapper = new StrategyEditorWrapper(this); - concat_disposable(_strategy_editor_wrapper, _template.Subscribe(vals => validate())); + _resources.AddRange(_strategy_editor_wrapper, _template.Subscribe(vals => validate())); + // strategy + add_property( + nameof(SpreaderDef.ExecutionStrategy), + mdef => mdef.ExecutionStrategy, + (mdef, val) => mdef.ExecutionStrategy = val, + val => { + if (template.HasValue) { + template = template.Value.with(execution_strategy: val); + } else { + var mdef = new SpreaderDef { + Security = security?.CloneToMutable(), + ExecutionStrategy = val + }; + template = new SpreaderDefi(mdef); + } + }, + () => strategy_editor?.get_strategy().CloneToMutable()); + // security + add_property( + nameof(SpreaderDef.Security), + mdef => mdef.Security, + (mdef, val) => mdef.Security = val, + val => { + if (template.HasValue) { + template = template.Value.with(security: val); + } else { + var mdef = new SpreaderDef { Security = val }; + template = new SpreaderDefi(mdef); + } + }, + () => security?.CloneToMutable()); validate(); } @@ -43,12 +74,6 @@ namespace mbts.spark { } public bool is_loaded { get; private set; } - protected override void assign_to_internal(SpreaderDef value) => - value.MergeFrom(template.HasValue ? template.Value.CloneToMutable() : new SpreaderDef()); - - protected override void load_from_internal(SpreaderDefi value) => - _template.set(value); - protected override void validate() { base.validate(); if (!template.HasValue) diff --git a/src/client/spark/Orders/OrderTypeVMs/StopLimitOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/StopLimitOrderVM.cs index 63378127d..854628a38 100644 --- a/src/client/spark/Orders/OrderTypeVMs/StopLimitOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/StopLimitOrderVM.cs @@ -31,11 +31,6 @@ namespace mbts.spark { public ContractSpecificationImmutable? spec => _security_md.spec_or_default(); - protected override void load_from_internal(StopLimitDefi value) { - // TODO: the StopLimitOrderDefinition, StopLimitOrderDefinitionImmutable needs relative vs absolute prices to function as a useful template (talk to Pedro) - _stop_price.bypass_setter(value.StopPrice); - } - // no need to constantly poll the md, just check the inline props when the popup opens, and right before sending an order // (if the user never looks at the popup, assume that the bid_price will be used) // TODO: add settings so the trigger-price can default to something relative to the md, e.g "bid-price" or "ask-price - nticks" or "best-bid-price with a minimum size of 10" diff --git a/src/client/spark/Orders/OrderTypeVMs/TimeBoxOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TimeBoxOrderVM.cs index f12b3e9c9..3b4cbb713 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TimeBoxOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TimeBoxOrderVM.cs @@ -16,14 +16,26 @@ namespace mbts.spark { public TimeBoxOrderVM(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) : base(key, display_name, editing_permissions) { - add_property(def => def.Start, (def, val) => def.Start = val, val => absolute_start = TimeTextTuple.FromDateTime(val.ToDateTime()), () => { - _validate(out DateTime? start_time, out DateTime? _); - return start_time.GetValueOrDefault().ToUniversalTime().ToGoogleTime(); - }); - add_property(def => def.Stop, (def, val) => def.Stop = val, val => absolute_stop = TimeTextTuple.FromDateTime(val.ToDateTime()), () => { - _validate(out DateTime? _, out DateTime? stop_time); - return stop_time.GetValueOrDefault().ToUniversalTime().ToGoogleTime(); - }); + // start + add_property( + nameof(TimeBoxOrderDefinition.Start), + def => def.Start, + (def, val) => def.Start = val, + val => absolute_start = TimeTextTuple.FromDateTime(val.ToDateTime()), + () => { + _validate(out DateTime? start_time, out DateTime? _); + return start_time.GetValueOrDefault().ToUniversalTime().ToGoogleTime(); + }); + // stop + add_property( + nameof(TimeBoxOrderDefinition.Stop), + def => def.Stop, + (def, val) => def.Stop = val, + val => absolute_stop = TimeTextTuple.FromDateTime(val.ToDateTime()), + () => { + _validate(out DateTime? _, out DateTime? stop_time); + return stop_time.GetValueOrDefault().ToUniversalTime().ToGoogleTime(); + }); validate(); } diff --git a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs index f1cff6c37..28758748b 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs @@ -31,13 +31,64 @@ namespace mbts.spark { _is_priceout_checked = create_user_prop(nameof(is_priceout_checked), false); _is_timeout_checked = create_user_prop(nameof(is_timeout_checked), false); _timeout_secs = create_user_prop(nameof(timeout_secs), 10); + add_property(nameof(TriggerDef), assign, load); validate(); - // + // local methods UserProperty create_user_prop(string name, T default_value = default) { var rv = user_backing(name, default_value); rv.Changed += validation_callback; return rv; } + void assign(TriggerDef trigger_def) { + trigger_def.TriggerAction = new TriggerAction(); + if (security.HasValue) + trigger_def.TriggerAction.SecurityId = security.Value.Id; + trigger_def.TriggerCondition = new TriggerCondition() { + PriceType = trigger_price_type, + AbsolutePriceTrigger = new AbsolutePriceTrigger() { TriggerQuantity = new TriggerQuantity() }, + }; + trigger_def.ExitCondition = new TriggerExitCondition { + ConditionalCancel = is_priceout_checked, + TimeoutEnabled = is_timeout_checked, + TimeoutSeconds = (uint)(timeout_secs) + }; + switch (order_price_case) { + case OrderpriceOneofCase.Price: + // should already be null, setting it here for clarity + trigger_def.TriggerAction.Payup = null; + trigger_def.TriggerAction.Price = fixed_price; + break; + case OrderpriceOneofCase.Payup: + trigger_def.TriggerAction.Price = double.NaN; + trigger_def.TriggerAction.Payup = new TriggerPayupPrice { + PayupTicks = payup_ticks, + PayupPriceType = payup_price_type + }; + break; + } + } + void load(TriggerDef trigger_defi) { + if (trigger_defi.TriggerCondition is TriggerCondition c) { + trigger_price_type = c.PriceType; + } + if (trigger_defi.ExitCondition is TriggerExitCondition ec) { + is_priceout_checked = ec.ConditionalCancel; + is_timeout_checked = ec.TimeoutEnabled; + if (ec.TimeoutSeconds < int.MaxValue) + timeout_secs = (int)ec.TimeoutSeconds; + } + if (trigger_defi.TriggerAction is TriggerAction a) { + if (a.Payup is TriggerPayupPrice pp) { + order_price_case = OrderpriceOneofCase.Payup; + fixed_price = double.NaN; + payup_ticks = pp.PayupTicks; + payup_price_type = pp.PayupPriceType; + } else { + order_price_case = OrderpriceOneofCase.Price; + fixed_price = a.Price; + } + } + } void validation_callback(T oldval, T newval) => validate(); } @@ -56,68 +107,20 @@ namespace mbts.spark { public bool is_timeout_checked { get => _is_timeout_checked.Value; set => _is_timeout_checked.Value = value; } public int timeout_secs { get => _timeout_secs.Value; set => _timeout_secs.Value = value; } - protected override void assign_to_internal(TriggerDef trigger_def) { - trigger_def.TriggerAction = new TriggerAction(); - if (security.HasValue) - trigger_def.TriggerAction.SecurityId = security.Value.Id; - trigger_def.TriggerCondition = new TriggerCondition() { - PriceType = trigger_price_type, - AbsolutePriceTrigger = new AbsolutePriceTrigger() { TriggerQuantity = new TriggerQuantity() }, - }; - trigger_def.ExitCondition = new TriggerExitCondition { - ConditionalCancel = is_priceout_checked, - TimeoutEnabled = is_timeout_checked, - TimeoutSeconds = (uint)(timeout_secs) - }; - switch (order_price_case) { - case OrderpriceOneofCase.Price: - // should already be null, setting it here for clarity - trigger_def.TriggerAction.Payup = null; - trigger_def.TriggerAction.Price = fixed_price; - break; - case OrderpriceOneofCase.Payup: - trigger_def.TriggerAction.Price = double.NaN; - trigger_def.TriggerAction.Payup = new TriggerPayupPrice { - PayupTicks = payup_ticks, - PayupPriceType = payup_price_type - }; - break; - } - } - - protected override void load_from_internal(TriggerDefi trigger_defi) { - if (trigger_defi.HasTriggerCondition) { - trigger_price_type = trigger_defi.TriggerCondition.PriceType; - } - if (trigger_defi.HasExitCondition) { - var exit_condition = trigger_defi.ExitCondition; - is_priceout_checked = exit_condition.ConditionalCancel; - is_timeout_checked = exit_condition.TimeoutEnabled; - if (exit_condition.TimeoutSeconds < int.MaxValue) - timeout_secs = (int)exit_condition.TimeoutSeconds; - } - if (trigger_defi.HasTriggerAction) { - var trigger_action = trigger_defi.TriggerAction; - if (trigger_action.HasPayup) { - order_price_case = OrderpriceOneofCase.Payup; - fixed_price = double.NaN; - var payup = trigger_action.Payup; - payup_ticks = payup.PayupTicks; - payup_price_type = payup.PayupPriceType; - } else { - order_price_case = OrderpriceOneofCase.Price; - fixed_price = trigger_action.Price; - } - } - } - - void _refresh_md() { + protected override void on_security_md_internal() { if (security.HasValue) { security_md.Value.md.get_bbo(ref _bbo_ref, out co2.NativePriceSize bid, out co2.NativePriceSize ask); _best_bid = bid.price; _best_ask = ask.price; security_md.Value.md.get_last_trade(ref _last_trade_ref, out co2.NativePriceSize ps, out DateTime ts, out ulong v); } + if (double.IsNaN(fixed_price) || !_fixed_price.setter_called) { + switch (trigger_price_type) { + case TriggerPriceType.Bid: _fixed_price.bypass_setter(_best_bid); break; + case TriggerPriceType.Ask: _fixed_price.bypass_setter(_best_ask); break; + case TriggerPriceType.LastTradePrice: _fixed_price.bypass_setter(_last_trade_price); break; + } + } } protected override void validate() { @@ -131,17 +134,6 @@ namespace mbts.spark { } assert(!is_timeout_checked || timeout_secs > 0, nameof(timeout_secs), "Please specify valid Timeout(secs)."); } - - protected override void on_security_md_internal(SecurityMD? security_md) { - _refresh_md(); - if (double.IsNaN(fixed_price) || !_fixed_price.setter_called) { - switch (trigger_price_type) { - case TriggerPriceType.Bid: _fixed_price.bypass_setter(_best_bid); break; - case TriggerPriceType.Ask: _fixed_price.bypass_setter(_best_ask); break; - case TriggerPriceType.LastTradePrice: _fixed_price.bypass_setter(_last_trade_price); break; - } - } - } } } } \ No newline at end of file diff --git a/src/client/spark/core/Collections/ObservableAutoWrapper.cs b/src/client/spark/core/Collections/ObservableAutoWrapper.cs index 3836876d8..c77928d4d 100644 --- a/src/client/spark/core/Collections/ObservableAutoWrapper.cs +++ b/src/client/spark/core/Collections/ObservableAutoWrapper.cs @@ -1,4 +1,3 @@ -using bts.collections; using bts.utils; using mbts.utils; using NUnit.Framework; @@ -11,11 +10,6 @@ using System.Linq; using System.Reactive.Disposables; namespace mbts.ui.utility { - /// - /// The sole purpose of this class is to offer a less verbose alternative to - /// "new ObservableAutoWrapper(doodi, poodi)" - /// when the generic types are implicit - /// static class ObservableAutoWrapper { public static ObservableAutoWrapper Create(ObservableCollection models, Func converter) { return new ObservableAutoWrapper(models, converter); @@ -198,6 +192,12 @@ namespace mbts.ui.utility { } } + public static IDisposable connect_item_actions(IReadOnlyObservableCollection source, Action action) => + source.Subscribe((s, e) => CollectionHelper.process_new_items(source, action, e)); + + public static IDisposable connect_item_actions(ObservableCollection source, Action action) => + source.Subscribe((s, e) => CollectionHelper.process_new_items(source, action, e)); + public static IDisposable connect_item_hooks(IReadOnlyObservableCollection source, Func get_item_hook) { var item_hooks = source.Select(get_item_hook).ToList(); return new CompositeDisposable( diff --git a/src/client/spark/core/Utility/CollectionHelper.cs b/src/client/spark/core/Utility/CollectionHelper.cs index d74e91393..65d7252bf 100644 --- a/src/client/spark/core/Utility/CollectionHelper.cs +++ b/src/client/spark/core/Utility/CollectionHelper.cs @@ -75,6 +75,20 @@ namespace mbts.utils { } } + public static void process_new_items(IEnumerable source, Action on_new_item, NotifyCollectionChangedEventArgs e) { + switch (e.Action) { + case NotifyCollectionChangedAction.Add: + case NotifyCollectionChangedAction.Replace: + foreach (T v in e.NewItems) + on_new_item(v); + break; + case NotifyCollectionChangedAction.Reset: + foreach (T v in source) + on_new_item(v); + break; + } + } + // Note: this is not optimized, be wary of use with large collections public static void sync_with_never_duplicate(ObservableCollection dest, IEnumerable src) => sync_with_never_duplicate(dest, src, EqualityComparer.Default); diff --git a/src/client/spark/core/Utility/ProtoHelper.cs b/src/client/spark/core/Utility/ProtoHelper.cs new file mode 100644 index 000000000..987c6d041 --- /dev/null +++ b/src/client/spark/core/Utility/ProtoHelper.cs @@ -0,0 +1,91 @@ +using mbts; +using Google.Protobuf; +using Google.Protobuf.Reflection; +using mbts.ui.utility; +using System; +using System.Collections.Generic; +using System.Linq; +using mbts.utils; + +namespace bts.utils { + static class ProtoHelper { + const string + _case_suffix = "Case", + _oneof_case_suffix = "OneofCase"; + + public static MessageDescriptor Descriptor() where T : IMessage, new() => + _DescriptorImpl.value; + + public static OneofDescriptor get_oneof_descriptor(string prop_name) where T : IMessage, new() { + prop_name = prop_name.iremove_suffix(_case_suffix); + return Descriptor().Oneofs.FirstOrDefault(d => d.Name.iequals(prop_name)); + } + + public static IReadOnlyDictionary get_oneof_descriptor_index(string prop_name) + where T : IMessage, new() + where TOneofCase : struct => + _DescriptorImpl.OneofImpl.get_descriptor_case_index(prop_name); + + public static FieldDescriptor get_oneof_field_descriptor(TOneofCase oneof_case) where T : IMessage, new() where TOneofCase : struct { + string oneof_name = oneof_case.ToString(); + return Descriptor().Fields.InFieldNumberOrder().FirstOrDefault(fd => fd.Name.Replace("_", "").iequals(oneof_name)); + } + + public static Type get_field_type(FieldDescriptor field_descriptor) { + switch (field_descriptor.FieldType) { + case FieldType.Bool: return typeof(bool); + case FieldType.Bytes: return typeof(ByteString); + case FieldType.Double: return typeof(double); + case FieldType.Float: return typeof(float); + case FieldType.UInt32: return typeof(uint); + case FieldType.UInt64: return typeof(ulong); + // int + case FieldType.SFixed32: + case FieldType.Fixed32: + case FieldType.SInt32: + case FieldType.Int32: return typeof(int); + // long + case FieldType.SFixed64: + case FieldType.Fixed64: + case FieldType.SInt64: + case FieldType.Int64: return typeof(long); + // + case FieldType.String: return typeof(string); + case FieldType.Enum: return field_descriptor.EnumType.ClrType; + case FieldType.Message: return field_descriptor.MessageType.ClrType; + default: throw ExceptionBuilder.Argument.unexpected_case(field_descriptor.FieldType, nameof(field_descriptor)); + } + } + + public static IReadOnlyDictionary get_oneof_descriptor_index(OneofDescriptor descriptor) where TOneofCase : struct => + descriptor.Fields.ToDictionary(fd => EnumHelper.parse(fd.Name.Replace("_", ""))); + + static class _DescriptorImpl where T : IMessage, new() { + public static readonly MessageDescriptor value = new T().Descriptor; + + public static class OneofImpl where TOneofCase : struct { + static Dictionary> _descriptor_case_indices = + new Dictionary>(); + + public static IReadOnlyDictionary get_descriptor_case_index(string prop_name) { + /// Use local copy because is updated atomically. + var dci = _descriptor_case_indices; + if (!dci.TryGetValue(prop_name, out IReadOnlyDictionary rv)) { + /// Update atomically (lock-free). + /// 1) clone the local copy. + /// 2) add the new KeyValue to the clone. + /// 3) assign the clone back to . + rv = get_oneof_descriptor_index(get_oneof_descriptor(prop_name)) + .ToDictionary(kv => kv.Key, kv => (kv.Value, get_field_type(kv.Value))); + dci = dci.ToDictionary(); + dci.Add(prop_name, rv); + /// It is possible for add ops to be overwritten. + /// This is perfectly safe, just means that the 'clone-add-assign' will be repeated the next time a caller requests this key. + _descriptor_case_indices = dci; + } + return rv; + } + } + } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Spark/Core/OrderUtils.cs b/src/client/spark/view/Spark/Core/OrderUtils.cs index 15ba5770c..8324e92e7 100644 --- a/src/client/spark/view/Spark/Core/OrderUtils.cs +++ b/src/client/spark/view/Spark/Core/OrderUtils.cs @@ -213,7 +213,7 @@ namespace mbts.spark { // local methods void impl(StringBuilder sb, CustomOrderDefinition mdef) { sb.Append(abbreviate(mdef.CustomCase)); - foreach (var cad in OrderDataHelper.get_child_algo_data(def.CustomCase)) { + foreach (var cad in OrderDataHelper.get_child_algo_data(def.CloneToMutable())) { var child = cad.get_child(mdef); sb.Append(".["); impl(sb, child); diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index 64ab2b744..9670f4048 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -17,12 +17,27 @@ using System.Reactive.Linq; using OrderState = bts.api.orderman.OrderState; namespace mbts.spark.utilities { + struct ChildAlgoData { + public readonly string name; + public readonly Func get_child_from_impl; + public readonly Action assign_child_to_impl; + public readonly Func get_child; + public readonly Action assign_child; + + public ChildAlgoData(string name, Func get_child_from_impl, Action assign_child_to_impl, Func get_child, Action assign_child) { + this.name = name; + this.get_child = get_child; + this.assign_child = assign_child; + this.get_child_from_impl = get_child_from_impl; + this.assign_child_to_impl = assign_child_to_impl; + } + } + // at some point, user-default settings for orders can be managed here // OrdersModel imports and exposes OrderFactory as a public property [Export(typeof(OrderFactory))] class OrderFactory : IDisposable { - static readonly OrderMetadata _default_order_metadata = new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order }; - + static readonly OrderMetadata _default_order_metadata = new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.default_order }; readonly AdminModel _admin_model; readonly DynamicOrderHelper _dynamic_helper; IDisposable _dispose; @@ -250,20 +265,6 @@ namespace mbts.spark.utilities { } } - public struct ChildAlgoData { - public readonly Func get_child; - public readonly Action set_child; - public readonly string name; - public readonly FieldDescriptor descriptor; - - public ChildAlgoData(string name, FieldDescriptor descriptor, Func get_child, Action set_child) { - this.name = name; - this.get_child = get_child; - this.set_child = set_child; - this.descriptor = descriptor; - } - } - // algo-type-case maps // Note: obv this will break if we change the name of the 'CustomOneofCase' field static readonly OneofDescriptor _oneof_desc = CustomOrderDefinition.Descriptor.Oneofs.FirstOrDefault(fd => fd.Name == "custom"); @@ -283,12 +284,17 @@ namespace mbts.spark.utilities { var value_descriptors = new List(0); foreach (var f in fd.MessageType.Fields.InDeclarationOrder()) { if (is_child_algo_field(f)) { - child_algo_data.Add(new ChildAlgoData(f.Name, f, + child_algo_data.Add(new ChildAlgoData(f.Name, + msg => f.Accessor.GetValue(msg) as CustomOrderDefinition, + (msg, child) => f.Accessor.SetValue(msg, child), def => { var type_def = fd.Accessor.GetValue(def) as IMessage; return f.Accessor.GetValue(type_def) as CustomOrderDefinition; }, - (def, child) => f.Accessor.SetValue(def, child))); + (def, child) => { + if (fd.Accessor.GetValue(def) is IMessage m) + f.Accessor.SetValue(m, child); + })); } else { value_descriptors.Add(f); } @@ -302,6 +308,30 @@ namespace mbts.spark.utilities { f.FieldType == FieldType.Message && f.MessageType.ClrType == typeof(CustomOrderDefinition); } + public static IReadOnlyList get_child_algo_data(CustomOrderDefinitionImmutable defi) => + get_child_algo_data(defi.CloneToMutable()); + + public static IReadOnlyList get_child_algo_data(CustomOrderDefinition algo) { + switch (algo.CustomCase) { + case CustomOrderDefinition.CustomOneofCase.Dynamic: + return algo.Dynamic.OrderParams.Where(kv => kv.Value.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef).Select(kv => new ChildAlgoData(kv.Key, def => { + var p = ((DynamicOrderDefinition)def).OrderParams[kv.Key]; + if (p.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef) + return p.AsOrderDef; + return null; + }, + (msg, child) => { + if (msg is DynamicOrderDefinition dyn) + dyn.OrderParams.GetOrAdd(kv.Key, k => new DynamicOrderParam()).AsOrderDef = child; + }, + def => def.Dynamic.OrderParams.TryGetValue(kv.Key, out DynamicOrderParam param) && param.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef ? param.AsOrderDef : null, + (def, child) => def.Dynamic.OrderParams.GetOrAdd(kv.Key, k => new DynamicOrderParam()).AsOrderDef = child)) + .ToList(); + default: + return get_child_algo_data(algo.CustomCase); + } + } + public static IReadOnlyList get_child_algo_data(CustomOrderDefinition.CustomOneofCase algo_type) => _algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData d) ? d.child_algo_data : Array.Empty(); @@ -366,7 +396,7 @@ namespace mbts.spark.utilities { // hide mutable-def implementation IEnumerable impl(CustomOrderDefinition mdef) { yield return mdef.CustomCase; - foreach (var sd in get_child_algo_data(mdef.CustomCase)) { + foreach (var sd in get_child_algo_data(mdef)) { var child = sd.get_child(mdef); if (child != null) { yield return child.CustomCase; @@ -412,7 +442,7 @@ namespace mbts.spark.utilities { if (child == null) return null; var type_def = (IMessage)desc_data.type_case_descriptor.Accessor.GetValue(def); - cad.descriptor.Accessor.SetValue(type_def, child); + cad.assign_child_to_impl(type_def, child); } break; } @@ -429,13 +459,11 @@ namespace mbts.spark.utilities { def = new CustomOrderDefinition { Limit = new LimitOrderDefinition() }; break; default: - var desc_data = _algo_type_case_descriptor_data[def.CustomCase]; - foreach (var cad in desc_data.child_algo_data) { + foreach (var cad in get_child_algo_data(def)) { var child = outright_impl(cad.get_child(def)); if (child == null) return null; - var type_def = (IMessage)desc_data.type_case_descriptor.Accessor.GetValue(def); - cad.descriptor.Accessor.SetValue(type_def, child); + cad.assign_child(def, child); } break; } @@ -501,8 +529,8 @@ namespace mbts.spark.utilities { fd.Accessor.SetValue(tgt_type_def, fd.Accessor.GetValue(src_type_def)); } foreach (var cad in desc_data.child_algo_data) { - var src_child = cad.descriptor.Accessor.GetValue(src_type_def) as CustomOrderDefinition; - var tgt_child = cad.descriptor.Accessor.GetValue(tgt_type_def) as CustomOrderDefinition; + var src_child = cad.get_child_from_impl(src_type_def); + var tgt_child = cad.get_child_from_impl(tgt_type_def); copy_values(src_child, ref tgt_child); } } @@ -558,7 +586,7 @@ namespace mbts.spark.utilities { public static bool structure_equals(CustomOrderDefinitionImmutable a, CustomOrderDefinitionImmutable b) { return impl(a.CloneToMutable(), b.CloneToMutable()); bool impl(CustomOrderDefinition ma, CustomOrderDefinition mb) => - a.CustomCase == b.CustomCase && get_child_algo_data(a.CustomCase).All(cad => impl(cad.get_child(ma), cad.get_child(mb))); + ma.CustomCase == mb.CustomCase && get_child_algo_data(ma).All(cad => impl(cad.get_child(ma), cad.get_child(mb))); } public static bool iceberg_equals(IcebergOrderDefinitionImmutable a, IcebergOrderDefinitionImmutable b) => @@ -895,4 +923,4 @@ namespace mbts.spark.utilities { public static SpreaderOrderDefinition SpreaderOrderDefinition() => new SpreaderOrderDefinition { ExecutionStrategy = new ExecutionStrategy() }; } } -} \ No newline at end of file +} diff --git a/src/client/spark_core/utils/GlobalExtensions.cs b/src/client/spark_core/utils/GlobalExtensions.cs index ee6769ee7..ee291796b 100644 --- a/src/client/spark_core/utils/GlobalExtensions.cs +++ b/src/client/spark_core/utils/GlobalExtensions.cs @@ -19,6 +19,12 @@ namespace mbts { public static bool iequals(this string str, string comparand) => string.Equals(str, comparand, StringComparison.CurrentCultureIgnoreCase); + public static string iremove_suffix(this string str, string suffix) { + if (str.EndsWith(suffix, StringComparison.CurrentCultureIgnoreCase)) + str = str.Remove(str.Length - suffix.Length); + return str; + } + public static T choose(this Random r, IEnumerable range) { var index = r.Next(0, range.Count()); return range.Skip(index).First(); From 840441a749ce00384f19d3ac6074a5f4a47326b8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 2 Mar 2019 21:50:17 -0600 Subject: [PATCH 099/218] SPARK-2079 Trigger Clean up (simplify) --- .../Orders/OrderTypeVMs/TriggerOrderVM.cs | 12 +- .../Order/AlgoContentTemplateSelector.xaml | 117 +++--------------- 2 files changed, 29 insertions(+), 100 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs index 28758748b..78031a9c9 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs @@ -1,4 +1,5 @@ -using bts.api; +//#define ALLOW_FIXED_PRICE_TRIGGER +using bts.api; using bts.api.orderman; using mbts.ui.utility; using mbts.utils; @@ -53,11 +54,15 @@ namespace mbts.spark { TimeoutSeconds = (uint)(timeout_secs) }; switch (order_price_case) { +#if ALLOW_FIXED_PRICE_TRIGGER case OrderpriceOneofCase.Price: // should already be null, setting it here for clarity trigger_def.TriggerAction.Payup = null; trigger_def.TriggerAction.Price = fixed_price; break; +#else + default: goto case OrderpriceOneofCase.Payup; +#endif case OrderpriceOneofCase.Payup: trigger_def.TriggerAction.Price = double.NaN; trigger_def.TriggerAction.Payup = new TriggerPayupPrice { @@ -83,10 +88,13 @@ namespace mbts.spark { fixed_price = double.NaN; payup_ticks = pp.PayupTicks; payup_price_type = pp.PayupPriceType; - } else { + } +#if ALLOW_FIXED_PRICE_TRIGGER + else { order_price_case = OrderpriceOneofCase.Price; fixed_price = a.Price; } +#endif } } void validation_callback(T oldval, T newval) => validate(); diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index cbb666f21..75e384f81 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -461,114 +461,35 @@ /> - - - Trigger Action - + + + + + + + - - + + - - - - Price - - - - - - - - - - - - - - - - - - - Fixed - - - - - - - - - - - Payup - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Payup\less + + > + + + + + + From 388cf92a70aeee16d7a042c5dfc39dd3ea828aad Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 4 Mar 2019 13:27:44 -0600 Subject: [PATCH 100/218] SPARK-2079 [pr edit]remove #define ALLOW_FIXED_PRICE_TRIGGER --- .../Orders/OrderTypeVMs/TriggerOrderVM.cs | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs index 78031a9c9..69149dfd5 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs @@ -1,6 +1,4 @@ -//#define ALLOW_FIXED_PRICE_TRIGGER -using bts.api; -using bts.api.orderman; +using bts.api.orderman; using mbts.ui.utility; using mbts.utils; using System; @@ -54,15 +52,9 @@ namespace mbts.spark { TimeoutSeconds = (uint)(timeout_secs) }; switch (order_price_case) { -#if ALLOW_FIXED_PRICE_TRIGGER case OrderpriceOneofCase.Price: - // should already be null, setting it here for clarity - trigger_def.TriggerAction.Payup = null; - trigger_def.TriggerAction.Price = fixed_price; - break; -#else - default: goto case OrderpriceOneofCase.Payup; -#endif + // 'fixed price' is no longer supported (ca. 03/04/2019) + goto case OrderpriceOneofCase.Payup; case OrderpriceOneofCase.Payup: trigger_def.TriggerAction.Price = double.NaN; trigger_def.TriggerAction.Payup = new TriggerPayupPrice { @@ -89,12 +81,6 @@ namespace mbts.spark { payup_ticks = pp.PayupTicks; payup_price_type = pp.PayupPriceType; } -#if ALLOW_FIXED_PRICE_TRIGGER - else { - order_price_case = OrderpriceOneofCase.Price; - fixed_price = a.Price; - } -#endif } } void validation_callback(T oldval, T newval) => validate(); From 84877af9470fa52ab6ce798820ec65dc7eb7cd51 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 4 Mar 2019 13:44:50 -0600 Subject: [PATCH 101/218] SPARK-2079 [pr edit]child algo 'name' overlapped expander button --- .../view/Controls/Order/AlgoContentTemplateSelector.xaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index 75e384f81..154ab1e64 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -486,13 +486,18 @@ > - + + + + + + - + Trigger Exit From 1ee2193c88bcc27e44a87122f140b998eafac811 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 4 Mar 2019 23:52:22 -0600 Subject: [PATCH 102/218] ObservableAutoWrapper.connect_item_actions - invoke action for existing items --- .../core/Collections/ObservableAutoWrapper.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/client/spark/core/Collections/ObservableAutoWrapper.cs b/src/client/spark/core/Collections/ObservableAutoWrapper.cs index c77928d4d..cac71a96f 100644 --- a/src/client/spark/core/Collections/ObservableAutoWrapper.cs +++ b/src/client/spark/core/Collections/ObservableAutoWrapper.cs @@ -192,11 +192,17 @@ namespace mbts.ui.utility { } } - public static IDisposable connect_item_actions(IReadOnlyObservableCollection source, Action action) => - source.Subscribe((s, e) => CollectionHelper.process_new_items(source, action, e)); + public static IDisposable connect_item_actions(IReadOnlyObservableCollection source, Action action) { + foreach (T v in source) + action(v); + return source.Subscribe((s, e) => CollectionHelper.process_new_items(source, action, e)); + } - public static IDisposable connect_item_actions(ObservableCollection source, Action action) => - source.Subscribe((s, e) => CollectionHelper.process_new_items(source, action, e)); + public static IDisposable connect_item_actions(ObservableCollection source, Action action) { + foreach (T v in source) + action(v); + return source.Subscribe((s, e) => CollectionHelper.process_new_items(source, action, e)); + } public static IDisposable connect_item_hooks(IReadOnlyObservableCollection source, Func get_item_hook) { var item_hooks = source.Select(get_item_hook).ToList(); From 540db9131172eafbc789eb4737bf640ef93105ed Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Mar 2019 12:52:20 -0600 Subject: [PATCH 103/218] add config to enable\disable multi-threading for ISharedWindows --- .../Market/MarketView/MarketViewWindow.cs | 5 +-- .../Market/TimeAndSales/TimeAndSalesWindow.cs | 4 +-- .../Spreader/SyntheticManagementWindow.cs | 24 +++++++------ .../Trading/AlgoStudio/AlgoStudioWindow.cs | 6 ++-- .../Modules/Trading/Fills/FillsWindow.cs | 4 +-- .../Modules/Trading/LadderWindowFactory.cs | 2 +- .../Trading/OrderBook/OrderBookWindow.cs | 5 +-- .../spark/core/ShellInterface/IShellWindow.cs | 11 ++++-- .../Shell/ViewModels/ShellThreadFactory.cs | 4 +++ .../spark/view/Spark/PAndL/PAndLWindow.cs | 9 +++-- .../spark_core/utils/StringBuilderEx.cs | 34 +++++++++++++++++++ src/lib/config/protos/UI.proto | 11 ++++++ src/lib/config/protos/toggles.proto | 4 --- 13 files changed, 88 insertions(+), 35 deletions(-) create mode 100644 src/client/spark_core/utils/StringBuilderEx.cs diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 383d31a7c..417caa210 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -16,7 +16,7 @@ using System.Windows; namespace mbts.spark { class MarketViewWindow : SparkWindow, ISharedWindow { - const string _window_type = "MarketView", _thread_id = "MarketView", _window_type_display_name = "Market View"; + const string _window_type = "MarketView", _window_type_display_name = "Market View"; readonly OrdersModel _orders_model; readonly AllowOnce _init_guard = new AllowOnce("MarketView"); readonly IWindowSettingsManager _settings_manager; @@ -32,6 +32,7 @@ namespace mbts.spark { _state = state; _settings_manager = settings_manager; Icon.Freeze(); + thread_id = config.Configuration.get().market_view ? "MarketView" : null; } event Action _state_changed; @@ -47,7 +48,7 @@ namespace mbts.spark { + LAUNCHER_BUTTON_BORDER_WIDTH + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH; - public string thread_id => _thread_id; + public string thread_id { get; } public void thread_init() { _init_guard.check_access(); diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index db3d90230..ae2c75835 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -19,7 +19,7 @@ using static bts.shell.TimeAndSalesWindowFactory; using static mbts.ui.controls.DIYGrid; namespace mbts.spark { - class TimeAndSalesWindow : SparkWindow, ISlowWindow { + class TimeAndSalesWindow : SparkWindow, ISharedWindow { const string _window_type = "TimeAndSales", _window_type_display_name = "Time And Sales"; readonly MDConsumer _consumer; readonly TimeAndSalesWindowFactory _factory; @@ -48,7 +48,7 @@ namespace mbts.spark { + SPARK_MENU_COLLAPSED_WIDTH + LAUNCHER_BUTTON_BORDER_WIDTH + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH; - + public string thread_id { get; } public override StartupData SaveState => _state = _vm.value.create(); public override void Dispose() => diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index 211c93b91..7985d0f54 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -16,7 +16,7 @@ using System.Windows; using static bts.shell.SyntheticManagementWindowFactory; namespace mbts.spark { - class SyntheticManagementWindow : SparkWindow, ISlowWindow { + class SyntheticManagementWindow : SparkWindow, ISharedWindow { const string _window_type = "SyntheticManagement"; SingleValuePump _vm = new SingleValuePump(); StartupData _state; @@ -33,8 +33,20 @@ namespace mbts.spark { _state = state; _settings_manager = settings_manager; Icon.Freeze(); + thread_id = config.Configuration.get().synthetic_management ? "SyntheticManagement" : null; } + public override string window_type => _window_type; + public override UIElement Content => _view; + public override IEnumerable Commands => _commands; + public override StartupData SaveState => _state = _vm.value.create(); + public override double MinWidth => + StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width) + + SPARK_MENU_COLLAPSED_WIDTH + + LAUNCHER_BUTTON_BORDER_WIDTH + + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH; + public string thread_id { get; } + public void thread_init() { Log.notnull(_state); @@ -101,16 +113,6 @@ namespace mbts.spark { else _view.DataContext = _vm.value; } - public override string window_type => _window_type; - public override UIElement Content => _view; - public override IEnumerable Commands => _commands; - public override StartupData SaveState => _state = _vm.value.create(); - public override double MinWidth => - StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width) - + SPARK_MENU_COLLAPSED_WIDTH - + LAUNCHER_BUTTON_BORDER_WIDTH - + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH; - public override void Dispose() { Disposable.dispose(ref _vm); Commands.OfType().DisposeAll(); diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs index d3dd820fb..73ec53f5a 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs @@ -13,7 +13,7 @@ using System.Windows; using StartupData = bts.shell.AlgoStudioWindowFactory.StartupData; namespace mbts.spark { - internal class AlgoStudioWindow : SparkWindow, IShellWindow { + internal class AlgoStudioWindow : SparkWindow, ISharedWindow { public const string NAME = "Algo Studio", TemplatesEnabledKey = nameof(TemplatesEnabledKey), @@ -37,7 +37,7 @@ namespace mbts.spark { : base(NAME, bus, factory, SparkCommands.ShowAlgoStudio.icon) { _model = model; _state = state; - thread_init(); + thread_id = config.Configuration.get().algo_studio ? "AlgoStudio" : null; } public override StartupData SaveState => _state = _vm.create(); @@ -45,12 +45,12 @@ namespace mbts.spark { public override string window_type => NAME; public override UIElement Content => _view; public override IEnumerable Commands => _commands; - public string thread_id => NAME; public override double MinWidth => SPARK_MENU_COLLAPSED_WIDTH + LAUNCHER_BUTTON_BORDER_WIDTH + DEFAULT_CONTENT_WIDTH; public override double MinHeight => DEFAULT_CONTENT_HEIGHT; + public string thread_id { get; } bts.config.AlgoStudioOptions _ui_configuration => _model.algo_model.ui_configuration; diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs index a932cfbb3..a3a4781b2 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs @@ -18,7 +18,6 @@ using StartupData = bts.shell.FillsWindowFactory.StartupData; namespace mbts.spark { class FillsWindow : SparkWindow, ISharedWindow { public const string window_type_name = "Fills"; - const string _thread_id = "Fills"; readonly AllowOnce _init_guard = new AllowOnce("Fills"); readonly OrdersModel _orders_model; readonly IWindowSettingsManager _settings_manager; @@ -33,6 +32,7 @@ namespace mbts.spark { _orders_model = orders_model; _state = state; _settings_manager = settings_manager; + thread_id = config.Configuration.get().fills ? "Fills" : null; } event Action _state_changed; @@ -48,7 +48,7 @@ namespace mbts.spark { + LAUNCHER_BUTTON_BORDER_WIDTH + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH; - public string thread_id => _thread_id; + public string thread_id { get; } public void thread_init() { _init_guard.check_access(); diff --git a/src/client/spark/Modules/Trading/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/LadderWindowFactory.cs index 0cf81e9e1..33c8b36ec 100644 --- a/src/client/spark/Modules/Trading/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/LadderWindowFactory.cs @@ -33,7 +33,7 @@ namespace bts.shell { _settings_hub = settings_hub; _orders_model = orders_model; _md_auxiliary_model = md_auxiliary_model; - _ladder_conf = new LadderConfig(Configuration.get(), Configuration.get().enabled); + _ladder_conf = new LadderConfig(Configuration.get(), Configuration.get().ladder); _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), bus.subscribe(SparkTags.ShowLadderTag).OnDispatcher().Subscribe(s => show_windows(new[] { s })), diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index d0a878a08..e63127cbf 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -20,7 +20,7 @@ using OrderBookGridSettingsVM = mbts.spark.GridSettingsVM, ISharedWindow { - const string _window_type = "OrderBook", ORDERBOOK_THREAD_ID = "OrderBook", _default_title = "Order Book"; + const string _window_type = "OrderBook", _default_title = "Order Book"; readonly INotificationService _notification_service; readonly IWindowSettingsManager _settings_manager; OrderBookWindowFactory.OrderBookStartupData _state; @@ -49,6 +49,7 @@ namespace mbts.spark { _notification_service = notification_service; _state = state; _settings_manager = settings_manager; + thread_id = config.Configuration.get().order_book ? "OrderBook" : null; } public override OrderBookWindowFactory.OrderBookStartupData SaveState => _state = _vm?.create(); @@ -61,7 +62,7 @@ namespace mbts.spark { + SPARK_MENU_COLLAPSED_WIDTH + LAUNCHER_BUTTON_BORDER_WIDTH + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH; - public string thread_id => ORDERBOOK_THREAD_ID; + public string thread_id { get; } public override void Dispose() { _commands.OfType().DisposeAll(); diff --git a/src/client/spark/core/ShellInterface/IShellWindow.cs b/src/client/spark/core/ShellInterface/IShellWindow.cs index 919f5b533..f257dc731 100644 --- a/src/client/spark/core/ShellInterface/IShellWindow.cs +++ b/src/client/spark/core/ShellInterface/IShellWindow.cs @@ -1,4 +1,5 @@ -using mbts.ui.shell; +using bts.utils; +using mbts.ui.shell; using System; using System.Collections.Generic; using System.IO; @@ -98,8 +99,12 @@ namespace mbts.ui { } } - public static string diagnostic_name(this IShellWindow window) => - $"[{window.window_type}]{window.Title}"; + public static string diagnostic_name(this IShellWindow window) { + var sb = new StringBuilderEx { "[", window.window_type, "]", window.Title }; + if (window is ISharedWindow shared_win) + sb.Add("(thread: ", shared_win.thread_id, ")"); + return sb.ToString(); + } public static IObservable observe_title(this IShellWindow window) { var src = Observable.FromEvent(cb => () => cb(window.Title), cb => window.TitleChanged += cb, cb => window.TitleChanged -= cb); diff --git a/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs b/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs index ca9b19ec4..b28b21b41 100644 --- a/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs +++ b/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs @@ -89,6 +89,10 @@ namespace mbts.ui.shell } public Dispatcher get_dispatcher(ISharedWindow window) { + if (window.thread_id == null) { + window.thread_init(); + return Dispatcher.CurrentDispatcher; + } var uid = get(window.thread_id); return attach_window(uid, window); } diff --git a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs index ec1b37d34..e2aa7e95b 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs @@ -9,14 +9,12 @@ using mbts.ui.utility; using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Media; namespace mbts.spark { internal class PAndLWindow : SparkWindow, ISharedWindow { - const string _window_type = "PAndL", PNL_THREAD_ID = "PnL"; + const string _window_type = "PAndL"; readonly IWindowSettingsManager _settings_manager; PAndLWindowFactory.PAndLStartupData _startup_data; PAndLModel _model; @@ -31,6 +29,7 @@ namespace mbts.spark { _startup_data = startup_data; _settings_manager = settings_manager; Icon.Freeze(); + thread_id = config.Configuration.get().pnl ? "PnL" : null; } public override string window_type => _window_type; @@ -50,7 +49,7 @@ namespace mbts.spark { + LAUNCHER_BUTTON_BORDER_WIDTH + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH; - public string thread_id => PNL_THREAD_ID; + public string thread_id { get; } public void thread_init() { _vm = new PAndLVM(_bus, _model, _startup_data, _settings_manager); @@ -84,4 +83,4 @@ namespace mbts.spark { } -} +} \ No newline at end of file diff --git a/src/client/spark_core/utils/StringBuilderEx.cs b/src/client/spark_core/utils/StringBuilderEx.cs new file mode 100644 index 000000000..ccde333a1 --- /dev/null +++ b/src/client/spark_core/utils/StringBuilderEx.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Text; + +namespace bts.utils { + // The only reason this implements IEnumerable is for syntactical purposes, so it can be initialized like this: + // new StringBuilderEx { "A", "B", "C" }; + // Note: that cool initialization feature also depends on the fact that there is a method called 'Add' which accepts a string + class StringBuilderEx : IEnumerable { + readonly StringBuilder _sb; + + public StringBuilderEx() + : this(new StringBuilder()) { } + + StringBuilderEx(StringBuilder sb) => + _sb = sb; + + public void Add(string arg) => + _sb.Append(arg); + + public void Add(params string[] args) { + foreach (var a in args) + _sb.Append(a); + } + + public override string ToString() => _sb.ToString(); + + public static implicit operator StringBuilder(StringBuilderEx builder_ex) => builder_ex._sb; + public static implicit operator StringBuilderEx(StringBuilder builder) => new StringBuilderEx(builder); + + IEnumerator IEnumerable.GetEnumerator() { + yield break; + } + } +} \ No newline at end of file diff --git a/src/lib/config/protos/UI.proto b/src/lib/config/protos/UI.proto index cb228c2f3..8f6c9ff25 100644 --- a/src/lib/config/protos/UI.proto +++ b/src/lib/config/protos/UI.proto @@ -48,6 +48,17 @@ message ShellLimits { optional uint64 limit_group_memory_mb = 3; } +message MultiThreadedWindows { + optional bool market_view = 1 [default = true]; + optional bool time_and_sales = 2 [default = true]; + optional bool order_book = 3 [default = true]; + optional bool fills = 4 [default = true]; + optional bool pnl = 5 [default = true]; + optional bool algo_studio = 6 [default = true]; + optional bool ladder = 7 [default = true]; + optional bool synthetic_management = 8 [default = true]; +} + message LadderKnobs { // priorities (ordered): SystemIdle, ApplicationIdle, ContextIdle, Background, Input, Loaded, Render, DataBind, Normal, Send // It seems like all priorities higher than ApplicationIdle choke the main thread. diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index 5e1fbd736..db6a9eecf 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -8,10 +8,6 @@ syntax='proto2'; package bts.config.toggles; -message LaddersOnThreads { - optional bool enabled = 1 [default = true]; -} - message FilterOrdersWithDanglingSecurities { optional bool enabled = 1 [default = true]; } From 54eb6ceaa9cab893bdaa9dc3bd7945af19cc7e6b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Mar 2019 12:54:49 -0600 Subject: [PATCH 104/218] fix typeo in LazySubscription --- src/client/spark_api/utils/LazySubscription.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark_api/utils/LazySubscription.cs b/src/client/spark_api/utils/LazySubscription.cs index 7ba1791be..ed6b6b4af 100644 --- a/src/client/spark_api/utils/LazySubscription.cs +++ b/src/client/spark_api/utils/LazySubscription.cs @@ -14,7 +14,7 @@ namespace bts.api { lock (this) { if (!_is_disposed && !_is_subscribed) { _subscription = _subscribe(); - _subscription = null; + _subscribe = null; _is_subscribed = true; } } From 5ac8d2ada6baf74a7e0e098c9152c6de7b7b765a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Mar 2019 15:53:40 -0600 Subject: [PATCH 105/218] AlgoSelector - set selected_algo_changed hook in constructor (not 'load_from' method) --- src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 3dfaea3de..b398a5839 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -445,14 +445,15 @@ namespace mbts.spark { IReadOnlyDictionary _pending_data; AlgoKey? _pending_default; - public AlgoSelector() => + public AlgoSelector() { algos_view = ObservableAutoWrapper.create_sorted_wrapper(algos, AlgoCollectionHelper.algo_vm_comparer); + selected_algo_changed += (o, n) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(selected_algo))); + } public void load_algo_data(IReadOnlyDictionary algo_data, AlgoKey? default_algo) { _pending_data = algo_data; _pending_default = default_algo; _sync_formats(); - selected_algo_changed += (o, n) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(selected_algo))); } public event PropertyChange selected_algo_changed; From 32c9c23d7eb60fa3d6d82403d1fc86d42403a1f9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Mar 2019 20:12:00 -0600 Subject: [PATCH 106/218] fix typeo in MapAggregate() extension (actually use key_comparer arg) --- .../core/GlobalExtensions/GlobalExtensions.cs | 41 ++++++++----------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs index f6eb1b92e..83ad850a9 100644 --- a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs @@ -1,25 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Runtime.InteropServices; -using System.Collections.ObjectModel; -using System.Threading; -using System.Reactive.Linq; -using System.Collections; -using mbts.utils; -using System.Threading.Tasks; +using bts; using mbts; +using mbts.utils; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reactive.Linq; using System.Reactive.Subjects; +using System.Threading; +using System.Threading.Tasks; using System.Windows.Threading; -using System.Collections.Specialized; -using mbts.spark; -using bts.api; -using bts; -using bts.utils; -namespace mbts -{ +namespace mbts { public static class GlobalExtensions { #region AddRange @@ -105,8 +98,8 @@ namespace mbts return items.GroupBy(key_selector).ToDictionary(g => g.Key, g => g.AsEnumerable()); } - public static IDictionary MapAggregate(this IEnumerable items, Func key_selector, Func value_selector, V seed, Func aggregate, IEqualityComparer key_equality_comparer) { - return items.GroupBy(key_selector, key_equality_comparer).ToDictionary(g => g.Key, g => g.Select(value_selector).Aggregate(seed, aggregate)); + public static IDictionary MapAggregate(this IEnumerable items, Func key_selector, Func value_selector, V seed, Func aggregate, IEqualityComparer key_comparer) { + return items.GroupBy(key_selector, key_comparer).ToDictionary(g => g.Key, g => g.Select(value_selector).Aggregate(seed, aggregate), key_comparer); } public static int aggregate_hash(this IEnumerable series) where T : class { @@ -238,8 +231,7 @@ namespace mbts } } -namespace System.Collections.Specialized -{ +namespace System.Collections.Specialized { public static class NotifyCollectionChangedExtensions { public static IDisposable SuspendHandler(this INotifyCollectionChanged source, NotifyCollectionChangedEventHandler handler) { @@ -258,8 +250,7 @@ namespace System.Collections.Specialized } } -namespace System.Reactive.Linq -{ +namespace System.Reactive.Linq { public static class ObservableExtensions { /// @@ -397,4 +388,4 @@ namespace System.Reactive.Linq }; } } -} \ No newline at end of file +} From 00834a668c9d6c349ed9ede559f0f84f5013e9b2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Mar 2019 20:13:31 -0600 Subject: [PATCH 107/218] ObservableDistinctCollection - actually use equality comparer arg --- .../spark/core/Collections/ObservableDistinctCollection.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/core/Collections/ObservableDistinctCollection.cs b/src/client/spark/core/Collections/ObservableDistinctCollection.cs index 4acaf2ab6..3e6e54d51 100644 --- a/src/client/spark/core/Collections/ObservableDistinctCollection.cs +++ b/src/client/spark/core/Collections/ObservableDistinctCollection.cs @@ -27,7 +27,7 @@ namespace mbts.ui.utilities readonly IEqualityComparer _comparer; readonly TSourceCollection _source; readonly IList _target; - IDictionary _cache = new Dictionary(); + IDictionary _cache; IDisposable _sub; public DistinctCollectionResolver(TSourceCollection source, IList target, Func get_value) @@ -38,6 +38,7 @@ namespace mbts.ui.utilities _target = target; _get_value = get_value; _comparer = comparer; + _cache = new Dictionary(comparer); _sync(); _sub = _source.Subscribe(_source_CollectionChanged); } From 79cf313b5bdab69977ca3b1cb36af15e831485b0 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Mar 2019 20:16:30 -0600 Subject: [PATCH 108/218] SPARK-2014 Add OB support for full updates --- .../Trading/AlgoStudio/AlgoStudioView.xaml | 67 +------ .../Trading/AlgoStudio/AlgoStudioView.xaml.cs | 17 -- .../Trading/AlgoStudio/VM/AlgoDefinitionVM.cs | 89 +++++---- .../AlgoStudio/View/AlgoEditorView.xaml | 120 ++++++++++++ .../AlgoStudio/View/AlgoEditorView.xaml.cs | 28 +++ .../MiniOrderBook/MiniOrderBookView.xaml | 2 +- .../MiniOrderBook/MiniOrderBookView.xaml.cs | 2 +- .../Trading/OrderBook/OrderBookColumns.cs | 6 +- .../Trading/OrderBook/OrderBookRowVM.cs | 8 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 160 ++++++++++++--- .../Trading/OrderBook/OrderBookView.xaml | 168 ---------------- .../Trading/OrderBook/OrderBookWindow.cs | 15 +- .../OrderBook/OrderBookWindowFactory.cs | 14 +- .../OrderBook/View/OrderBookGridView.xaml | 139 +++++++++++++ .../OrderBookGridView.xaml.cs} | 12 +- .../Trading/OrderBook/View/OrderBookView.xaml | 71 +++++++ .../OrderBook/View/OrderBookView.xaml.cs | 10 + .../spark/Orders/OrderActivitySummarizer.cs | 37 ++-- .../Orders/OrderTypeVMs/DefaultAlgoVM.cs | 13 +- .../spark/Orders/OrderTypeVMs/IOrderTypeVM.cs | 1 - .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 25 +-- .../Orders/OrderTypeVMs/TriggerOrderVM.cs | 2 +- src/client/spark/Orders/OrdersModel.cs | 20 +- src/client/spark/Themes/generic.xaml | 22 ++- src/client/spark/core/Bus/SparkCommand.cs | 9 +- .../core/Collections/ObservableAutoWrapper.cs | 28 ++- .../Collections/ObservableFilterCollection.cs | 2 +- .../spark/core/Utility/CollectionHelper.cs | 10 +- src/client/spark/core/Utility/ProtoHelper.cs | 182 +++++++++--------- .../Controls/DialogSkirts/DialogSkirt.xaml | 6 +- .../Order/AlgoContentTemplateSelector.xaml | 1 + .../EnumConverters/EnumHasFlagConverter.cs | 45 +++++ .../spark/view/Spark/Ladder/LadderOrderVM.cs | 8 +- .../spark/view/Spark/SparkWindowView.xaml | 11 +- .../spark/view/Spark/SparkWindowView.xaml.cs | 11 ++ src/client/spark/view/Utility/EnumHelper.cs | 115 +++++++++++ .../Collections/Extensions/ListExtensions.cs | 33 ++++ .../spark_core/utils/StringBuilderEx.cs | 8 + 38 files changed, 1019 insertions(+), 498 deletions(-) create mode 100644 src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml create mode 100644 src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml.cs delete mode 100644 src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml create mode 100644 src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml rename src/client/spark/Modules/Trading/OrderBook/{OrderBookView.xaml.cs => View/OrderBookGridView.xaml.cs} (62%) create mode 100644 src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml create mode 100644 src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs create mode 100644 src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml index 71b29adff..6f4eb2c5e 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml +++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml @@ -19,8 +19,6 @@ - - 4 @@ -559,71 +557,14 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + AllowEditStructure + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index e63127cbf..df2056835 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -13,6 +13,7 @@ using System.Linq; using System.Reactive.Linq; using System.Windows; using System.Windows.Data; +using System.Windows.Input; using System.Windows.Media; //using IOrderBookWSM = mbts.persist.IWindowSettingsManager>; using OrderBookGridSettings = bts.shell.OrderBookWindowFactory.OrderBookGridSettings; @@ -37,6 +38,7 @@ namespace mbts.spark { , _cancel_all_orders_command , _cancel_selected_orders_command , _recreate_selected_orders_command + , _toggle_algo_editor_visible_cmd , _toggle_collapse_all_command , _toggle_expand_all_command , _show_grid_settings_command; @@ -113,6 +115,11 @@ namespace mbts.spark { can_execute: () => _vm.selected_orders.Any(x => _passes_recreate_search_criteria(x)) ); + _toggle_algo_editor_visible_cmd = + new SparkCommandCommand(get_toggle_algo_editor_cmd_title(), Icons.Tetris, _vm.toggle_algo_editor_is_visible_cmd, new KeyGesture(Key.M, ModifierKeys.Control | ModifierKeys.Alt)) { + show_in_toolbar = false + }; + _toggle_collapse_all_command = new SparkCommandCommand("Collapse All", Icons.RightArrow, _vm.collapse_all_rows_command); @@ -146,7 +153,7 @@ namespace mbts.spark { return dialog; })); - _commands = new SparkCommand[] { + _commands = new SparkCommand[] { _show_fills_command, _modify_order_command, _cancel_selected_orders_command, @@ -154,11 +161,17 @@ namespace mbts.spark { _cancel_sell_orders_command, _cancel_all_orders_command, _recreate_selected_orders_command, + _toggle_algo_editor_visible_cmd, _toggle_collapse_all_command, _toggle_expand_all_command, _show_grid_settings_command }; + _vm.as_demuxer().subscribe(nameof(OrderBookVM.algo_editor_is_visible)) + .Subscribe(_ => _toggle_algo_editor_visible_cmd.title = get_toggle_algo_editor_cmd_title()); _vm.selected_order_changed += _vm_selected_order_changed; + // local methods + string get_toggle_algo_editor_cmd_title() => + $"{(_vm.algo_editor_is_visible ? "Hide" : "Show")} Algo Editor"; } private bool _passes_recreate_search_criteria(OrderRecordImmutable record) { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index 5101a4149..9df7c2ee0 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -15,7 +15,7 @@ using System.Collections.Generic; using System.Reactive.Linq; using System.Threading.Tasks; using System.Windows; -using static mbts.spark.OrderBookView; +using Columns = mbts.spark.OrderBookGridView.ColumnKeys; namespace bts.shell { internal class OrderBookWindowFactory : ShellWindowFactory { @@ -56,6 +56,10 @@ namespace bts.shell { [ProtoMember(15)] [Obsolete] public GridSettings grid; + [ProtoMember(16)] + public bool algo_editor_is_visible { get; set; } + [ProtoMember(17)] + public double algo_editor_width { get; set; } [ProtoMember(20)] [Obsolete] List _predicate_animations; @@ -64,9 +68,11 @@ namespace bts.shell { public OrderBookStartupData() { } - public OrderBookStartupData(FilterStates filters, GridSettings grid = default, IEnumerable predicate_animations = null, bool use_defaults = false) { + public OrderBookStartupData(FilterStates filters, GridSettings grid = default, bool algo_editor_is_visible = false, double algo_editor_width = 0, IEnumerable predicate_animations = null, bool use_defaults = false) { this.filters = filters; this.use_defaults = use_defaults; + this.algo_editor_is_visible = algo_editor_is_visible; + this.algo_editor_width = algo_editor_width; #pragma warning disable CS0612 // Type or member is obsolete this.grid = grid; _predicate_animations = new List(); @@ -85,7 +91,7 @@ namespace bts.shell { new OrderBookStartupData( new FilterStates { statuses = new[] { OrderStatus.Working } - }, _default_general_grid, use_defaults: true); + }, _default_general_grid, false, 311.0, use_defaults: true); public static OrderBookGridSettings DefaultGrid => new OrderBookGridSettings(_default_general_grid); @@ -240,7 +246,7 @@ namespace bts.shell { List _predicate_animations; public OrderBookGridSettings() { } - public OrderBookGridSettings(GridSettings general = default, IEnumerable predicate_animations = null) { + public OrderBookGridSettings(GridSettings general = default, IEnumerable predicate_animations = null, double algo_editor_width = double.NaN) { this.general = general; _predicate_animations = new List(); if (predicate_animations != null) diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml new file mode 100644 index 000000000..2daefc39b --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs similarity index 62% rename from src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs rename to src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs index 8fb0a43c9..0c16ec118 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs @@ -1,11 +1,11 @@ using mbts.ui.controls; -using System.Windows.Controls; namespace mbts.spark { - internal partial class OrderBookView : UserControl { + internal partial class OrderBookGridView : DIYGrid { // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. - public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel, EditableQty, EditablePrice } + public enum ColumnKeys { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel, EditableQty, EditablePrice } + public const string SubTypeFilterTemplateKey = "SubTypeFilterTemplate", ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", @@ -14,13 +14,11 @@ namespace mbts.spark { CVRowStyleKey = "CVRowStyle", CVRowTemplateKey = "CVRowTemplateKey"; - public OrderBookView(OrderBookVM vm) { + public OrderBookGridView() => InitializeComponent(); - DataContext = vm; - } } - class OrderBookRowView : DIYGrid.HighPerformanceRow { + class OrderBookRowView : DIYGrid.HighPerformanceRow { public OrderBookRowView() : base() { } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml new file mode 100644 index 000000000..422495eee --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs new file mode 100644 index 000000000..1190e5077 --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs @@ -0,0 +1,10 @@ +using System.Windows.Controls; + +namespace mbts.spark { + internal partial class OrderBookView : UserControl { + public OrderBookView(OrderBookVM vm) { + InitializeComponent(); + DataContext = vm; + } + } +} \ No newline at end of file diff --git a/src/client/spark/Orders/OrderActivitySummarizer.cs b/src/client/spark/Orders/OrderActivitySummarizer.cs index 3bcb6de13..825eee902 100644 --- a/src/client/spark/Orders/OrderActivitySummarizer.cs +++ b/src/client/spark/Orders/OrderActivitySummarizer.cs @@ -2,6 +2,7 @@ using bts.api.core; using bts.api.orderman; using bts.shell; +using bts.utils; using mbts; using mbts.spark; using mbts.ui.controls; @@ -184,21 +185,31 @@ namespace bts.spark { format_cancel_error(order, security?.ContractSpec, error)); } - internal void update_order(OrderRecordImmutable order, double price, uint size) { + internal void update_order(OrderRecordImmutable order, double price, uint size, bool algo_changed) => + _log_order_update(order, price, size, algo_changed, "change from"); + + internal void update_order_failed(OrderRecordImmutable order, double price, uint size, bool algo_changed) => + _log_order_update(order, price, size, algo_changed, "failed to change from"); + + void _log_order_update(OrderRecordImmutable order, double price, uint size, bool algo_changed, string change_desc_prefix) { + if (price == order.price() && size == order.working_quantity() && !algo_changed) { + // nothing actually changed + return; + } + const string algo_change_text = "change algo parameters"; var security = try_get_security(order.Def.SecurityKey); var spec = security?.ContractSpec; - log_status(ActivityLogCategory.modify, - security, - $"({order.Key}) change from {order.State.Quantity}@{spec.format(order.State.Price)} to {size}@{spec.format(price)}"); + var desc_builder = new StringBuilderEx(); + if (price != order.price() || size != order.working_quantity()) { + desc_builder.Add(order.State.Quantity.ToString(), "@", spec.format(order.State.Price), "to ", size.ToString(), "@", spec.format(price)); + if (algo_changed) + desc_builder.Add("; ", algo_change_text); + } else if (algo_changed) { + desc_builder.Add(algo_change_text); + } + desc_builder.Insert(0, $"{change_desc_prefix} "); + desc_builder.Insert(0, $"({order.Key}) "); + log_status(ActivityLogCategory.modify, security, desc_builder.ToString()); } - - internal void update_order_failed(OrderRecordImmutable order, double price, uint size) { - var security = try_get_security(order.Def.SecurityKey); - var spec = security?.ContractSpec; - log_status(ActivityLogCategory.modify, - security, - $"({order.Key}) failed to change from {order.State.Quantity}@{spec.format(order.State.Price)} to {size}@{spec.format(price)}"); - } - } } diff --git a/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs b/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs index bf866b5fe..43192c19c 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs @@ -11,7 +11,7 @@ using AlgoDefi = bts.api.orderman.CustomOrderDefinitionImmutable; using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase; namespace mbts.spark { - class DefaultAlgoVM : DisposableViewModelBase, IAlgoVM, IDynamicAlgoVMImpl, IObserver, IObserver { + class DefaultAlgoVM : DisposableViewModelBase, IAlgoVM, IDynamicAlgoVMImpl, IObserver, IObserver, IObserver { static readonly AlgoDefi _empty = new AlgoDefi(new AlgoDef()); readonly VersionContainer _definition; AlgoFormats _format; @@ -48,10 +48,6 @@ namespace mbts.spark { public void assign_to(AlgoDef value) => value.MergeFrom(definition.CloneToMutable()); public bool key_match(KeyEventArgs e) => false; public void load_from(AlgoDefi value) => impl?.load_from(value); - public void set_permissions(AlgoEditingPermissions editing_permissions) { - _editing_permissions = editing_permissions; - impl?.set_permissions(editing_permissions); - } public Task load_from_async(AlgoDefi definition) => impl?.load_from_async(definition) ?? Task.FromResult(definition); @@ -98,6 +94,13 @@ namespace mbts.spark { _on_impl_definition_changed(); } + void IObserver.OnCompleted() { } + void IObserver.OnError(Exception error) { } + void IObserver.OnNext(AlgoEditingPermissions editing_permissions) { + _editing_permissions = editing_permissions; + (impl as IObserver)?.OnNext(editing_permissions); + } + void _on_impl_definition_changed() { var orig_def = definition; _definition.increment_version(); diff --git a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs index 09de7df42..3e7945b0c 100644 --- a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs @@ -32,7 +32,6 @@ namespace mbts.spark { CustomOrderDefinitionImmutable definition { get; } ObservableCollection child_algo_selectors { get; } bool key_match(KeyEventArgs e); - void set_permissions(AlgoEditingPermissions editing_permissions); Task load_from_async(CustomOrderDefinitionImmutable definition); } diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index b398a5839..4201ef8f4 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -106,7 +106,7 @@ namespace mbts.spark { } #region OrderTypeVM Base Classes - abstract class OrderTypeVMBase : DisposableViewModelBase, IAlgoVM, IObserver, IObserver where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage { + abstract class OrderTypeVMBase : DisposableViewModelBase, IAlgoVM, IObserver, IObserver, IObserver where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage { /// TODO: maybe use explicit delegates rather than rely on reflection . static readonly FieldDescriptor _descriptor = OrderTypeVMUtils.find_descriptor(); static readonly Func _create_immutable = OrderTypeVMUtils.immutable_factory(); @@ -148,10 +148,7 @@ namespace mbts.spark { CompositeDisposable def_sub = null; sd.selector.selected_algo_changed += subscribe_new_algo; return new CompositeDisposable( - ObservableAutoWrapper.connect_item_hooks(sd.selector.algos, a => { - a.set_permissions(this.editing_permissions); - return a as IDisposable ?? Disposable.empty; - }, true)) { + ObservableAutoWrapper.try_dispose_on_removed(sd.selector.algos, true)) { () => { sd.selector.selected_algo_changed -= subscribe_new_algo; Disposable.dispose(ref def_sub); @@ -206,12 +203,6 @@ namespace mbts.spark { } } - public void set_permissions(AlgoEditingPermissions editing_permissions) { - using (detect_property_changes(nameof(can_edit_values), nameof(can_edit_structure), nameof(can_save_values), nameof(can_save_structure))) - this.editing_permissions = editing_permissions; - on_permissions_changed(); - } - public bool key_match(KeyEventArgs key) => !string.IsNullOrEmpty(display_name) && key.Key == (Key.A + display_name[0] - 'A'); @@ -260,11 +251,6 @@ namespace mbts.spark { protected virtual Task on_load_from_async(AlgoDefi defi) => Task.CompletedTask; - protected virtual void on_permissions_changed() { - foreach (var vm in child_algo_selectors.SelectMany(s => s.algos.AsCollection())) - vm.set_permissions(editing_permissions); - } - protected void raise_definition_changed() => _def_change_notifier.execute(); @@ -408,6 +394,13 @@ namespace mbts.spark { } void IObserver.OnError(Exception error) { } void IObserver.OnCompleted() { } + // editing permissions + void IObserver.OnNext(AlgoEditingPermissions editing_permissions) { + using (detect_property_changes(nameof(can_edit_values), nameof(can_edit_structure), nameof(can_save_values), nameof(can_save_structure))) + this.editing_permissions = editing_permissions; + } + void IObserver.OnError(Exception error) { } + void IObserver.OnCompleted() { } IDisposable _selector_data_hooks; void _populate_selectors() { diff --git a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs index 69149dfd5..6ddf1cbf4 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs @@ -130,4 +130,4 @@ namespace mbts.spark { } } } -} \ No newline at end of file +} diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 1ef37c7f5..53352d6ac 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -166,18 +166,28 @@ namespace mbts.spark { return success; } - public async Task update_order(OrderRecordImmutable order, double price, uint size) { - if (order.working_quantity() <= 0) return false; - _activity.update_order(order, price, size); + public async Task update_order(OrderRecordImmutable order, double? new_price = null, uint? new_size = null, CustomOrderDefinitionImmutable? new_algo = null) { + if (order.working_quantity() <= 0) { + // order already filled to completion + return false; + } + var size = new_size ?? (uint)order.working_quantity(); + var price = new_price ?? order.price(); + if (size == order.working_quantity() && price == order.price() && !new_algo.HasValue) { + // no parameters would be changed by this update + return false; + } + _activity.update_order(order, price, size, new_algo.HasValue); var result = await _service.update_order_async(new Update() { OrderKey = order.Key, Price = price, - Quantity = size + Quantity = size, + Custom = (new_algo ?? order.Def.CustomDef).CloneToMutable() }); (var key, string msg) = _handle_error(result, "Failed to update order: {0}"); bool success = key.HasValue; if (!success) { - _activity.update_order_failed(order, price, size); + _activity.update_order_failed(order, price, size, new_algo.HasValue); } return success; } diff --git a/src/client/spark/Themes/generic.xaml b/src/client/spark/Themes/generic.xaml index 176648849..00ab7c809 100644 --- a/src/client/spark/Themes/generic.xaml +++ b/src/client/spark/Themes/generic.xaml @@ -1,7 +1,10 @@ - + @@ -516,9 +519,16 @@ + > + + + + + + + diff --git a/src/client/spark/core/Bus/SparkCommand.cs b/src/client/spark/core/Bus/SparkCommand.cs index c648f0fe1..db9bbf01d 100644 --- a/src/client/spark/core/Bus/SparkCommand.cs +++ b/src/client/spark/core/Bus/SparkCommand.cs @@ -2,6 +2,7 @@ using mbts; using mbts.ui; using System; +using System.ComponentModel; using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; @@ -11,13 +12,15 @@ using static mbts.spark.SparkTags; namespace bts.spark { public abstract class SparkCommand { + public readonly KeyGesture key_gesture; string _title; bool _show_in_toolbar, _show_in_context_menu; - public SparkCommand(string title, ImageSource icon, bool show_in_toolbar = true, bool show_in_context_menu = true) { + public SparkCommand(string title, ImageSource icon, bool show_in_toolbar = true, bool show_in_context_menu = true, KeyGesture key_gesture = null) { _title = title; this.icon = icon; _show_in_toolbar = show_in_toolbar; _show_in_context_menu = show_in_context_menu; + this.key_gesture = key_gesture; } public event Action title_changed, show_in_toolbar_changed, show_in_context_menu_changed; @@ -199,7 +202,8 @@ namespace bts.spark { public class SparkCommandCommand : SparkCommand { readonly ICommand _a; - public SparkCommandCommand(string title, ImageSource icon, ICommand a) : base(title, icon) { + public SparkCommandCommand(string title, ImageSource icon, ICommand a, KeyGesture key_gesture = null) + : base(title, icon, key_gesture: key_gesture) { _a = a; } @@ -314,6 +318,7 @@ namespace bts.spark { } public string title => _cmd.title; + public KeyGesture key_gesture => _cmd.key_gesture; public ImageSource icon => _cmd.icon; public bool show_in_toolbar => _cmd.show_in_toolbar; public bool show_in_context_menu => _cmd.show_in_context_menu; diff --git a/src/client/spark/core/Collections/ObservableAutoWrapper.cs b/src/client/spark/core/Collections/ObservableAutoWrapper.cs index cac71a96f..2a0bb93b5 100644 --- a/src/client/spark/core/Collections/ObservableAutoWrapper.cs +++ b/src/client/spark/core/Collections/ObservableAutoWrapper.cs @@ -192,16 +192,16 @@ namespace mbts.ui.utility { } } - public static IDisposable connect_item_actions(IReadOnlyObservableCollection source, Action action) { - foreach (T v in source) - action(v); - return source.Subscribe((s, e) => CollectionHelper.process_new_items(source, action, e)); - } + public static IDisposable connect_item_actions(IReadOnlyObservableCollection source, Action action) => + connect_item_actions(source, source, action); - public static IDisposable connect_item_actions(ObservableCollection source, Action action) { - foreach (T v in source) + public static IDisposable connect_item_actions(ObservableCollection source, Action action) => + connect_item_actions(source, source, action); + + public static IDisposable connect_item_actions(INotifyCollectionChanged notifier, IEnumerable collection, Action action) { + foreach (T v in collection) action(v); - return source.Subscribe((s, e) => CollectionHelper.process_new_items(source, action, e)); + return notifier.Subscribe((s, e) => CollectionHelper.process_new_items(collection, action, e)); } public static IDisposable connect_item_hooks(IReadOnlyObservableCollection source, Func get_item_hook) { @@ -218,6 +218,18 @@ namespace mbts.ui.utility { source.Subscribe((s, e) => CollectionHelper.reflect_change(item_hooks, source, get_item_hook, d => d.Dispose(), e))); } + public static IDisposable dispose_on_removed(IReadOnlyObservableCollection source) where T : IDisposable => + connect_item_hooks(source, v => v); + + public static IDisposable dispose_on_removed(ObservableCollection source, bool clear_source_on_dispose) where T : IDisposable => + connect_item_hooks(source, v => v, clear_source_on_dispose); + + public static IDisposable try_dispose_on_removed(IReadOnlyObservableCollection source) => + connect_item_hooks(source, v => v as IDisposable ?? Disposable.empty); + + public static IDisposable try_dispose_on_removed(ObservableCollection source, bool clear_source_on_dispose = false) => + connect_item_hooks(source, v => v as IDisposable ?? Disposable.empty, clear_source_on_dispose); + class SortedWrapper : IReadOnlyObservableCollection { const int _min_capacity = 4; readonly IComparer _comparer; diff --git a/src/client/spark/core/Collections/ObservableFilterCollection.cs b/src/client/spark/core/Collections/ObservableFilterCollection.cs index 2a11ad842..9f6760db1 100644 --- a/src/client/spark/core/Collections/ObservableFilterCollection.cs +++ b/src/client/spark/core/Collections/ObservableFilterCollection.cs @@ -213,4 +213,4 @@ namespace mbts.ui.utility { return i; } } -} \ No newline at end of file +} diff --git a/src/client/spark/core/Utility/CollectionHelper.cs b/src/client/spark/core/Utility/CollectionHelper.cs index 65d7252bf..9778c41d0 100644 --- a/src/client/spark/core/Utility/CollectionHelper.cs +++ b/src/client/spark/core/Utility/CollectionHelper.cs @@ -136,13 +136,5 @@ namespace mbts.utils { rv[i] = selector(source[i]); return rv; } - - public static IDisposable dispose_on_removed(ObservableCollection collection) => - collection.Subscribe((s, e) => { - if (e.OldItems != null) { - foreach (T item in e.OldItems) - (item as IDisposable)?.Dispose(); - } - }); } -} \ No newline at end of file +} diff --git a/src/client/spark/core/Utility/ProtoHelper.cs b/src/client/spark/core/Utility/ProtoHelper.cs index 987c6d041..e17195717 100644 --- a/src/client/spark/core/Utility/ProtoHelper.cs +++ b/src/client/spark/core/Utility/ProtoHelper.cs @@ -1,91 +1,91 @@ -using mbts; -using Google.Protobuf; -using Google.Protobuf.Reflection; -using mbts.ui.utility; -using System; -using System.Collections.Generic; -using System.Linq; -using mbts.utils; - -namespace bts.utils { - static class ProtoHelper { - const string - _case_suffix = "Case", - _oneof_case_suffix = "OneofCase"; - - public static MessageDescriptor Descriptor() where T : IMessage, new() => - _DescriptorImpl.value; - - public static OneofDescriptor get_oneof_descriptor(string prop_name) where T : IMessage, new() { - prop_name = prop_name.iremove_suffix(_case_suffix); - return Descriptor().Oneofs.FirstOrDefault(d => d.Name.iequals(prop_name)); - } - - public static IReadOnlyDictionary get_oneof_descriptor_index(string prop_name) - where T : IMessage, new() - where TOneofCase : struct => - _DescriptorImpl.OneofImpl.get_descriptor_case_index(prop_name); - - public static FieldDescriptor get_oneof_field_descriptor(TOneofCase oneof_case) where T : IMessage, new() where TOneofCase : struct { - string oneof_name = oneof_case.ToString(); - return Descriptor().Fields.InFieldNumberOrder().FirstOrDefault(fd => fd.Name.Replace("_", "").iequals(oneof_name)); - } - - public static Type get_field_type(FieldDescriptor field_descriptor) { - switch (field_descriptor.FieldType) { - case FieldType.Bool: return typeof(bool); - case FieldType.Bytes: return typeof(ByteString); - case FieldType.Double: return typeof(double); - case FieldType.Float: return typeof(float); - case FieldType.UInt32: return typeof(uint); - case FieldType.UInt64: return typeof(ulong); - // int - case FieldType.SFixed32: - case FieldType.Fixed32: - case FieldType.SInt32: - case FieldType.Int32: return typeof(int); - // long - case FieldType.SFixed64: - case FieldType.Fixed64: - case FieldType.SInt64: - case FieldType.Int64: return typeof(long); - // - case FieldType.String: return typeof(string); - case FieldType.Enum: return field_descriptor.EnumType.ClrType; - case FieldType.Message: return field_descriptor.MessageType.ClrType; - default: throw ExceptionBuilder.Argument.unexpected_case(field_descriptor.FieldType, nameof(field_descriptor)); - } - } - - public static IReadOnlyDictionary get_oneof_descriptor_index(OneofDescriptor descriptor) where TOneofCase : struct => - descriptor.Fields.ToDictionary(fd => EnumHelper.parse(fd.Name.Replace("_", ""))); - - static class _DescriptorImpl where T : IMessage, new() { - public static readonly MessageDescriptor value = new T().Descriptor; - - public static class OneofImpl where TOneofCase : struct { - static Dictionary> _descriptor_case_indices = - new Dictionary>(); - - public static IReadOnlyDictionary get_descriptor_case_index(string prop_name) { - /// Use local copy because is updated atomically. - var dci = _descriptor_case_indices; - if (!dci.TryGetValue(prop_name, out IReadOnlyDictionary rv)) { - /// Update atomically (lock-free). - /// 1) clone the local copy. - /// 2) add the new KeyValue to the clone. - /// 3) assign the clone back to . - rv = get_oneof_descriptor_index(get_oneof_descriptor(prop_name)) - .ToDictionary(kv => kv.Key, kv => (kv.Value, get_field_type(kv.Value))); - dci = dci.ToDictionary(); - dci.Add(prop_name, rv); - /// It is possible for add ops to be overwritten. - /// This is perfectly safe, just means that the 'clone-add-assign' will be repeated the next time a caller requests this key. - _descriptor_case_indices = dci; - } - return rv; - } - } - } - } -} \ No newline at end of file +using mbts; +using Google.Protobuf; +using Google.Protobuf.Reflection; +using mbts.ui.utility; +using System; +using System.Collections.Generic; +using System.Linq; +using mbts.utils; + +namespace bts.utils { + static class ProtoHelper { + const string + _case_suffix = "Case", + _oneof_case_suffix = "OneofCase"; + + public static MessageDescriptor Descriptor() where T : IMessage, new() => + _DescriptorImpl.value; + + public static OneofDescriptor get_oneof_descriptor(string prop_name) where T : IMessage, new() { + prop_name = prop_name.iremove_suffix(_case_suffix); + return Descriptor().Oneofs.FirstOrDefault(d => d.Name.iequals(prop_name)); + } + + public static IReadOnlyDictionary get_oneof_descriptor_index(string prop_name) + where T : IMessage, new() + where TOneofCase : struct => + _DescriptorImpl.OneofImpl.get_descriptor_case_index(prop_name); + + public static FieldDescriptor get_oneof_field_descriptor(TOneofCase oneof_case) where T : IMessage, new() where TOneofCase : struct { + string oneof_name = oneof_case.ToString(); + return Descriptor().Fields.InFieldNumberOrder().FirstOrDefault(fd => fd.Name.Replace("_", "").iequals(oneof_name)); + } + + public static Type get_field_type(FieldDescriptor field_descriptor) { + switch (field_descriptor.FieldType) { + case FieldType.Bool: return typeof(bool); + case FieldType.Bytes: return typeof(ByteString); + case FieldType.Double: return typeof(double); + case FieldType.Float: return typeof(float); + case FieldType.UInt32: return typeof(uint); + case FieldType.UInt64: return typeof(ulong); + // int + case FieldType.SFixed32: + case FieldType.Fixed32: + case FieldType.SInt32: + case FieldType.Int32: return typeof(int); + // long + case FieldType.SFixed64: + case FieldType.Fixed64: + case FieldType.SInt64: + case FieldType.Int64: return typeof(long); + // + case FieldType.String: return typeof(string); + case FieldType.Enum: return field_descriptor.EnumType.ClrType; + case FieldType.Message: return field_descriptor.MessageType.ClrType; + default: throw ExceptionBuilder.Argument.unexpected_case(field_descriptor.FieldType, nameof(field_descriptor)); + } + } + + public static IReadOnlyDictionary get_oneof_descriptor_index(OneofDescriptor descriptor) where TOneofCase : struct => + descriptor.Fields.ToDictionary(fd => EnumHelper.parse(fd.Name.Replace("_", ""))); + + static class _DescriptorImpl where T : IMessage, new() { + public static readonly MessageDescriptor value = new T().Descriptor; + + public static class OneofImpl where TOneofCase : struct { + static Dictionary> _descriptor_case_indices = + new Dictionary>(); + + public static IReadOnlyDictionary get_descriptor_case_index(string prop_name) { + /// Use local copy because is updated atomically. + var dci = _descriptor_case_indices; + if (!dci.TryGetValue(prop_name, out IReadOnlyDictionary rv)) { + /// Update atomically (lock-free). + /// 1) clone the local copy. + /// 2) add the new KeyValue to the clone. + /// 3) assign the clone back to . + rv = get_oneof_descriptor_index(get_oneof_descriptor(prop_name)) + .ToDictionary(kv => kv.Key, kv => (kv.Value, get_field_type(kv.Value))); + dci = dci.ToDictionary(); + dci.Add(prop_name, rv); + /// It is possible for add ops to be overwritten. + /// This is perfectly safe, just means that the 'clone-add-assign' will be repeated the next time a caller requests this key. + _descriptor_case_indices = dci; + } + return rv; + } + } + } + } +} diff --git a/src/client/spark/view/Controls/DialogSkirts/DialogSkirt.xaml b/src/client/spark/view/Controls/DialogSkirts/DialogSkirt.xaml index b0bf03dbb..7ac621fdf 100644 --- a/src/client/spark/view/Controls/DialogSkirts/DialogSkirt.xaml +++ b/src/client/spark/view/Controls/DialogSkirts/DialogSkirt.xaml @@ -3,10 +3,14 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" + xmlns:sys="clr-namespace:System;assembly=mscorlib" > + 12 + 12 + diff --git a/src/client/spark/view/Spark/SparkWindowView.xaml.cs b/src/client/spark/view/Spark/SparkWindowView.xaml.cs index 164fc5897..e696b6e43 100644 --- a/src/client/spark/view/Spark/SparkWindowView.xaml.cs +++ b/src/client/spark/view/Spark/SparkWindowView.xaml.cs @@ -1,15 +1,22 @@ using bts.api; using bts.spark; using mbts.ui.controls; +using mbts.ui.converters; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Globalization; using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Data; +using System.Windows.Input; namespace bts.view { public partial class SparkWindowView : UserControl { + public static readonly IMultiValueConverter HeaderConverter = + ValueConverter.create((title, key_gesture) => + key_gesture == null ? title : $"{title} ({key_gesture.GetDisplayStringForCulture(CultureInfo.CurrentCulture)})"); + SparkMenu _menu; public SparkWindowView(IBus bus, IEnumerable commands, UIElement content) { InitializeComponent(); @@ -26,6 +33,10 @@ namespace bts.view { _menu.BorderThickness = new Thickness(0, 0, 0, 0); _menu.ShowText = false; _grid.Children.Add(_menu); + foreach (var cmd in commands) { + if (cmd.key_gesture != null) + InputBindings.Add(new KeyBinding(cmd.ICommand(bus), cmd.key_gesture)); + } if (ContextMenu != null) { // ObservableCollection to avoid WPF Binding Leak var context_menu_items_view = new ListCollectionView(new ObservableCollection(commands.Select(c => new SparkCommandVM(c, bus)))) { diff --git a/src/client/spark/view/Utility/EnumHelper.cs b/src/client/spark/view/Utility/EnumHelper.cs index b545c6395..c6742aadb 100644 --- a/src/client/spark/view/Utility/EnumHelper.cs +++ b/src/client/spark/view/Utility/EnumHelper.cs @@ -41,6 +41,18 @@ namespace mbts.ui.utility { return Activator.CreateInstance(enum_type); } + public static T try_convert(object value) { + var numeric_type = Enum.GetUnderlyingType(typeof(T)); + var numeric_value = Convert.ChangeType(value, numeric_type); + return (T)Convert.ChangeType(numeric_value, typeof(T)); + } + + public static Func get_has_flags_delegate(Type enum_type) => + EnumDescriptorStore.descriptor(enum_type).has_flags; + + public static bool has_flags(object value, object flags) where T : struct => + EnumDescriptorStore.descriptor.has_flags(value, flags); + public static string get_display_name(object enum_obj, TextCapitalizationFormat capitalization_format = TextCapitalizationFormat.Default) { string str = enum_obj.ToString(); MemberInfo[] mi = enum_obj.GetType().GetMember(str); @@ -75,5 +87,108 @@ namespace mbts.ui.utility { yield return e; } } + + struct EnumDescriptor { + public readonly Func has_flags; + + public EnumDescriptor(Func has_flags) => + this.has_flags = has_flags; + } + + static class EnumDescriptorStore { + [ThreadStatic] + static readonly Dictionary _type_index = new Dictionary(); + + public static EnumDescriptor descriptor(Type enum_type) => + _type_index.GetOrAdd(enum_type, t => (EnumDescriptor) + typeof(EnumDescriptorStore<>).MakeGenericType(enum_type) + .GetField(nameof(EnumDescriptorStore.descriptor), BindingFlags.Static | BindingFlags.Public) + .GetValue(null)); + } + + static class EnumDescriptorStore { + public static readonly EnumDescriptor descriptor; + + static EnumDescriptorStore() { + Func has_flags; + if (!typeof(T).IsEnum) { + // N/A + has_flags = Impl.as_none_has_flags; + } + var numeric_type = Enum.GetUnderlyingType(typeof(T)); + if (numeric_type == typeof(byte)) { + // byte + has_flags = Impl.as_byte_has_flags; + } else if (numeric_type == typeof(short)) { + // short + has_flags = Impl.as_int16_has_flags; + } else if (numeric_type == typeof(int)) { + // int + has_flags = Impl.as_int32_has_flags; + } else if (numeric_type == typeof(long)) { + // long + has_flags = Impl.as_int64_has_flags; + } else if (numeric_type == typeof(ushort)) { + // ushort + has_flags = Impl.as_uint16_has_flags; + } else if (numeric_type == typeof(uint)) { + // uint + has_flags = Impl.as_uint32_has_flags; + } else if (numeric_type == typeof(ulong)) { + // ulong + has_flags = Impl.as_uint64_has_flags; + } else { + // ? + has_flags = Impl.as_none_has_flags; + } + descriptor = new EnumDescriptor(has_flags); + } + + static class Impl { + public static bool as_none_has_flags(object value, object flags) => false; + // byte + public static bool as_byte_has_flags(object value, object flags) { + byte value_as_byte = (byte)Convert.ChangeType(value, typeof(byte)); + byte flags_as_byte = (byte)Convert.ChangeType(flags, typeof(byte)); + return (value_as_byte & flags_as_byte) == flags_as_byte; + } + // short + public static bool as_int16_has_flags(object value, object flags) { + short value_as_short = (short)Convert.ChangeType(value, typeof(short)); + short flags_as_short = (short)Convert.ChangeType(flags, typeof(short)); + return (value_as_short & flags_as_short) == flags_as_short; + } + // int + public static bool as_int32_has_flags(object value, object flags) { + int value_as_byte = (int)Convert.ChangeType(value, typeof(int)); + int flags_as_byte = (int)Convert.ChangeType(flags, typeof(int)); + return (value_as_byte & flags_as_byte) == flags_as_byte; + } + // long + public static bool as_int64_has_flags(object value, object flags) { + long value_as_long = (long)Convert.ChangeType(value, typeof(long)); + long flags_as_long = (long)Convert.ChangeType(flags, typeof(long)); + return (value_as_long & flags_as_long) == flags_as_long; + } + // ushort + public static bool as_uint16_has_flags(object value, object flags) { + ushort value_as_ushort = (ushort)Convert.ChangeType(value, typeof(ushort)); + ushort flags_as_ushort = (ushort)Convert.ChangeType(flags, typeof(ushort)); + return (value_as_ushort & flags_as_ushort) == flags_as_ushort; + } + // uint + public static bool as_uint32_has_flags(object value, object flags) { + uint value_as_uint = (uint)Convert.ChangeType(value, typeof(uint)); + uint flags_as_uint = (uint)Convert.ChangeType(flags, typeof(uint)); + return (value_as_uint & flags_as_uint) == flags_as_uint; + } + // ulong + public static bool as_uint64_has_flags(object value, object flags) { + ulong value_as_ulong = (ulong)Convert.ChangeType(value, typeof(ulong)); + ulong flags_as_ulong = (ulong)Convert.ChangeType(flags, typeof(ulong)); + return (value_as_ulong & flags_as_ulong) == flags_as_ulong; + } + } + } } } \ No newline at end of file diff --git a/src/client/spark_core/Collections/Extensions/ListExtensions.cs b/src/client/spark_core/Collections/Extensions/ListExtensions.cs index 54a3aa42c..63a7ad767 100644 --- a/src/client/spark_core/Collections/Extensions/ListExtensions.cs +++ b/src/client/spark_core/Collections/Extensions/ListExtensions.cs @@ -19,6 +19,9 @@ namespace bts.collections { } } + public static IList WrapValue(T value) => + new ValueListWrapper(value); + public static IList WrapType(this IList list) => new TypeWrapper(list); @@ -62,6 +65,36 @@ namespace bts.collections { return -1; } + // unlike new T[] { value }, this struct prohibits changing the value at index 0. + struct ValueListWrapper : IList { + readonly T _value; + + public ValueListWrapper(T value) => + _value = value; + + public T this[int index] { + get => index == 0 ? _value : throw new IndexOutOfRangeException(); + set => throw new NotSupportedException(); + } + public int Count => 1; + public bool IsReadOnly => true; + + void ICollection.Add(T item) => throw new NotSupportedException(); + void ICollection.Clear() => throw new NotSupportedException(); + public bool Contains(T item) => _value.Equals(item); + public void CopyTo(T[] array, int arrayIndex) => array[arrayIndex] = _value; + public IEnumerator GetEnumerator() { + yield return _value; + } + public int IndexOf(T item) => _value.Equals(item) ? 0 : -1; + void IList.Insert(int index, T item) => throw new NotSupportedException(); + bool ICollection.Remove(T item) => throw new NotSupportedException(); + void IList.RemoveAt(int index) => throw new NotSupportedException(); + IEnumerator IEnumerable.GetEnumerator() { + yield return _value; + } + } + class TypeWrapper : IList, IReadOnlyList { readonly IList _source; diff --git a/src/client/spark_core/utils/StringBuilderEx.cs b/src/client/spark_core/utils/StringBuilderEx.cs index ccde333a1..9bc0a9e36 100644 --- a/src/client/spark_core/utils/StringBuilderEx.cs +++ b/src/client/spark_core/utils/StringBuilderEx.cs @@ -22,6 +22,14 @@ namespace bts.utils { _sb.Append(a); } + public void Insert(int index, string arg) => + _sb.Insert(index, arg); + + public void Insert(int index, params string[] args) { + for (int i = args.Length - 1; i >= 0; i--) + _sb.Insert(index, args[i]); + } + public override string ToString() => _sb.ToString(); public static implicit operator StringBuilder(StringBuilderEx builder_ex) => builder_ex._sb; From fc1adf8c282d530814121caff87877aa119758bb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Mar 2019 20:31:24 -0600 Subject: [PATCH 109/218] OrderBookWindow - include 'show/hide algo editor command' in toolbar (not just context menu) --- .../spark/Modules/Trading/OrderBook/OrderBookWindow.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index df2056835..3321ee41a 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -115,10 +115,11 @@ namespace mbts.spark { can_execute: () => _vm.selected_orders.Any(x => _passes_recreate_search_criteria(x)) ); - _toggle_algo_editor_visible_cmd = - new SparkCommandCommand(get_toggle_algo_editor_cmd_title(), Icons.Tetris, _vm.toggle_algo_editor_is_visible_cmd, new KeyGesture(Key.M, ModifierKeys.Control | ModifierKeys.Alt)) { - show_in_toolbar = false - }; + _toggle_algo_editor_visible_cmd = new SparkCommandCommand( + get_toggle_algo_editor_cmd_title(), + Icons.Tetris, + _vm.toggle_algo_editor_is_visible_cmd, + new KeyGesture(Key.M, ModifierKeys.Control | ModifierKeys.Alt)); _toggle_collapse_all_command = new SparkCommandCommand("Collapse All", Icons.RightArrow, From 3ab7ed0b71b5fb65c3924b5d8c226faf3e9a7986 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 5 Mar 2019 23:10:42 -0600 Subject: [PATCH 110/218] AlgoEditorView - remove ugly ToString() text when Limit, Market etc., are selected --- .../spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml index 405690b4d..7903b06ea 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml @@ -93,7 +93,7 @@ - AllowEditStructure + AllowEditStructure @@ -111,6 +111,7 @@ Content="{Binding algo_root}" ContentTemplateSelector="{StaticResource AlgoTemplateSelector}" Margin="{StaticResource Margin.TP1}" + Visibility="{Binding algo_root.can_expand, Converter={StaticResource BooleanToVisibilityConverter}}" > + + diff --git a/src/client/spark/view/Colors.xaml b/src/client/spark/view/Colors.xaml index 6b727caa7..ee2b6f18c 100644 --- a/src/client/spark/view/Colors.xaml +++ b/src/client/spark/view/Colors.xaml @@ -4,8 +4,11 @@ xmlns:mbts="clr-namespace:mbts.ui" xmlns:ui="clr-namespace:mbts.ui" > + + #B3B3B3 #FF999999 + From cc0f6ea448f1d0f4611c923cba9ba2f0355400b4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 6 Mar 2019 12:46:05 -0600 Subject: [PATCH 113/218] OrderBook Algo Panel - show inactive order algos, but disable controls --- .../Trading/AlgoStudio/VM/AlgoDefinitionVM.cs | 50 ++++++++-------- .../Modules/Trading/OrderBook/OrderBookVM.cs | 60 +++++++++++-------- .../GenericCollectionExtensions.cs | 22 +++++++ src/client/spark/view/Utility/EnumHelper.cs | 54 ++++++++++++++++- .../spark/view/Utility/PropertyUpdateGate.cs | 11 ++-- 5 files changed, 143 insertions(+), 54 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index 005a2ab5c..8b3fc0d53 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -46,9 +46,8 @@ namespace mbts.spark { readonly DeferrableActionWrapper _refresh_on_local_changes; readonly ReactiveThresholdMonitor _any_templates_dirty_monitor = new ReactiveThresholdMonitor(t => t.observe_is_dirty()); readonly Property _selected_format; - /// should always be a subset of . - readonly Property _editing_permissions; - AlgoEditingPermissions _raw_editing_permissions; + readonly EnumMaskInt32 _permissions_mask = new EnumMaskInt32(); + int? _favorite_index; Brush _badge_fill; Snapshot? _committed; @@ -66,28 +65,25 @@ namespace mbts.spark { public static AlgoDefinitionVM create_placeholder(OrdersModel model, CustomOrderDefinitionImmutable def, string name, AlgoFormats init_format) => new AlgoDefinitionVM(model, new AlgoData(def, name, new AlgoKey(Guid.NewGuid())), init_format, (AlgoEditingPermissions)int.MaxValue); - AlgoDefinitionVM(OrdersModel model, AlgoData def_data, AlgoFormats init_format, AlgoEditingPermissions raw_editing_permissions) { + AlgoDefinitionVM(OrdersModel model, AlgoData def_data, AlgoFormats init_format, AlgoEditingPermissions init_permissions) { // init core data _model = model; - _raw_editing_permissions = raw_editing_permissions; - var algo_vms_permissions_hook = new DisposableContainer(); - var resources = new CompositeDisposable { algo_vms_permissions_hook }; + _permissions_mask.mask = init_permissions; + _permissions_mask.raw = init_permissions; + var resources = new CompositeDisposable(); if (!model.algo_model.ui_configuration.can_modify_definition_values) - raw_editing_permissions ^= (AlgoEditingPermissions.AllowEditValues | AlgoEditingPermissions.AllowSaveValues); + editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditValues | AlgoEditingPermissions.AllowSaveValues); if (!model.algo_model.ui_configuration.can_modify_definition_structure) - raw_editing_permissions ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure); + editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure); else if (model.algo_model.templates_enabled()) { resources.Add(_templates.Subscribe((s, e) => { - var new_permissions = editing_permissions; if (_templates.Count == 0) { - new_permissions |= AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure; + editing_permissions_mask |= AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure; } else { - new_permissions ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure); + editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure); } - _editing_permissions.set(new_permissions); })); } - _editing_permissions = backing(nameof(editing_permissions), raw_editing_permissions); key = def_data.key; algos_view = ObservableAutoWrapper.create_sorted_wrapper(_algo_roots, AlgoCollectionHelper.algo_vm_comparer); _template_update_buffer = new TableUpdateBuffer(t => t.key); @@ -170,16 +166,20 @@ namespace mbts.spark { _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Inactive); break; } - if ((_raw_editing_permissions & AlgoEditingPermissions.AllowEditStructure) != 0) { - resources.Add(_selected_format.observe_current(true).SubscribeHookLatest(f => { - using (_refresh_on_local_changes.defer_execution()) { - var algo_data = model.factory.default_algos(f); - var default_algo = new AlgoKey(OrderDataHelper.get_default_algo(f)); - return this.load_algo_data_recursive(algo_data, default_algo); + var permission_src = _permissions_mask.observe_result(); + resources.Add(_selected_format.observe_current(true).CombineLatest(permission_src, (fmt, perms) => (fmt, perms)) + .SubscribeHookLatest(t => { + if ((t.perms & AlgoEditingPermissions.AllowEditStructure) != 0) { + using (_refresh_on_local_changes.defer_execution()) { + var algo_data = model.factory.default_algos(t.fmt); + var default_algo = new AlgoKey(OrderDataHelper.get_default_algo(t.fmt)); + return this.load_algo_data_recursive(algo_data, default_algo); + } } + return Disposable.empty; })); - } - resources.Add(this.connect_data(_editing_permissions.observe_current(true))); + resources.Add(permission_src.Subscribe(_ => RaisePropertyChanged(nameof(editing_permissions)))); + resources.Add(this.connect_data(permission_src)); resources.Add(this.connect_data(Observable.Return(model))); _dispose = resources; await algo_root.load_from_async(def_data.value); @@ -242,10 +242,12 @@ namespace mbts.spark { // format public AlgoFormats selected_format { get => _selected_format.Value; set => _selected_format.set(value); } public ObservableCollection formats { get; } = new ObservableCollection { AlgoFormats.Exchange, AlgoFormats.Spreader, AlgoFormats.Exchange | AlgoFormats.Spreader }; - public AlgoEditingPermissions editing_permissions => _editing_permissions.Value; // visual states public ObservableCollection edit_pane_visual_states => _edit_pane_vs_model.states; public ObservableCollection tree_view_visual_states => _tree_view_vs_model.states; + // editing permissions + public AlgoEditingPermissions editing_permissions_mask { get => _permissions_mask.mask; set => _permissions_mask.mask = value; } + public AlgoEditingPermissions editing_permissions => _permissions_mask.result; #region IAlgoSelector event PropertyChange IAlgoSelector.selected_algo_changed { add => algo_root_changed += value; remove => algo_root_changed -= value; } @@ -338,7 +340,7 @@ namespace mbts.spark { // pass a copy of the persisted state - rather than use local values - because if something goes wrong, it is better to be in sync with data fresh from the server/api. public AlgoDefinitionVM to_persisted(AlgoData def) => - new AlgoDefinitionVM(_model, def, selected_format, _raw_editing_permissions); + new AlgoDefinitionVM(_model, def, selected_format, editing_permissions_mask); public AlgoData create_algo_def() => new AlgoData(algo_root.definition, name, key); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index fe19c45d1..8940abf91 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -61,11 +61,12 @@ namespace mbts.spark { _columns.filter_changed += on_filter_changed; collapse_all_rows_command = new DelegateCommand(_row_collection.collapse_all); expand_all_rows_command = new DelegateCommand(_row_collection.expand_all); - var modify_selected_algos_async_cmd = new AsyncCommand(_modify_selected_algos_async, () => algo_vm.algo_root != null); + var modify_selected_algos_async_cmd = new AsyncCommand(_modify_selected_algos_async, () => _selected_algo_mon.all_active); modify_selected_algos_command = modify_selected_algos_async_cmd; toggle_algo_editor_is_visible_cmd = new DelegateCommand(() => this.algo_editor_is_visible = !this.algo_editor_is_visible); grid_settings_manager = _create_grid_settings_manager(owner_title, bus, notification_service, model, rows, core_columns); - _selected_algo_mon.common_selected_algo_changed += on_common_selected_algo_changed; + _selected_algo_mon.common_algo_changed += on_common_selected_algo_changed; + _selected_algo_mon.all_active_changed += on_all_selected_orders_active_changed; concat_disposable( model.on_order_tuples.OnDispatcher().Subscribe(_row_collection.update), grid_settings_manager, @@ -73,6 +74,8 @@ namespace mbts.spark { Disposable.Create(() => { _columns.filter_changed -= on_filter_changed; _row_collection.CollectionChanged -= _row_collection_CollectionChanged; + _selected_algo_mon.common_algo_changed -= on_common_selected_algo_changed; + _selected_algo_mon.all_active_changed -= on_all_selected_orders_active_changed; Disposable.dispose(_row_collection); }), _columns); @@ -86,10 +89,10 @@ namespace mbts.spark { } else { algo_vm.algo_root = null; } - if (oldval.HasValue != newval.HasValue) { - modify_selected_algos_async_cmd.RaiseCanExecuteChanged(); - RaisePropertyChanged(nameof(show_algo_vm)); - } + } + void on_all_selected_orders_active_changed(bool all_active) { + algo_vm.editing_permissions_mask = all_active ? AlgoEditingPermissions.AllowEditValues : AlgoEditingPermissions.None; + modify_selected_algos_async_cmd.RaiseCanExecuteChanged(); } } @@ -116,7 +119,6 @@ namespace mbts.spark { } } public OrderRecordImmutable? current_order => current_row?.order; - public bool show_algo_vm => algo_vm.algo_root != null; public AlgoDefinitionVM algo_vm { get; } public ObservableCollection selected_rows { get; } = new ObservableCollection(); public IEnumerable selected_orders => selected_rows.Select(r => r.order); @@ -322,18 +324,20 @@ namespace mbts.spark { /// /// Monitors selected rows, and determines whether or not they are all active-orders, with a common algo structure. - /// When all selected rows satisfy this condition, will be non-null, and its value may be used to populate algo-editor panel on the right side of the window. + /// When all selected rows satisfy this condition, will be non-null, and its value may be used to populate algo-editor panel on the right side of the window. /// In terms of user-interaction, this means the user may edit the algo params for multiple orders at once if they are all active and share a common algo structure. /// class SelectedAlgosMonitor { - readonly SetMap - _active_algos = new SetMap(), - _inactive_algos = new SetMap(); + readonly SetMap _algo_structure_index = new SetMap(); + int _inactive_order_count; - public event PropertyChange common_selected_algo_changed; + public event PropertyChange common_algo_changed; + public event Action all_active_changed; - public CustomOrderDefinitionImmutable? common_selected_algo => - _active_algos.Count == 1 && _inactive_algos.Count == 0 ? _active_algos.First().First().Def.CustomDef : (CustomOrderDefinitionImmutable?)null; + public CustomOrderDefinitionImmutable? common_algo => + _algo_structure_index.Count == 1 ? _algo_structure_index.First().First().Def.CustomDef : (CustomOrderDefinitionImmutable?)null; + + public bool all_active => _inactive_order_count == 0 && _algo_structure_index.Count > 0; public void on_row_selected(OrderBookRowVM row) { _select_algo(row.order_tuple); @@ -346,11 +350,14 @@ namespace mbts.spark { } public IDisposable update() { - var old_algo = common_selected_algo; + var old_algo = common_algo; + bool old_all_active = all_active; return Disposable.Create(() => { - var new_algo = common_selected_algo; + var new_algo = common_algo; if (!EqualityComparer.nullable_equals(old_algo, new_algo, OrderDataHelper.EqualsHelpers.equals)) - common_selected_algo_changed?.Invoke(old_algo, new_algo); + common_algo_changed?.Invoke(old_algo, new_algo); + if (old_all_active != all_active) + all_active_changed(!old_all_active); }); } @@ -361,14 +368,17 @@ namespace mbts.spark { } } - void _select_algo(OrderSecurityAlgoMeta osam) => - _get_target_set(osam).add(new AlgoStructureKey(osam.order.Def.CustomDef), osam.order); + void _select_algo(OrderSecurityAlgoMeta osam) { + _algo_structure_index.add(new AlgoStructureKey(osam.order.Def.CustomDef), osam.order); + if (!osam.order.is_active()) + _inactive_order_count++; + } - void _unselect_algo(OrderSecurityAlgoMeta osam) => - _get_target_set(osam).remove(new AlgoStructureKey(osam.order.Def.CustomDef), osam.order); - - SetMap _get_target_set(OrderSecurityAlgoMeta osam) => - osam.order.is_active() ? _active_algos : _inactive_algos; + void _unselect_algo(OrderSecurityAlgoMeta osam) { + _algo_structure_index.remove(new AlgoStructureKey(osam.order.Def.CustomDef), osam.order); + if (!osam.order.is_active()) + _inactive_order_count--; + } } } -} +} \ No newline at end of file diff --git a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs index f74496007..2c95352d4 100644 --- a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs @@ -86,6 +86,28 @@ namespace System.Collections.Generic { return false; } + public static bool TryGetSingle(this IEnumerable source, out T result) { + if (source == null) throw new ArgumentNullException(nameof(source)); + using (var en = source.GetEnumerator()) { + if (en.MoveNext()) { + result = en.Current; + if (!en.MoveNext()) + return true; + } + } + result = default; + return false; + } + + public static bool TryGetSingle(this IEnumerable source, Func predicate, Func convert, out TResult result) { + if (TryGetSingle(source.Where(predicate), out T v)) { + result = convert(v); + return true; + } + result = default; + return false; + } + public static T FirstOrDefault(this IEnumerable source, Func predicate, T default_rv) { if (source == null) throw new ArgumentNullException(nameof(source)); foreach (T element in source) diff --git a/src/client/spark/view/Utility/EnumHelper.cs b/src/client/spark/view/Utility/EnumHelper.cs index c6742aadb..5147aaa7d 100644 --- a/src/client/spark/view/Utility/EnumHelper.cs +++ b/src/client/spark/view/Utility/EnumHelper.cs @@ -5,6 +5,7 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using System.Reactive.Linq; using System.Reflection; namespace mbts.ui.utility { @@ -88,6 +89,15 @@ namespace mbts.ui.utility { } } + public static IObservable observe_result(this EnumMaskInt32 mask) where T : struct => + Observable.Create(o => { + mask.result_changed += notify; + o.OnNext(mask.result); + return Disposable.Create(() => mask.result_changed -= notify); + void notify(int result) => + o.OnNext(mask.result); + }); + struct EnumDescriptor { public readonly Func has_flags; @@ -191,4 +201,46 @@ namespace mbts.ui.utility { } } } -} \ No newline at end of file + + class MaskInt32 { + int _mask = int.MaxValue, _raw; + + public event Action result_changed; + + public int mask { + get => _mask; + set { + using (_update()) + _mask = value; + } + } + public int raw { + get => _raw; + set { + using (_update()) + _raw = value; + } + } + public int result => _raw & _mask; + + IDisposable _update() { + int old_result = result; + return Disposable.Create(() => { + if (result != old_result) + result_changed?.Invoke(result); + }); + } + } + + sealed class EnumMaskInt32 : MaskInt32 where T : struct { + public new T mask { + get => (T)(object)base.mask; + set => base.mask = (int)(object)value; + } + public new T raw { + get => (T)(object)base.raw; + set => base.raw = (int)(object)value; + } + public new T result => (T)(object)base.result; + } +} diff --git a/src/client/spark/view/Utility/PropertyUpdateGate.cs b/src/client/spark/view/Utility/PropertyUpdateGate.cs index 100267764..318c68493 100644 --- a/src/client/spark/view/Utility/PropertyUpdateGate.cs +++ b/src/client/spark/view/Utility/PropertyUpdateGate.cs @@ -2,12 +2,15 @@ namespace mbts.ui.utility { class PropertyUpdateGate { + readonly string _reentrancy_error_msg; + + public PropertyUpdateGate(string reentrancy_error_msg = "Already updating property.") => + _reentrancy_error_msg = reentrancy_error_msg; + public bool is_updating { get; private set; } - public IDisposable update() { - if (is_updating) throw new InvalidOperationException("Already updating property."); - return _update(); - } + public IDisposable update() => + is_updating ? throw new InvalidOperationException(_reentrancy_error_msg) : _update(); public bool try_update(Action update) { if (!is_updating) { From 23f76a1c80d166a6d675345bdf93e4e835be971a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 6 Mar 2019 12:47:50 -0600 Subject: [PATCH 114/218] remove some redundant\unused code --- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 4 ++-- .../EnumConverters/EnumHasFlagConverter.cs | 18 +----------------- src/client/spark/view/Utility/EnumHelper.cs | 13 +++---------- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 4201ef8f4..953a943f2 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -180,8 +180,8 @@ namespace mbts.spark { public ObservableCollection child_algo_selectors => _child_algo_selectors; // editing permissions public AlgoEditingPermissions editing_permissions { get; private set; } - public bool can_edit_values => EnumHelper.includes_flag(editing_permissions, AlgoEditingPermissions.AllowEditValues); - public bool can_edit_structure => EnumHelper.includes_flag(editing_permissions, AlgoEditingPermissions.AllowEditStructure); + public bool can_edit_values => EnumHelper.has_flags(editing_permissions, AlgoEditingPermissions.AllowEditValues); + public bool can_edit_structure => EnumHelper.has_flags(editing_permissions, AlgoEditingPermissions.AllowEditStructure); public bool can_save_values => _can_save_values.Value; public bool can_save_structure => _can_save_structure.Value; // misc diff --git a/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs b/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs index 4f54bd32f..e547fad19 100644 --- a/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs +++ b/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs @@ -3,13 +3,12 @@ using System; using System.Collections; using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Windows.Data; namespace mbts.ui.converters { class EnumFlagsToBooleanConverter : IValueConverter { - //Func _convert_del_backing; Func _convert_del; + public IList Flags { get; } = new List(); public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { @@ -27,19 +26,4 @@ namespace mbts.ui.converters { } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException(); } - - class EnumFlagsToBooleanConverter : IValueConverter where TEnum : struct { - public IList Flags { get; } = new List(); - - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => - Flags.All(f => EnumHelper.has_flags(value, f)); - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException(); - - static string _convert(object value, string separator) => - _convert(ConvertUtils.try_convert(value), separator); - - static bool _convert(int enum_int, IList flags) => - flags.All(f => (enum_int & f) == f); - } } \ No newline at end of file diff --git a/src/client/spark/view/Utility/EnumHelper.cs b/src/client/spark/view/Utility/EnumHelper.cs index 5147aaa7d..71af68b02 100644 --- a/src/client/spark/view/Utility/EnumHelper.cs +++ b/src/client/spark/view/Utility/EnumHelper.cs @@ -51,8 +51,8 @@ namespace mbts.ui.utility { public static Func get_has_flags_delegate(Type enum_type) => EnumDescriptorStore.descriptor(enum_type).has_flags; - public static bool has_flags(object value, object flags) where T : struct => - EnumDescriptorStore.descriptor.has_flags(value, flags); + public static bool has_flags(TEnum value, TEnum flags) => + EnumDescriptorStore.descriptor.has_flags(value, flags); public static string get_display_name(object enum_obj, TextCapitalizationFormat capitalization_format = TextCapitalizationFormat.Default) { string str = enum_obj.ToString(); @@ -71,13 +71,6 @@ namespace mbts.ui.utility { return mi.Length > 0 ? mi[0].GetCustomAttribute() : null; } - public static bool includes_flag(TEnum flags, TEnum value) { - if (!typeof(TEnum).IsEnum) throw new InvalidOperationException("Type is not an Enum."); - long lflags = Convert.ToInt64(flags); - long lvalue = Convert.ToInt64(value); - return (lflags & lvalue) == lvalue; - } - // though it isn't hard to write "flags & TEnum.Foo != 0," split_flags offers a less error-prone alternative in terms of typeos. // (less likely that code calling this method will have a typeo, than code checking flags in the traditional manner described above) public static IEnumerable split_flags(TEnum flags) where TEnum : struct { @@ -243,4 +236,4 @@ namespace mbts.ui.utility { } public new T result => (T)(object)base.result; } -} +} \ No newline at end of file From f83f94fb07cd60fb615be4a623f6bc7572c21175 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 6 Mar 2019 12:55:28 -0600 Subject: [PATCH 115/218] rename [class]EnumFlagsToBooleanConverter -> EnumHasFlagsConverter (matches filename) --- .../Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml | 8 ++++---- .../Converters/EnumConverters/EnumHasFlagConverter.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml index 7903b06ea..dc49d7e35 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml @@ -91,11 +91,11 @@ - - + + AllowEditStructure - - + + diff --git a/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs b/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs index e547fad19..0d15faa6b 100644 --- a/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs +++ b/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs @@ -6,7 +6,7 @@ using System.Globalization; using System.Windows.Data; namespace mbts.ui.converters { - class EnumFlagsToBooleanConverter : IValueConverter { + class EnumHasFlagsConverter : IValueConverter { Func _convert_del; public IList Flags { get; } = new List(); From b7c127b2d825dfcbe3ee470aa3e3052d87792def Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 6 Mar 2019 12:59:16 -0600 Subject: [PATCH 116/218] EnumHasFlagsConverter - ContentProperty = 'Flags' --- .../spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml | 4 +--- .../view/Converters/EnumConverters/EnumHasFlagConverter.cs | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml index dc49d7e35..2e5d378cb 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml @@ -92,9 +92,7 @@ - - AllowEditStructure - + AllowEditStructure diff --git a/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs b/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs index 0d15faa6b..f760b362d 100644 --- a/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs +++ b/src/client/spark/view/Converters/EnumConverters/EnumHasFlagConverter.cs @@ -4,8 +4,10 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Windows.Data; +using System.Windows.Markup; namespace mbts.ui.converters { + [ContentProperty(nameof(Flags))] class EnumHasFlagsConverter : IValueConverter { Func _convert_del; From 18a32f9a05c3d4d8b18e907c0798b7cbc1dca333 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 6 Mar 2019 14:41:26 -0500 Subject: [PATCH 117/218] White space. --- src/lib/orderman/orders/IcebergOrder2.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index 345cdaa9f..f268bc112 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -76,7 +76,7 @@ void IcebergOrder2::on_init_new(OrderDefinition const &def, *ice.mutable_child() = dice.order_params().at("child").as_order_def(); } - LOG(OrderMan, Info,"on_init_new: {}", utils::pb::to_string(me->def)); + LOG(OrderMan, Info, "on_init_new: {}", utils::pb::to_string(me->def)); // Initialize mutable iceberg component of our state report me->order_state.mutable_iceberg(); @@ -188,7 +188,7 @@ OrderOpResult IcebergOrder2::on_activate_attach() { if (should_forward_attachment(me->def.custom_def())) { // We are fowarding the attachment to our new child - + // The first order we launch is going to handle the attachment // while subsquent childen (if any) will not. So we do not use // our OrderBuilder, which is primed for spawning subsquent @@ -226,8 +226,7 @@ OrderOpResult IcebergOrder2::on_activate_attach() { on_attach_complete(result, child_order, child_def, child_state); }); - LOG(OrderMan, Info, - "Iceberg order {} attempting to attach to {} ", + LOG(OrderMan, Info, "Iceberg order {} attempting to attach to {} ", key().value(), attach_target); transition(InternalStatus::PENDING_ATTACH); } @@ -322,8 +321,12 @@ orderman::OrderOpResult orderman::IcebergOrder2::on_cancel() { orderman::OrderOpResult orderman::IcebergOrder2::on_detach() { switch (me->internal_status) { - case InternalStatus::PAUSED: case InternalStatus::PENDING_ATTACH: + return report_and_return( + ORDER_ERROR_INVALID_OP, + "Order cannot be detached while waiting for attach to complete"); + + case InternalStatus::PAUSED: terminate(ORDER_STATUS_CANCELED); return report_and_return(); From e3a3eb6d85de1e7435113caa5e3f1b2488cd033b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 6 Mar 2019 14:41:57 -0500 Subject: [PATCH 118/218] Redirected Iceberg factory to create Iceberg2. --- src/lib/orderman/order_factory/OrderFactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index ad9f2b0b3..623d9dd46 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -10,7 +10,7 @@ // order types #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/orders/DynamicOrder.h" -#include "lib/orderman/orders/IcebergOrder.h" +#include "lib/orderman/orders/IcebergOrder2.h" #include "lib/orderman/orders/NativeOrder.h" #include "lib/orderman/orders/TimeBoxOrder.h" #include "lib/orderman/orders/TriggerOrder.h" @@ -147,7 +147,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, order_ptr.reset(new NativeOrder()); break; case CustomOrderDefinition::kIceberg: - order_ptr.reset(new IcebergOrder()); + order_ptr.reset(new IcebergOrder2 ()); break; case CustomOrderDefinition::kSpreader: order_ptr.reset(new orderman::SpreaderOrder()); From c1d62a2ff6d45fb053ba3f072390f9cb0972b4d8 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 7 Mar 2019 13:27:05 -0500 Subject: [PATCH 119/218] Fixed OrderManager reentrancy problem reported by Taha --- src/lib/orderman/actors/order_manager/OrderManager.cpp | 8 ++++---- src/lib/orderman/actors/order_manager/OrderServices.h | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 4a8ed4482..58bcaf451 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -201,7 +201,7 @@ void OrderManager::on_activate_order( order->init_order_services(me->services_data); auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); - order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); + order->_services->activate(ev.price, ev.quantity, ev.trace); } } @@ -211,7 +211,7 @@ void OrderManager::on_update_order(const mercury::Update &m) { auto k = ev.key(); auto it = me->orders.find(k); if (it != me->orders.end()) - it->second->on_update(ev.price, ev.quantity, ev.trace); + it->second->_services->update(ev.price, ev.quantity, ev.trace); else { LOG(OrderMan, Error, "Received an update request for an unknown order {}. " @@ -227,7 +227,7 @@ void OrderManager::on_cancel_order(const mercury::Update &m) { auto k = ev.key(); auto it = me->orders.find(k); if (it != me->orders.end()) - it->second->on_cancel(ev.trace); + it->second->_services->cancel(ev.trace); else { LOG(OrderMan, Error, "Received a cancel request for an unknown order {}. " @@ -243,7 +243,7 @@ void OrderManager::on_crack_order(const mercury::Update &m) { auto k = ev.key(); auto it = me->orders.find(k); if (it != me->orders.end()) - it->second->on_crack(ev.trace); + it->second->_services->crack(ev.trace); else { LOG(OrderMan, Error, "Received a crack request for an unknown order {}. " diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index f910cbda1..b86396787 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -280,7 +280,8 @@ class OrderServices { private: friend class OrderBuilder; - + friend class OrderManager; + template void on_external_event(EV const &ev, C const &c) { bts_assert(!_busy); @@ -340,6 +341,11 @@ class OrderServices { o.warm_up_activate(*_data,*this); } + void activate(Price p, Quantity q, trace::CorID const &trace) { + on_inter_order_call([p, q, trace](OrderServices &self) { + self._owner->on_activate(p, q, self,trace); + }); + } void update(Price p, Quantity q, trace::CorID const &trace) { on_inter_order_call([p, q, trace](OrderServices &self) { self._owner->on_update(p, q, trace); From 69fcfbd6cecbf9f55a624340edf8f611199442d7 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 7 Mar 2019 14:28:49 -0500 Subject: [PATCH 120/218] Removed over-zealous assertion. --- src/lib/orderman/actors/order_manager/OrderBuilder.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 32183bf42..ff3050ba9 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -88,7 +88,6 @@ public: private: void move_here(OrderBuilder &src) { - bts_assert(!_order_services); _order_services = src._order_services; _parent_key = src._parent_key; _definition = src._definition; From 6826494898f3dd8ea7f6da781dfc2c8b75432540 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 7 Mar 2019 13:34:46 -0600 Subject: [PATCH 121/218] EnumHelper - don't initialize 'ThreadStatic' fields --- src/client/spark/view/Utility/EnumHelper.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Utility/EnumHelper.cs b/src/client/spark/view/Utility/EnumHelper.cs index 71af68b02..6a1641359 100644 --- a/src/client/spark/view/Utility/EnumHelper.cs +++ b/src/client/spark/view/Utility/EnumHelper.cs @@ -100,7 +100,10 @@ namespace mbts.ui.utility { static class EnumDescriptorStore { [ThreadStatic] - static readonly Dictionary _type_index = new Dictionary(); + static Dictionary _type_index_backing; + + static Dictionary _type_index => + _type_index_backing ?? (_type_index_backing = new Dictionary()); public static EnumDescriptor descriptor(Type enum_type) => _type_index.GetOrAdd(enum_type, t => (EnumDescriptor) From 362f75c8b20bdb397b32db811f20aefad03030e8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 6 Mar 2019 18:06:06 -0600 Subject: [PATCH 122/218] OrderBookVM - null check an event, fix initial algo editing permissions --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 8940abf91..e81d938f1 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -50,6 +50,7 @@ namespace mbts.spark { _bus = bus; _model = model; algo_vm = AlgoDefinitionVM.create(model, new AlgoData(new CustomOrderDefinitionImmutable(new CustomOrderDefinition { Limit = new LimitOrderDefinition() })), editing_permissions: AlgoEditingPermissions.AllowEditValues); + algo_vm.editing_permissions_mask = AlgoEditingPermissions.None; algo_vm.algo_root = null; _settings_manager = settings_manager; _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(x => (x.added.Values, x.removed.Values))); @@ -357,7 +358,7 @@ namespace mbts.spark { if (!EqualityComparer.nullable_equals(old_algo, new_algo, OrderDataHelper.EqualsHelpers.equals)) common_algo_changed?.Invoke(old_algo, new_algo); if (old_all_active != all_active) - all_active_changed(!old_all_active); + all_active_changed?.Invoke(!old_all_active); }); } From 8f8aae57debf84b16ad646e42083e8171c44441c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 6 Mar 2019 18:10:38 -0600 Subject: [PATCH 123/218] remove IAlgoVM.can_edit_blah props; view binds to permission flags w EnumHasFlagsConverter; view uses VisualStates --- .../Orders/OrderTypeVMs/DefaultAlgoVM.cs | 7 +- .../spark/Orders/OrderTypeVMs/IOrderTypeVM.cs | 5 +- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 24 +- .../Order/AlgoContentTemplateSelector.xaml | 523 ++++++++++++++++-- .../Order/AlgoContentTemplateSelector.xaml.cs | 16 +- .../Controls/Order/AlgoPickerNodeView.xaml | 11 +- src/client/spark/view/Utility/StateManager.cs | 70 ++- 7 files changed, 560 insertions(+), 96 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs b/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs index 43192c19c..06964ff9c 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DefaultAlgoVM.cs @@ -37,10 +37,7 @@ namespace mbts.spark { impl.is_expanded = value; } } - public bool can_edit_values => impl?.can_edit_values ?? false; - public bool can_edit_structure => impl?.can_edit_structure ?? false; - public bool can_save_values => impl?.can_save_values ?? false; - public bool can_save_structure => impl?.can_save_structure ?? false; + public AlgoEditingPermissions editing_permissions => _editing_permissions; public string display_name => impl?.display_name ?? "(Default)"; public AlgoDefi definition => _definition.value; public ObservableCollection child_algo_selectors { get; } = new ObservableCollection(); @@ -97,7 +94,7 @@ namespace mbts.spark { void IObserver.OnCompleted() { } void IObserver.OnError(Exception error) { } void IObserver.OnNext(AlgoEditingPermissions editing_permissions) { - _editing_permissions = editing_permissions; + Set(ref _editing_permissions, editing_permissions, nameof(this.editing_permissions)); (impl as IObserver)?.OnNext(editing_permissions); } diff --git a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs index 3e7945b0c..093b629f2 100644 --- a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs @@ -22,12 +22,9 @@ namespace mbts.spark { CustomOrderDefinition.CustomOneofCase order_type { get; } bool is_bts_type { get; } OrderMetadata meta { get; } + AlgoEditingPermissions editing_permissions { get; } bool can_expand { get; } bool is_expanded { get; set; } - bool can_edit_values { get; } - bool can_edit_structure { get; } - bool can_save_values { get; } - bool can_save_structure { get; } string display_name { get; } CustomOrderDefinitionImmutable definition { get; } ObservableCollection child_algo_selectors { get; } diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 953a943f2..5d9fa092a 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -116,17 +116,16 @@ namespace mbts.spark { readonly ObservableKeyedCollection<(string name, Action assign, Action load), string> _auto_props = new ObservableKeyedCollection<(string name, Action assign, Action load), string>(t => t.name); readonly ObservableKeyedCollection _child_algo_selector_data = new ObservableKeyedCollection(sd => sd.prop_name); readonly ObservableAutoWrapper _child_algo_selectors; - readonly Property _is_expanded, _can_save_values, _can_save_structure; + readonly Property _is_expanded; readonly DeferrableActionWrapper _def_change_notifier; + AlgoEditingPermissions _editing_permissions; IDisposable _pending_load; protected OrderTypeVMBase(AlgoKey id, string display_name, AlgoEditingPermissions editing_permissions) { this.id = id; this.display_name = display_name; - this.editing_permissions = editing_permissions; + _editing_permissions = editing_permissions; _child_algo_selectors = new ObservableAutoWrapper(_child_algo_selector_data, sd => sd.selector); - _can_save_values = backing(nameof(can_save_values), true); - _can_save_structure = backing(nameof(can_save_structure), true); _is_expanded = backing(nameof(is_expanded)); meta = OrderDataHelper.get_metadata(order_type); _def_change_notifier = new DeferrableActionWrapper(() => definition_changed?.Invoke()); @@ -134,10 +133,6 @@ namespace mbts.spark { switch (e.PropertyName) { // ignore props that don't affect the resultant AlgoDef case nameof(is_expanded): - case nameof(can_edit_values): - case nameof(can_edit_structure): - case nameof(can_save_values): - case nameof(can_save_structure): return; default: _def_change_notifier.execute(); @@ -179,12 +174,8 @@ namespace mbts.spark { public dynamic children_vm => _children_vm; public ObservableCollection child_algo_selectors => _child_algo_selectors; // editing permissions - public AlgoEditingPermissions editing_permissions { get; private set; } - public bool can_edit_values => EnumHelper.has_flags(editing_permissions, AlgoEditingPermissions.AllowEditValues); - public bool can_edit_structure => EnumHelper.has_flags(editing_permissions, AlgoEditingPermissions.AllowEditStructure); - public bool can_save_values => _can_save_values.Value; - public bool can_save_structure => _can_save_structure.Value; - // misc + public AlgoEditingPermissions editing_permissions { get => _editing_permissions; private set => Set(ref _editing_permissions, value); } + // expand public virtual bool can_expand => !meta.NoProps; public virtual bool is_expanded { get => _is_expanded.Value; set => _is_expanded.Value = value; } // protected (observed props) @@ -395,10 +386,7 @@ namespace mbts.spark { void IObserver.OnError(Exception error) { } void IObserver.OnCompleted() { } // editing permissions - void IObserver.OnNext(AlgoEditingPermissions editing_permissions) { - using (detect_property_changes(nameof(can_edit_values), nameof(can_edit_structure), nameof(can_save_values), nameof(can_save_structure))) - this.editing_permissions = editing_permissions; - } + void IObserver.OnNext(AlgoEditingPermissions editing_permissions) => this.editing_permissions = editing_permissions; void IObserver.OnError(Exception error) { } void IObserver.OnCompleted() { } diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index c064f12e9..c323c7a8c 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1,10 +1,11 @@ 12 + CanEditValues + CannotEditValues + CanEditStructure + CannotEditStructure + + AllowEditValues + + + AllowEditStructure + + + + + AllowEditValues + + + + + + - \ No newline at end of file + diff --git a/src/client/spark/view/Utility/StateManager.cs b/src/client/spark/view/Utility/StateManager.cs index 9659a3a24..b7e7ca3c2 100644 --- a/src/client/spark/view/Utility/StateManager.cs +++ b/src/client/spark/view/Utility/StateManager.cs @@ -1,14 +1,57 @@ -using System; -using System.Collections.Generic; +using mbts.ui.shell; +using mbts.ui.utility; +using System; using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; +using System.Windows.Markup; + +namespace mbts.ui { + class StateDefinitionCollection : ObservableCollection { } + + [ContentProperty(nameof(State))] + class StateDefinition : DependencyObject { + public static readonly DependencyProperty StateProperty = + WPFHelper.create_dp(nameof(State), (o, oldval, newval) => o.StateChanged?.Invoke(oldval, newval)); + + public string State { get => GetValue(StateProperty) as string; set => SetValue(StateProperty, value); } + + public event PropertyChange StateChanged; + } + + [ContentProperty(nameof(StateDefinitions))] + class StateGroupsManager : DependencyObject { + IDisposable _state_definitions_hook; + + #region Target + public static readonly DependencyProperty TargetProperty = + WPFHelper.create_dp(nameof(Target), (o, v) => _reset(o, v, o.StateDefinitions)); + + public FrameworkElement Target { get => GetValue(TargetProperty) as FrameworkElement; set => SetValue(TargetProperty, value); } + #endregion + + #region StateDefinitions + public static readonly DependencyProperty StateDefinitionsProperty = + WPFHelper.create_dp(nameof(StateDefinitions), (o, v) => _reset(o, o.Target, v)); + + public StateDefinitionCollection StateDefinitions { get => GetValue(StateDefinitionsProperty) as StateDefinitionCollection; set => SetValue(StateDefinitionsProperty, value); } + #endregion + + static void _reset(StateGroupsManager state_group, FrameworkElement target, StateDefinitionCollection state_defs) { + if (state_group == null) + return; + Disposable.dispose(ref state_group._state_definitions_hook); + if (state_defs != null) { + state_group._state_definitions_hook = ObservableAutoWrapper.connect_item_hooks(state_defs, sd => { + StateManager.GoToState(target, sd.State); + sd.StateChanged += on_state_changed; + return Disposable.Create(() => sd.StateChanged -= on_state_changed); + }); + void on_state_changed(string oldval, string newval) => StateManager.GoToState(target, newval); + } + } + } -namespace mbts.ui -{ // With this utility we can create a ViewModel with a ViewState (string) property // Then in the View simply set StateManager.VisualState = "{binding ViewState}" // @@ -20,8 +63,15 @@ namespace mbts.ui // // // - public class StateManager : DependencyObject - { + class StateManager : DependencyObject { + #region Groups + public static readonly DependencyProperty GroupsProperty = + DependencyProperty.RegisterAttached("Groups", typeof(StateGroupsManager), typeof(StateManager), new PropertyMetadata(null)); + + public static StateGroupsManager GetGroups(DependencyObject d) => d.GetValue(GroupsProperty) as StateGroupsManager; + public static void SetGroups(DependencyObject d, StateGroupsManager value) => d.SetValue(GroupsProperty, value); + #endregion + public static string GetVisualState(DependencyObject obj) { return (string)obj.GetValue(VisualStateProperty); } @@ -68,7 +118,7 @@ namespace mbts.ui static void GoToState(object o, DependencyPropertyChangedEventArgs args) => GoToState(o as FrameworkElement, args.NewValue as string); - static void GoToState(FrameworkElement frameworkElement, string state) { + public static void GoToState(FrameworkElement frameworkElement, string state) { if (frameworkElement != null && !string.IsNullOrEmpty(state)) { if (frameworkElement.IsLoaded) { try { From 4115a6c790b13b32a05d92321e0da76771206f34 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 7 Mar 2019 13:56:37 -0600 Subject: [PATCH 124/218] AlgoStructureKey - structure-serialization supports DynamicOrderDefinition --- .../AlgoStudio/Model/AlgoStructureKey.cs | 144 ++++++++---- .../Modules/Trading/OrderBook/OrderBookVM.cs | 11 +- .../Orders/OrderTypeVMs/DynamicOrderHelper.cs | 20 +- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 13 +- src/client/spark/core/Utility/ProtoHelper.cs | 206 ++++++++++-------- .../view/Spark/Utilities/OrderDataHelper.cs | 7 + src/client/spark/view/Utility/EnumHelper.cs | 31 +++ 7 files changed, 275 insertions(+), 157 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs index fb2c0666e..1775e024e 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs @@ -1,8 +1,9 @@ using bts.api.orderman; using bts.utils; using mbts.spark.utilities; -using ProtoBuf; +using mbts.ui.utility; using System; +using System.Collections.Generic; using System.Linq; namespace mbts.spark { @@ -10,12 +11,6 @@ namespace mbts.spark { public readonly string name; public readonly AlgoStructureKey structure; - public AlgoNameStructureKey(CustomOrderDefinitionImmutable definition) - : this(definition.CustomCase.type_id(), definition) { } - - public AlgoNameStructureKey(string name, CustomOrderDefinitionImmutable definition) - : this(name, new AlgoStructureKey(definition)) { } - public AlgoNameStructureKey(CustomOrderDefinition.CustomOneofCase base_type) : this(base_type.type_id(), new AlgoStructureKey(base_type)) { } @@ -31,31 +26,22 @@ namespace mbts.spark { public static bool operator !=(AlgoNameStructureKey a, AlgoNameStructureKey b) => !a.Equals(b); } - [ProtoContract] struct AlgoStructureKey : IEquatable { - [ProtoMember(1)] readonly int[] _structure; public AlgoStructureKey(CustomOrderDefinition.CustomOneofCase base_type) : this(new[] { (int)base_type }) { } - public AlgoStructureKey(CustomOrderDefinitionImmutable definition) { - int[] s = new[] { (int)definition.CustomCase }; - _build_structure(definition, ref s, 1); - _structure = s; - } + public AlgoStructureKey(CustomOrderDefinitionImmutable definition, IMaskIndexInt32 dynamic_type_index) => + _structure = AlgoStructureSerializer.to_array(definition, dynamic_type_index); public AlgoStructureKey(int[] structure) => _structure = structure; - public CustomOrderDefinitionImmutable build_def() { - int pos = 0; - var mdef = new CustomOrderDefinition(); - _build_def(_structure, ref pos, ref mdef); - return new CustomOrderDefinitionImmutable(mdef); - } + public IReadOnlyList structure => _structure ?? Array.Empty(); public bool Equals(AlgoStructureKey other) => + /// is not optimized to check Count/Length, since the args are . _structure.Length == other._structure.Length && _structure.SequenceEqual(other._structure); @@ -67,38 +53,106 @@ namespace mbts.spark { public static bool operator ==(AlgoStructureKey a, AlgoStructureKey b) => a.Equals(b); public static bool operator !=(AlgoStructureKey a, AlgoStructureKey b) => !a.Equals(b); + } - static void _build_structure(CustomOrderDefinitionImmutable definition, ref int[] structure, int pos) => - _build_structure(definition.CloneToMutable(), ref structure, pos); + static class AlgoStructureSerializer { + const int _dynamic_mask = 1 << 31; - static void _build_structure(CustomOrderDefinition algo, ref int[] structure, int pos) { - var cad = OrderDataHelper.get_child_algo_data(algo); - for (int di = 0; di < cad.Count; di++) { - if (cad[di].get_child(algo) is CustomOrderDefinition child_algo) { - ArrayHelper.ensure_capacity(ref structure, pos + 1); - int del_mask = 1 << (31 - di); - structure[pos++] = (int)child_algo.CustomCase | del_mask; - _build_structure(child_algo, ref structure, pos); - break; - } - } - ArrayHelper.trim(ref structure, pos); + public static CustomOrderDefinitionImmutable build_algoi(this AlgoStructureKey structure_key, DynamicOrderHelper dynamic_helper) => + parsei(structure_key.structure, dynamic_helper); + + public static CustomOrderDefinitionImmutable build_algo(this AlgoStructureKey structure_key, DynamicOrderHelper dynamic_helper) => + parsei(structure_key.structure, dynamic_helper); + + public static AlgoStructureKey structure_key(CustomOrderDefinitionImmutable algo, IMaskIndexInt32 dynamic_type_index) => + new AlgoStructureKey(to_array(algo, dynamic_type_index)); + + public static AlgoStructureKey structure_key(CustomOrderDefinition algo, IMaskIndexInt32 dynamic_type_index) => + new AlgoStructureKey(to_array(algo, dynamic_type_index)); + + public static int[] to_array(CustomOrderDefinitionImmutable algo, IMaskIndexInt32 dynamic_type_index) => + to_array(algo.CloneToMutable(), dynamic_type_index); + + public static int[] to_array(CustomOrderDefinition algo, IMaskIndexInt32 dynamic_type_index) { + int[] s = new[] { (int)algo.CustomCase }; + _build_structure(algo, ref s, dynamic_type_index); + return s; } - static void _build_def(int[] structure, ref int pos, ref CustomOrderDefinition algo) { - for (int i = pos; i < structure.Length; i++) { + public static CustomOrderDefinitionImmutable from_array(int[] structure, DynamicOrderHelper dynamic_helper) => + parsei(structure, dynamic_helper); + + public static CustomOrderDefinitionImmutable parsei(IReadOnlyList structure, DynamicOrderHelper dynamic_helper) => + new CustomOrderDefinitionImmutable(parse(structure, dynamic_helper)); + + public static CustomOrderDefinition parse(IReadOnlyList structure, DynamicOrderHelper dynamic_helper) { + if (structure == null || structure.Count == 0) + return new CustomOrderDefinition(); + int pos = 1; + var mdef = OrderDataHelper.create_algo((CustomOrderDefinition.CustomOneofCase)structure[0]); + _build_def(structure, ref pos, ref mdef, dynamic_helper); + return mdef; + } + + static void _build_structure(CustomOrderDefinition algo, ref int[] structure, IMaskIndexInt32 dynamic_type_index) { + if (structure == null || structure.Length == 0) + structure = new int[1]; + structure[0] = (int)algo.CustomCase; + int p = 1; + _build_structure(algo, ref structure, ref p, dynamic_type_index); + ArrayHelper.trim(ref structure, p); + } + + static void _build_structure(CustomOrderDefinition algo, ref int[] structure, ref int pos, IMaskIndexInt32 dynamic_type_index) { + IEnumerable<(CustomOrderDefinition child_algo, int field_pos)> children; + if (algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) { + ArrayHelper.ensure_capacity(ref structure, pos + 1); + structure[pos++] = dynamic_type_index.to_int(algo.Dynamic.DynamicOrderType) | _dynamic_mask; + children = algo.Dynamic.OrderParams.Where(kv => kv.Value.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef).Select((kv, i) => (kv.Value.AsOrderDef, i)); + } else { var cad = OrderDataHelper.get_child_algo_data(algo); - for (int di = 0; di < cad.Count; di++) { - int mask = 1 << (31 - di); - if ((structure[i] & mask) == mask) { - var type = (CustomOrderDefinition.CustomOneofCase)(structure[i] ^ mask); - var child_algo = OrderDataHelper.Defaults.CustomOrderDefinition(type); - pos++; - _build_def(structure, ref pos, ref child_algo); - cad[di].assign_child(algo, child_algo); + children = cad.Select((c, i) => (c.get_child(algo), i)); + children = children.Where(c => c.child_algo != null); + } + foreach ((var child, int field_pos) in children) { + ArrayHelper.ensure_capacity(ref structure, pos + 1); + structure[pos++] = EnumMaskIndexInt32.to_int(child.CustomCase) | _child_algo_mask(field_pos); + _build_structure(child, ref structure, ref pos, dynamic_type_index); + } + } + + /// + /// Gets a mask for a particular child-algo field of a particular algo definition. + /// + /// The index wrt the deterministic enumeration of child algos for a particular definition (e.g., Hedge = 0, Child = 1). + static int _child_algo_mask(int field_pos) => 1 << (30 - field_pos); + + static void _build_def(IReadOnlyList structure, ref int pos, ref CustomOrderDefinition algo, DynamicOrderHelper dynamic_helper) { + var local_algo = algo; + IEnumerable<(Action assign_child, int field_pos)> children; + if (algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) { + var dyn_def = algo.Dynamic; + dyn_def.DynamicOrderType = dynamic_helper.dynamic_type_index.from_int(structure[pos++] ^ _dynamic_mask); + dynamic_helper.add_dynamic_params(ref dyn_def); + children = dyn_def.OrderParams + .Where(kv => kv.Value.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef) + .Select((kv, i) => (new Action(child_algo => kv.Value.AsOrderDef = child_algo), i)); + } else { + children = OrderDataHelper.get_child_algo_data(algo) + .Select((c, i) => (new Action(child_algo => c.assign_child(local_algo, child_algo)), i)); + } + using (var children_en = children.GetEnumerator()) { + while (pos < structure.Count && children_en.MoveNext()) { + (var assign_child, int field_pos) = children_en.Current; + int mask = _child_algo_mask(field_pos); + if ((structure[pos] & mask) == mask) { + var type = EnumMaskIndexInt32.from_int(structure[pos++] ^ mask); + var child_algo = OrderDataHelper.create_algo(type); + _build_def(structure, ref pos, ref child_algo, dynamic_helper); + assign_child(child_algo); } } } } } -} +} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index e81d938f1..bbb91efa2 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -40,7 +40,7 @@ namespace mbts.spark { readonly OrderBookRowCollection _row_collection; readonly OrderBookColumnCollection _columns; readonly IWindowSettingsManager _settings_manager; - readonly SelectedAlgosMonitor _selected_algo_mon = new SelectedAlgosMonitor(); + readonly SelectedAlgosMonitor _selected_algo_mon; bool _algo_editor_is_visible = OrderBookStartupData.Default.algo_editor_is_visible; double _raw_algo_editor_width = OrderBookStartupData.Default.algo_editor_width; OrderBookStartupData _state; @@ -49,6 +49,7 @@ namespace mbts.spark { public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager, bool rows_are_initially_expanded = false) { _bus = bus; _model = model; + _selected_algo_mon = new SelectedAlgosMonitor(model.dynamic_helper); algo_vm = AlgoDefinitionVM.create(model, new AlgoData(new CustomOrderDefinitionImmutable(new CustomOrderDefinition { Limit = new LimitOrderDefinition() })), editing_permissions: AlgoEditingPermissions.AllowEditValues); algo_vm.editing_permissions_mask = AlgoEditingPermissions.None; algo_vm.algo_root = null; @@ -329,9 +330,13 @@ namespace mbts.spark { /// In terms of user-interaction, this means the user may edit the algo params for multiple orders at once if they are all active and share a common algo structure. /// class SelectedAlgosMonitor { + readonly DynamicOrderHelper _dyn_helper; readonly SetMap _algo_structure_index = new SetMap(); int _inactive_order_count; + public SelectedAlgosMonitor(DynamicOrderHelper dyn_helper) => + _dyn_helper = dyn_helper; + public event PropertyChange common_algo_changed; public event Action all_active_changed; @@ -370,13 +375,13 @@ namespace mbts.spark { } void _select_algo(OrderSecurityAlgoMeta osam) { - _algo_structure_index.add(new AlgoStructureKey(osam.order.Def.CustomDef), osam.order); + _algo_structure_index.add(AlgoStructureSerializer.structure_key(osam.order.Def.CustomDef, _dyn_helper.dynamic_type_index), osam.order); if (!osam.order.is_active()) _inactive_order_count++; } void _unselect_algo(OrderSecurityAlgoMeta osam) { - _algo_structure_index.remove(new AlgoStructureKey(osam.order.Def.CustomDef), osam.order); + _algo_structure_index.remove(AlgoStructureSerializer.structure_key(osam.order.Def.CustomDef, _dyn_helper.dynamic_type_index), osam.order); if (!osam.order.is_active()) _inactive_order_count--; } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs index 308a29fbc..3e001254c 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs @@ -2,6 +2,7 @@ using bts.api; using bts.api.orderman; using bts.utils; using Google.Protobuf.Reflection; +using mbts.ui.utility; using mbts.utils; using System; using System.Collections.Generic; @@ -11,8 +12,9 @@ using System.Reactive.Linq; namespace mbts.spark { [Export] - public class DynamicOrderHelper - { + class DynamicOrderHelper { + public readonly IMaskIndexInt32 dynamic_type_index; + static readonly IReadOnlyDictionary _descriptor_case_index = ProtoHelper.get_oneof_descriptor_index(nameof(DynamicOrderParam.ValueCase)); @@ -21,6 +23,7 @@ namespace mbts.spark { private DynamicOrderHelper(OrderService order_service) { _dynamic_types = order_service.get_registered_dynamic_order_types(new VoidMessage()); + dynamic_type_index = new MaskIndexInt32(_dynamic_types.DynamicOrderDesc.Select(d => d.DynamicOrderType).ToList()); } public void add_dynamic_order_defs(List defs, @@ -42,20 +45,25 @@ namespace mbts.spark { internal DynamicOrderDefinition create_def(string dynamic_type) { var desc = get_descriptor(dynamic_type); - var def = new DynamicOrderDefinition(); + var def = new DynamicOrderDefinition { DynamicOrderType = dynamic_type }; + add_dynamic_params(ref def); + return def; + } + + internal void add_dynamic_params(ref DynamicOrderDefinition dynamic_def) { + var desc = get_descriptor(dynamic_def.DynamicOrderType); foreach (var p in desc.ParamDesc) { if (_is_child_algo_desc(p)) { - def.OrderParams[p.ParamName] = new DynamicOrderParam { AsOrderDef = new CustomOrderDefinition() }; + dynamic_def.OrderParams[p.ParamName] = new DynamicOrderParam { AsOrderDef = new CustomOrderDefinition() }; } else if (_is_value_param_desc(p)) { var value_case = _get_value_case(p.ParamType.Primitive); if (_descriptor_case_index.TryGetValue(value_case, out (FieldDescriptor fd, Type type) tup)) { var dop = new DynamicOrderParam(); tup.fd.Accessor.SetValue(dop, ConvertUtils.get_default(tup.type)); - def.OrderParams[p.ParamName] = dop; + dynamic_def.OrderParams[p.ParamName] = dop; } } } - return def; } static DynamicOrderParam.ValueOneofCase _get_value_case(DynamicOrderPrimitiveDescriptor primitive_descriptor_case) { diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 5d9fa092a..879070ed1 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -95,21 +95,11 @@ namespace mbts.spark { public static FieldDescriptor find_descriptor() => _algo_type_index.TryGetValue(typeof(T), out FieldDescriptor fd) ? fd : throw new NotSupportedException($"No {nameof(AlgoDef)} {nameof(FieldDescriptor)} exists for type '{typeof(T)}.'"); - - public static Func immutable_factory() where TMutable : IMessage, new() where TImmutable : IImmutableMessage => - _ImmutableActivator.factory; - - static class _ImmutableActivator where TMutable : IMessage, new() where TImmutable : IImmutableMessage { - public static readonly Func factory = - m => (TImmutable)Activator.CreateInstance(typeof(TImmutable), m); - } } #region OrderTypeVM Base Classes abstract class OrderTypeVMBase : DisposableViewModelBase, IAlgoVM, IObserver, IObserver, IObserver where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage { - /// TODO: maybe use explicit delegates rather than rely on reflection . static readonly FieldDescriptor _descriptor = OrderTypeVMUtils.find_descriptor(); - static readonly Func _create_immutable = OrderTypeVMUtils.immutable_factory(); readonly IDictionary _children_vm = new ExpandoObject(); protected CompositeDisposable _resources = new CompositeDisposable(); @@ -314,12 +304,11 @@ namespace mbts.spark { protected Property add_property(string prop_name, int target_field_number, TImmutableValue init_value = default) where TMutableValue : class, IMessage, new() where TImmutableValue : IImmutableMessage { var prop = backing(prop_name, init_value); var field_desc = new TMutable().Descriptor.FindFieldByNumber(target_field_number); - var immutable_factory = OrderTypeVMUtils.immutable_factory(); add_property( prop_name, mdef => field_desc.Accessor.GetValue(mdef) as TMutableValue, (mdef, mval) => field_desc.Accessor.SetValue(mdef, mval), - mval => prop.set(immutable_factory(mval ?? new TMutableValue())), + mval => prop.set(ProtoHelper.immutable_factory(mval ?? new TMutableValue())), () => { // TODO: perhaps CloneToMutable() should be a member of IImmutableMessage. // this method makes things so simple for the caller...but this dynamic cast is a little sketch. diff --git a/src/client/spark/core/Utility/ProtoHelper.cs b/src/client/spark/core/Utility/ProtoHelper.cs index e17195717..b802b4a40 100644 --- a/src/client/spark/core/Utility/ProtoHelper.cs +++ b/src/client/spark/core/Utility/ProtoHelper.cs @@ -1,91 +1,115 @@ -using mbts; -using Google.Protobuf; -using Google.Protobuf.Reflection; -using mbts.ui.utility; -using System; -using System.Collections.Generic; -using System.Linq; -using mbts.utils; - -namespace bts.utils { - static class ProtoHelper { - const string - _case_suffix = "Case", - _oneof_case_suffix = "OneofCase"; - - public static MessageDescriptor Descriptor() where T : IMessage, new() => - _DescriptorImpl.value; - - public static OneofDescriptor get_oneof_descriptor(string prop_name) where T : IMessage, new() { - prop_name = prop_name.iremove_suffix(_case_suffix); - return Descriptor().Oneofs.FirstOrDefault(d => d.Name.iequals(prop_name)); - } - - public static IReadOnlyDictionary get_oneof_descriptor_index(string prop_name) - where T : IMessage, new() - where TOneofCase : struct => - _DescriptorImpl.OneofImpl.get_descriptor_case_index(prop_name); - - public static FieldDescriptor get_oneof_field_descriptor(TOneofCase oneof_case) where T : IMessage, new() where TOneofCase : struct { - string oneof_name = oneof_case.ToString(); - return Descriptor().Fields.InFieldNumberOrder().FirstOrDefault(fd => fd.Name.Replace("_", "").iequals(oneof_name)); - } - - public static Type get_field_type(FieldDescriptor field_descriptor) { - switch (field_descriptor.FieldType) { - case FieldType.Bool: return typeof(bool); - case FieldType.Bytes: return typeof(ByteString); - case FieldType.Double: return typeof(double); - case FieldType.Float: return typeof(float); - case FieldType.UInt32: return typeof(uint); - case FieldType.UInt64: return typeof(ulong); - // int - case FieldType.SFixed32: - case FieldType.Fixed32: - case FieldType.SInt32: - case FieldType.Int32: return typeof(int); - // long - case FieldType.SFixed64: - case FieldType.Fixed64: - case FieldType.SInt64: - case FieldType.Int64: return typeof(long); - // - case FieldType.String: return typeof(string); - case FieldType.Enum: return field_descriptor.EnumType.ClrType; - case FieldType.Message: return field_descriptor.MessageType.ClrType; - default: throw ExceptionBuilder.Argument.unexpected_case(field_descriptor.FieldType, nameof(field_descriptor)); - } - } - - public static IReadOnlyDictionary get_oneof_descriptor_index(OneofDescriptor descriptor) where TOneofCase : struct => - descriptor.Fields.ToDictionary(fd => EnumHelper.parse(fd.Name.Replace("_", ""))); - - static class _DescriptorImpl where T : IMessage, new() { - public static readonly MessageDescriptor value = new T().Descriptor; - - public static class OneofImpl where TOneofCase : struct { - static Dictionary> _descriptor_case_indices = - new Dictionary>(); - - public static IReadOnlyDictionary get_descriptor_case_index(string prop_name) { - /// Use local copy because is updated atomically. - var dci = _descriptor_case_indices; - if (!dci.TryGetValue(prop_name, out IReadOnlyDictionary rv)) { - /// Update atomically (lock-free). - /// 1) clone the local copy. - /// 2) add the new KeyValue to the clone. - /// 3) assign the clone back to . - rv = get_oneof_descriptor_index(get_oneof_descriptor(prop_name)) - .ToDictionary(kv => kv.Key, kv => (kv.Value, get_field_type(kv.Value))); - dci = dci.ToDictionary(); - dci.Add(prop_name, rv); - /// It is possible for add ops to be overwritten. - /// This is perfectly safe, just means that the 'clone-add-assign' will be repeated the next time a caller requests this key. - _descriptor_case_indices = dci; - } - return rv; - } - } - } - } -} +using mbts; +using Google.Protobuf; +using Google.Protobuf.Reflection; +using mbts.ui.utility; +using System; +using System.Collections.Generic; +using System.Linq; +using mbts.utils; +using bts.api; +using bts.api.orderman; +using System.Reflection; + +namespace bts.utils { + static class ProtoHelper { + const string + _case_suffix = "Case", + _oneof_case_suffix = "OneofCase"; + + public static MessageDescriptor Descriptor() where T : IMessage, new() => + _DescriptorImpl.value; + + public static OneofDescriptor get_oneof_descriptor(string prop_name) where T : IMessage, new() { + prop_name = prop_name.iremove_suffix(_case_suffix); + return Descriptor().Oneofs.FirstOrDefault(d => d.Name.iequals(prop_name)); + } + + public static IReadOnlyDictionary get_oneof_descriptor_index(string prop_name) + where T : IMessage, new() + where TOneofCase : struct => + _DescriptorImpl.OneofImpl.get_descriptor_case_index(prop_name); + + public static FieldDescriptor get_oneof_field_descriptor(TOneofCase oneof_case) where T : IMessage, new() where TOneofCase : struct { + string oneof_name = oneof_case.ToString(); + return Descriptor().Fields.InFieldNumberOrder().FirstOrDefault(fd => fd.Name.Replace("_", "").iequals(oneof_name)); + } + + public static TImmutable immutable_factory(TMutable m) where TMutable : IMessage, new() where TImmutable : IImmutableMessage => + (TImmutable)Activator.CreateInstance(typeof(TImmutable), m); + + public static IMessage mutable_factory(Type type) => + MutableFactoryStore.get(type)(); + + static class MutableFactoryStore { + [ThreadStatic] + static readonly Dictionary> _factories = new Dictionary>(); + + public static Func get(Type type) => + _factories.GetOrAdd(type, + t => typeof(MutableFactory<>).MakeGenericType(t) + .GetField(nameof(MutableFactory.anonymous_factory), BindingFlags.Static | BindingFlags.Public) + .GetValue(null) as Func); + } + + static class MutableFactory where T : IMessage, new() { + public static readonly Func anonymous_factory = () => new T(); + } + + public static Type get_field_type(FieldDescriptor field_descriptor) { + switch (field_descriptor.FieldType) { + case FieldType.Bool: return typeof(bool); + case FieldType.Bytes: return typeof(ByteString); + case FieldType.Double: return typeof(double); + case FieldType.Float: return typeof(float); + case FieldType.UInt32: return typeof(uint); + case FieldType.UInt64: return typeof(ulong); + // int + case FieldType.SFixed32: + case FieldType.Fixed32: + case FieldType.SInt32: + case FieldType.Int32: return typeof(int); + // long + case FieldType.SFixed64: + case FieldType.Fixed64: + case FieldType.SInt64: + case FieldType.Int64: return typeof(long); + // + case FieldType.String: return typeof(string); + case FieldType.Enum: return field_descriptor.EnumType.ClrType; + case FieldType.Message: return field_descriptor.MessageType.ClrType; + default: throw ExceptionBuilder.Argument.unexpected_case(field_descriptor.FieldType, nameof(field_descriptor)); + } + } + + public static IReadOnlyDictionary get_oneof_descriptor_index(OneofDescriptor descriptor) where TOneofCase : struct => + descriptor.Fields.ToDictionary(fd => EnumHelper.parse(fd.Name.Replace("_", ""))); + + static class _DescriptorImpl where T : IMessage, new() { + public static readonly MessageDescriptor value = new T().Descriptor; + + public static class OneofImpl where TOneofCase : struct { + static Dictionary> _descriptor_case_indices = + new Dictionary>(); + + public static IReadOnlyDictionary get_descriptor_case_index(string prop_name) { + /// Use local copy because is updated atomically. + var dci = _descriptor_case_indices; + if (!dci.TryGetValue(prop_name, out IReadOnlyDictionary rv)) { + /// Update atomically (lock-free). + /// 1) clone the local copy. + /// 2) add the new KeyValue to the clone. + /// 3) assign the clone back to . + rv = get_oneof_descriptor_index(get_oneof_descriptor(prop_name)) + .ToDictionary(kv => kv.Key, kv => (kv.Value, get_field_type(kv.Value))); + dci = dci.ToDictionary(); + dci.Add(prop_name, rv); + /// It is possible for add ops to be overwritten. + /// This is perfectly safe, just means that the 'clone-add-assign' will be repeated the next time a caller requests this key. + _descriptor_case_indices = dci; + } + return rv; + } + } + } + } +} diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index 9670f4048..e72199762 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -332,6 +332,13 @@ namespace mbts.spark.utilities { } } + public static CustomOrderDefinition create_algo(CustomOrderDefinition.CustomOneofCase algo_type) { + var algo = new CustomOrderDefinition(); + if (_algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData desc)) + desc.type_case_descriptor.Accessor.SetValue(algo, ProtoHelper.mutable_factory(ProtoHelper.get_field_type(desc.type_case_descriptor))); + return algo; + } + public static IReadOnlyList get_child_algo_data(CustomOrderDefinition.CustomOneofCase algo_type) => _algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData d) ? d.child_algo_data : Array.Empty(); diff --git a/src/client/spark/view/Utility/EnumHelper.cs b/src/client/spark/view/Utility/EnumHelper.cs index 6a1641359..d9f7be5c8 100644 --- a/src/client/spark/view/Utility/EnumHelper.cs +++ b/src/client/spark/view/Utility/EnumHelper.cs @@ -198,6 +198,37 @@ namespace mbts.ui.utility { } } + interface IMaskIndexInt32 { + T from_int(int i); + int to_int(T value); + } + + class MaskIndexInt32 : IMaskIndexInt32 { + public readonly IReadOnlyDictionary lookup; + public readonly IReadOnlyDictionary reverse_lookup; + + public MaskIndexInt32(IReadOnlyList items) { + lookup = items.Select((v, i) => (v, i)).ToDictionary(t => t.i, t => t.v); + reverse_lookup = lookup.ToDictionary(kv => kv.Value, kv => kv.Key); + } + + public T from_int(int i) => + lookup.TryGetValue(i, out T value) ? value : default; + + public int to_int(T value) => + reverse_lookup.TryGetValue(value, out int i) ? i : 0; + } + + static class EnumMaskIndexInt32 { + static readonly MaskIndexInt32 _instance = new MaskIndexInt32(EnumHelper.get_values().ToList()); + + public static T from_int(int i) => + _instance.lookup.TryGetValue(i, out T value) ? value : default; + + public static int to_int(T value) => + _instance.reverse_lookup[value]; + } + class MaskInt32 { int _mask = int.MaxValue, _raw; From 69bdf07423917d9bcc996b8ff6e0f72f56183040 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 7 Mar 2019 14:07:39 -0600 Subject: [PATCH 125/218] SPARK-2089 Strange null ref exception in OrderBook row-selection changed callback during application shutdown --- .../AlgoStudio/Model/AlgoStructureKey.cs | 6 ++-- .../Modules/Trading/OrderBook/OrderBookVM.cs | 30 +++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs index 1775e024e..e3060f996 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStructureKey.cs @@ -56,7 +56,9 @@ namespace mbts.spark { } static class AlgoStructureSerializer { - const int _dynamic_mask = 1 << 31; + const int + _dynamic_mask = 1 << 31, + _child_mask_offset = 30; public static CustomOrderDefinitionImmutable build_algoi(this AlgoStructureKey structure_key, DynamicOrderHelper dynamic_helper) => parsei(structure_key.structure, dynamic_helper); @@ -125,7 +127,7 @@ namespace mbts.spark { /// Gets a mask for a particular child-algo field of a particular algo definition. /// /// The index wrt the deterministic enumeration of child algos for a particular definition (e.g., Hedge = 0, Child = 1). - static int _child_algo_mask(int field_pos) => 1 << (30 - field_pos); + static int _child_algo_mask(int field_pos) => 1 << (_child_mask_offset - field_pos); static void _build_def(IReadOnlyList structure, ref int pos, ref CustomOrderDefinition algo, DynamicOrderHelper dynamic_helper) { var local_algo = algo; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index bbb91efa2..5229b1b50 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -152,24 +152,30 @@ namespace mbts.spark { } public void row_selection_changed(SelectionChangedEventArgs e) { - using (_selected_algo_mon.update()) { - if (e.RemovedItems != null) { - foreach (var row_vm in e.RemovedItems.Cast()) { - row_vm.is_selected = false; - _selected_algo_mon.on_row_unselected(row_vm); + try { + using (_selected_algo_mon.update()) { + if (e.RemovedItems != null) { + foreach (var row_vm in e.RemovedItems.Cast()) { + row_vm.is_selected = false; + _selected_algo_mon.on_row_unselected(row_vm); + } } - } - if (e.AddedItems != null) { - foreach (var row_vm in e.AddedItems.Cast()) { - row_vm.is_selected = true; - _selected_algo_mon.on_row_selected(row_vm); + if (e.AddedItems != null) { + foreach (var row_vm in e.AddedItems.Cast()) { + row_vm.is_selected = true; + _selected_algo_mon.on_row_selected(row_vm); + } } + RowSelectionHelper.apply_changes(selected_rows, e); + selected_order_changed?.Invoke(current_order); } - RowSelectionHelper.apply_changes(selected_rows, e); - selected_order_changed?.Invoke(current_order); + } catch(Exception ex) { + // [John]I observed a strange null-reference exception in this callback when the launcher was shutting down (see https://bluetradesys.atlassian.net/browse/SPARK-2089) + Log.Ui.error($"[{nameof(OrderBookVM)}] Error handling selection change: {ex}"); } } + public OrderBookStartupData create() { var (filters, sorting) = _columns.create(); var gs = grid_settings_manager.create(); From d1c915fef3c087152f138a97145ecbf9c93e8ca5 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 8 Mar 2019 14:02:14 -0600 Subject: [PATCH 126/218] ObservableAutoWrapper - fix typeo (change 'Reset' to 'Remove') --- src/client/spark/core/Collections/ObservableAutoWrapper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/core/Collections/ObservableAutoWrapper.cs b/src/client/spark/core/Collections/ObservableAutoWrapper.cs index 2a0bb93b5..ce62790cd 100644 --- a/src/client/spark/core/Collections/ObservableAutoWrapper.cs +++ b/src/client/spark/core/Collections/ObservableAutoWrapper.cs @@ -316,7 +316,7 @@ namespace mbts.ui.utility { void _remove_and_notify(T value) { int pos = _assert_remove(value); - CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, value, pos)); + CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, value, pos)); } int _add(T value) { From aa39349fc4fa13b2dedaa0356e20e673d1823c25 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 8 Mar 2019 14:09:53 -0600 Subject: [PATCH 127/218] SPARK-2092 Orderbook update ui supports spreader algos --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 42 ++++++---- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 79 ++++++++++++++++--- .../Orders/OrderTypeVMs/SpreaderOrderVM.cs | 31 +++----- .../core/Utility/PropertyUpdateThrottle.cs | 59 ++++++++++++++ .../Order/AlgoContentTemplateSelector.xaml | 4 +- .../view/Spark/Utilities/OrderDataHelper.cs | 31 ++++++++ 6 files changed, 198 insertions(+), 48 deletions(-) create mode 100644 src/client/spark/core/Utility/PropertyUpdateThrottle.cs diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 5229b1b50..bc6636ad8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -72,6 +72,11 @@ namespace mbts.spark { concat_disposable( model.on_order_tuples.OnDispatcher().Subscribe(_row_collection.update), grid_settings_manager, + algo_vm.connect_data(Observable.Return(model)), + algo_vm.connect_data(Observable.FromEvent, SecurityImmutable?>( + cb => (oldval, newval) => cb(newval), + cb => _selected_algo_mon.common_spreader_sec_changed += cb, + cb => _selected_algo_mon.common_spreader_sec_changed -= cb)), algo_vm, Disposable.Create(() => { _columns.filter_changed -= on_filter_changed; @@ -92,8 +97,8 @@ namespace mbts.spark { algo_vm.algo_root = null; } } - void on_all_selected_orders_active_changed(bool all_active) { - algo_vm.editing_permissions_mask = all_active ? AlgoEditingPermissions.AllowEditValues : AlgoEditingPermissions.None; + void on_all_selected_orders_active_changed(bool oldval, bool newval) { + algo_vm.editing_permissions_mask = newval ? AlgoEditingPermissions.AllowEditValues : AlgoEditingPermissions.None; modify_selected_algos_async_cmd.RaiseCanExecuteChanged(); } } @@ -336,19 +341,23 @@ namespace mbts.spark { /// In terms of user-interaction, this means the user may edit the algo params for multiple orders at once if they are all active and share a common algo structure. /// class SelectedAlgosMonitor { + static readonly TimeSpan _throttle = TimeSpan.FromSeconds(0.1); + readonly PropertyUpdateThrottle _common_algo = new PropertyUpdateThrottle(_throttle); + readonly PropertyUpdateThrottle _common_spreader_sec = new PropertyUpdateThrottle(_throttle); + readonly PropertyUpdateThrottle _all_active = new PropertyUpdateThrottle(_throttle); + readonly SetMap<(AlgoStructureKey structure, SecurityImmutable? spreader_sec), OrderRecordImmutable> _algo_structure_index = new SetMap<(AlgoStructureKey structure, SecurityImmutable? spreader_sec), OrderRecordImmutable>(); readonly DynamicOrderHelper _dyn_helper; - readonly SetMap _algo_structure_index = new SetMap(); int _inactive_order_count; public SelectedAlgosMonitor(DynamicOrderHelper dyn_helper) => _dyn_helper = dyn_helper; - public event PropertyChange common_algo_changed; - public event Action all_active_changed; - - public CustomOrderDefinitionImmutable? common_algo => - _algo_structure_index.Count == 1 ? _algo_structure_index.First().First().Def.CustomDef : (CustomOrderDefinitionImmutable?)null; + public event PropertyChange common_algo_changed { add => _common_algo.changed += value; remove => _common_algo.changed -= value; } + public event PropertyChange common_spreader_sec_changed { add => _common_spreader_sec.changed += value; remove => _common_spreader_sec.changed -= value; } + public event PropertyChange all_active_changed { add => _all_active.changed += value; remove => _all_active.changed -= value; } + public CustomOrderDefinitionImmutable? common_algo => _algo_structure_index.Count == 1 ? _algo_structure_index.First().First().Def.CustomDef : (CustomOrderDefinitionImmutable?)null; + public SecurityImmutable? common_spreader_sec => _algo_structure_index.Count == 1 ? _algo_structure_index.First().Key.spreader_sec : null; public bool all_active => _inactive_order_count == 0 && _algo_structure_index.Count > 0; public void on_row_selected(OrderBookRowVM row) { @@ -365,11 +374,9 @@ namespace mbts.spark { var old_algo = common_algo; bool old_all_active = all_active; return Disposable.Create(() => { - var new_algo = common_algo; - if (!EqualityComparer.nullable_equals(old_algo, new_algo, OrderDataHelper.EqualsHelpers.equals)) - common_algo_changed?.Invoke(old_algo, new_algo); - if (old_all_active != all_active) - all_active_changed?.Invoke(!old_all_active); + _common_algo.value = common_algo; + _common_spreader_sec.value = common_spreader_sec; + _all_active.value = all_active; }); } @@ -381,16 +388,21 @@ namespace mbts.spark { } void _select_algo(OrderSecurityAlgoMeta osam) { - _algo_structure_index.add(AlgoStructureSerializer.structure_key(osam.order.Def.CustomDef, _dyn_helper.dynamic_type_index), osam.order); + _algo_structure_index.add((AlgoStructureSerializer.structure_key(osam.order.Def.CustomDef, _dyn_helper.dynamic_type_index), _get_spreader_sec(osam)), osam.order); if (!osam.order.is_active()) _inactive_order_count++; } void _unselect_algo(OrderSecurityAlgoMeta osam) { - _algo_structure_index.remove(AlgoStructureSerializer.structure_key(osam.order.Def.CustomDef, _dyn_helper.dynamic_type_index), osam.order); + _algo_structure_index.remove((AlgoStructureSerializer.structure_key(osam.order.Def.CustomDef, _dyn_helper.dynamic_type_index), _get_spreader_sec(osam)), osam.order); if (!osam.order.is_active()) _inactive_order_count--; } + + static SecurityImmutable? _get_spreader_sec(OrderSecurityAlgoMeta osam) => + OrderDataHelper.enumerate_algo_hierarchy(osam.order.Def.CustomDef.CloneToMutable()) + .Any(algo => algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Spreader) ? + osam.security : null; } } } \ No newline at end of file diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 879070ed1..f372882f2 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -98,7 +98,11 @@ namespace mbts.spark { } #region OrderTypeVM Base Classes - abstract class OrderTypeVMBase : DisposableViewModelBase, IAlgoVM, IObserver, IObserver, IObserver where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage { + abstract class OrderTypeVMBase : DisposableViewModelBase, IAlgoVM, + IObserver, + IObserver, + IObserver, + IObserver where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage { static readonly FieldDescriptor _descriptor = OrderTypeVMUtils.find_descriptor(); readonly IDictionary _children_vm = new ExpandoObject(); protected CompositeDisposable _resources = new CompositeDisposable(); @@ -108,6 +112,7 @@ namespace mbts.spark { readonly ObservableAutoWrapper _child_algo_selectors; readonly Property _is_expanded; readonly DeferrableActionWrapper _def_change_notifier; + SecurityInput _security_input; AlgoEditingPermissions _editing_permissions; IDisposable _pending_load; @@ -170,8 +175,8 @@ namespace mbts.spark { public virtual bool is_expanded { get => _is_expanded.Value; set => _is_expanded.Value = value; } // protected (observed props) protected OrdersModel model { get; private set; } - protected SecurityMD? security_md { get; private set; } - protected SecurityImmutable? security => security_md?.security; + protected SecurityMD? security_md => _security_input.security_md; + protected SecurityImmutable? security => _security_input.security; public void assign_to(AlgoDef value) { var algo = new TMutable(); @@ -347,6 +352,7 @@ namespace mbts.spark { protected virtual void on_model_internal() { } protected virtual void on_security_md_internal() { } + protected virtual void on_security_internal() { } // model void IObserver.OnNext(OrdersModel model) { @@ -366,19 +372,40 @@ namespace mbts.spark { void IObserver.OnCompleted() { } // security md void IObserver.OnNext(SecurityMD? security_md) { - this.security_md = security_md; - using (_def_change_notifier.defer_execution()) { - on_security_md_internal(); - _populate_selectors(); - } + using (_def_change_notifier.defer_execution()) + using (_update_sec_input()) + _security_input = _security_input.with_security_md(security_md); } void IObserver.OnError(Exception error) { } void IObserver.OnCompleted() { } + // security + void IObserver.OnNext(SecurityImmutable? security) { + using (_def_change_notifier.defer_execution()) + using (_update_sec_input()) + _security_input = _security_input.with_security(security); + } + + void IObserver.OnError(Exception error) { } + void IObserver.OnCompleted() { } // editing permissions void IObserver.OnNext(AlgoEditingPermissions editing_permissions) => this.editing_permissions = editing_permissions; void IObserver.OnError(Exception error) { } void IObserver.OnCompleted() { } + IDisposable _update_sec_input() { + var old_sec = security; + var old_sec_md = security_md; + return Disposable.Create(() => { + if (security != old_sec) { + on_security_internal(); + if (_editing_permissions.HasFlag(AlgoEditingPermissions.AllowEditStructure)) + _populate_selectors(); + } + if (security_md != old_sec_md) + on_security_md_internal(); + }); + } + IDisposable _selector_data_hooks; void _populate_selectors() { if (model != null && security.HasValue) { @@ -396,6 +423,40 @@ namespace mbts.spark { } } + // security input may come in 2 forms: + // 1) SecurityImmutable? + // 2) SecurityMD? + // This structure resolves conflicts that may arise from the different inputs + struct SecurityInput { + readonly SecurityMD? _raw_security_md; + readonly SecurityImmutable? _raw_security; + + public readonly SecurityMD? security_md; + public readonly SecurityImmutable? security; + + SecurityInput(SecurityImmutable? raw_security, SecurityMD? raw_security_md, SecurityImmutable? security, SecurityMD? security_md) { + _raw_security = raw_security; + _raw_security_md = raw_security_md; + this.security_md = security_md; + this.security = security; + } + + public SecurityInput with_security(SecurityImmutable? security) => + new SecurityInput( + security, + _raw_security_md, + security, + security.HasValue && _raw_security_md.HasValue && _raw_security_md.Value.security.Id != security.Value.Id ? + null : _raw_security_md); + + public SecurityInput with_security_md(SecurityMD? security_md) => + new SecurityInput( + _raw_security, + security_md, + security_md?.security ?? _raw_security, + security_md); + } + struct AlgoSelectorData { public readonly string prop_name; public readonly AlgoSelector selector; @@ -484,4 +545,4 @@ namespace mbts.spark { } #endregion } -} \ No newline at end of file +} diff --git a/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs index ad61e47cc..9c7e49df5 100644 --- a/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs @@ -1,4 +1,5 @@ using bts; +using bts.api; using bts.api.orderman; using mbts.ui.controls; using mbts.ui.utility; @@ -11,11 +12,9 @@ using SpreaderDefi = bts.api.orderman.SpreaderOrderDefinitionImmutable; namespace mbts.spark { static partial class OrderTypeVMFactory { - class SpreaderOrderVM : OrderTypeVMBase, IAlgoVM, ILazyAlgo, IObserver, IObserver { + class SpreaderOrderVM : OrderTypeVMBase, IAlgoVM, ILazyAlgo, IObserver { readonly Property _template; readonly StrategyEditorWrapper _strategy_editor_wrapper; - OrdersModel _model; - SecurityMD? _security_md; IDisposable _strategy_sub; public SpreaderOrderVM(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) @@ -80,27 +79,15 @@ namespace mbts.spark { set_error(nameof(template), "Waiting for security and/or strategy.", true); else clear_error(nameof(template)); } - - void IObserver.OnCompleted() { } - void IObserver.OnError(Exception error) { } - void IObserver.OnNext(SecurityMD? security_md) { - _security_md = security_md; - _reset_strategy_sub(); - } - - void IObserver.OnCompleted() { } - void IObserver.OnError(Exception error) { } - void IObserver.OnNext(OrdersModel model) { - _model = model; - _reset_strategy_sub(); - } + protected override void on_model_internal() => _reset_strategy_sub(); + protected override void on_security_internal() => _reset_strategy_sub(); void _reset_strategy_sub() { Disposable.dispose(ref _strategy_sub); - if (_model != null) { - if (_security_md.HasValue) { - _strategy_sub = _model.spreader.security_strategy(_security_md.Value.security.Id) - .Select(strategy => new SpreaderDefi?(_model.factory.spreader_orderi(_security_md.Value.security, strategy))) + if (model != null) { + if (security.HasValue) { + _strategy_sub = model.spreader.security_strategy(security.Value.Id) + .Select(strategy => new SpreaderDefi?(model.factory.spreader_orderi(security.Value, strategy))) .OnDispatcher() .Subscribe(s => { is_loaded = true; @@ -140,7 +127,7 @@ namespace mbts.spark { } } - OrdersModel _model => _owner._model; + OrdersModel _model => _owner.model; SpreaderDefi? _template { get => _owner.template; set => _owner.template = value; } public void Dispose() { diff --git a/src/client/spark/core/Utility/PropertyUpdateThrottle.cs b/src/client/spark/core/Utility/PropertyUpdateThrottle.cs new file mode 100644 index 000000000..458ccf754 --- /dev/null +++ b/src/client/spark/core/Utility/PropertyUpdateThrottle.cs @@ -0,0 +1,59 @@ +using mbts.ui.shell; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace bts.utils { + class PropertyUpdateThrottle { + readonly TimeSpan _throttle; + readonly IEqualityComparer _comparer; + bool _busy, _dirty, _scheduled; + T _value, _last_fired; + + public PropertyUpdateThrottle(TimeSpan throttle) + : this(throttle, EqualityComparer.Default) { } + + public PropertyUpdateThrottle(TimeSpan throttle, IEqualityComparer comparer) { + _throttle = throttle; + _comparer = comparer; + } + + public T value { + get => _value; + set { + if (!_comparer.Equals(_value, value)) { + _value = value; + _fire(); + } + } + } + + public event PropertyChange changed; + + async void _fire() { + if (!_busy) { + _busy = true; + _dirty = false; + var old = _last_fired; + _last_fired = _value; + changed?.Invoke(old, _value); + await Task.Delay(_throttle); + _busy = false; + } else if (!_dirty) { + _dirty = true; + _delay_fire(); + } + } + + async void _delay_fire() { + if (!_scheduled) { + _scheduled = true; + await Task.Delay(100); + if (_dirty) { + _dirty = false; + changed?.Invoke(_last_fired, _value); + } + } + } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index c323c7a8c..a601c8793 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -946,7 +946,7 @@ - + - + diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index e72199762..f03bcd1b4 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -308,6 +308,37 @@ namespace mbts.spark.utilities { f.FieldType == FieldType.Message && f.MessageType.ClrType == typeof(CustomOrderDefinition); } + public static IEnumerable enumerate_algo_children(CustomOrderDefinition algo) { + switch (algo.CustomCase) { + case CustomOrderDefinition.CustomOneofCase.Dynamic: + foreach (var child in enumerate_dynamic_algo_children(algo.Dynamic)) + yield return child; + break; + default: + foreach (var cad in get_child_algo_data(algo)) { + if (cad.get_child(algo) is CustomOrderDefinition child) + yield return child; + } + break; + } + } + + public static IEnumerable enumerate_dynamic_algo_children(DynamicOrderDefinition dynamic_algo) { + foreach (var kv in dynamic_algo.OrderParams) { + if (kv.Value.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef) + yield return kv.Value.AsOrderDef; + } + } + + public static IEnumerable enumerate_algo_hierarchy(CustomOrderDefinition algo) { + yield return algo; + foreach (var child in enumerate_algo_children(algo)) { + yield return child; + foreach (var grand_child in enumerate_algo_hierarchy(child)) + yield return grand_child; + } + } + public static IReadOnlyList get_child_algo_data(CustomOrderDefinitionImmutable defi) => get_child_algo_data(defi.CloneToMutable()); From c04ac5cd4826f996c5086efc6a9b4af345e4eaa1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 8 Mar 2019 14:21:23 -0600 Subject: [PATCH 128/218] OrderDataHelper - fix get_metadata() 'Spreader' switch-case --- src/client/spark/view/Spark/Utilities/OrderDataHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index f03bcd1b4..afbc51776 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -241,7 +241,7 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Pricer: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.pricer_order }; case CustomOrderDefinition.CustomOneofCase.Offset: return new OrderMetadata { KeyBinding = "O", Color = BTSColors.Orders.tick_order }; case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.trigger_order }; - case CustomOrderDefinition.CustomOneofCase.Spreader: goto default; + case CustomOrderDefinition.CustomOneofCase.Spreader: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order }; case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; case CustomOrderDefinition.CustomOneofCase.None: goto default; default: return _default_order_metadata; From f69301611a51ae01e876729cc81afa98baf72b51 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 8 Mar 2019 15:52:38 -0600 Subject: [PATCH 129/218] OrdersModel - for non-algo updates, set Update.Custom to null instead of populating with existing order's CustomDef --- src/client/spark/Orders/OrdersModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 53352d6ac..9e583b84f 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -182,7 +182,7 @@ namespace mbts.spark { OrderKey = order.Key, Price = price, Quantity = size, - Custom = (new_algo ?? order.Def.CustomDef).CloneToMutable() + Custom = new_algo?.CloneToMutable() }); (var key, string msg) = _handle_error(result, "Failed to update order: {0}"); bool success = key.HasValue; From 4b23e175349be2e2c004b0b57c3a049f5497b31d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 8 Mar 2019 17:25:00 -0500 Subject: [PATCH 130/218] Updating native order FIX tags when attached. --- src/lib/jetfix/codec/FIXFragment.h | 3 +- .../actors/order_manager/OrderServices.cpp | 6 ++ .../actors/order_manager/OrderServices.h | 3 + src/lib/orderman/orders/NativeOrder.cpp | 71 ++++++++++++++++--- src/lib/orderman/orders/NativeOrder.h | 1 + src/lib/orderman/orders/Order.h | 2 +- 6 files changed, 76 insertions(+), 10 deletions(-) diff --git a/src/lib/jetfix/codec/FIXFragment.h b/src/lib/jetfix/codec/FIXFragment.h index 475adc68e..1ee163111 100644 --- a/src/lib/jetfix/codec/FIXFragment.h +++ b/src/lib/jetfix/codec/FIXFragment.h @@ -88,7 +88,8 @@ public: FIXFragment&operator=(FIXFragment &&src) { this->~FIXFragment (); - _buffer = std::move (src._buffer); + _buffer = src._buffer; + _owns_buffer = src._owns_buffer; _checksum= src._checksum; _initial_offset = src._initial_offset; src._buffer = nullptr; diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index b13464b34..578845a15 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -159,6 +159,12 @@ void OrderServices::on_attach(OrderServices &new_parent, }); } +OrderRouter::RouteQueryResult OrderServices::route_order(UserID user_id, AccountID account_id, + api::Security const&sec) +{ + return _data->order_router.get_routing_record(user_id,account_id,sec); +} + OrderOpResult OrderServices::check_is_attachable() { using namespace api::orderman; diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index a1d6b51ca..352070ba6 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -70,6 +70,9 @@ class OrderServices { void report_state(const api::orderman::OrderState &); + OrderRouter::RouteQueryResult route_order(UserID, AccountID, + api::Security const&); + Limiter &limiter() { return _data->limiter; } SessionServices &get_session_services(std::string const &for_session); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 2160a330b..be8747f00 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -30,7 +30,9 @@ struct NativeOrder::PImpl { PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7), received_exchanged_order_id(false) {} + price_encoding_precision(7), exchange_order_id() { + exchange_order_id.reserve(100); + } OrderServices *services; SessionServices *session_services; @@ -41,7 +43,7 @@ struct NativeOrder::PImpl { OrderDefinition definition; OrderState state; int price_encoding_precision; - bool received_exchanged_order_id; + std::string exchange_order_id; jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; @@ -626,6 +628,55 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q) { OrderOpResult NativeOrder::on_detach() { return OrderOpResult{}; } +void NativeOrder::on_attached( + api::orderman::OrderDefinition const &new_parent) { + switch (me->state.status()) { + + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_WORKING: { + LOG(OrderMan, Info, "Native order {} has been attached to by {}", + key().value(), utils::pb::to_string(new_parent)); + + // Update FIX tags to reflect new parent's information + auto rq = me->services->route_order(UserID(new_parent.user_id()), + AccountID(new_parent.account_id()), + *me->sec); + + if (!rq.has_route) { + auto msg = fmt::format("Cannot update order routing information: {}", + rq.error_msg); + transition(me->state.status(), msg); + report_state(); + return; + } + + auto &native_state = get_native_state(me->state); + *native_state.mutable_routing_record() = rq.routing_record; + init_fix(); + if (has_exchange_order_id()) + add_exchange_order_id_to_fix(); + me->definition.set_manual_order_indicator( + api::orderman::ManualOrderIndicator::MANUAL_ORDER_INDICATOR_NO); + me->services->report_definition(me->definition); + report_state(); + break; + } + + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_ERROR: + break; + + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } +} + OrderOpResult NativeOrder::on_cancel() { auto scoped_log = me->services->log_scope("NativeOrder::on_cancel", key().value()); @@ -754,10 +805,10 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { native_state.set_native_status(er.data->order_status); native_state.set_native_type(er.data->order_type); - bool got_first_exchange_order_id = !me->received_exchanged_order_id; + bool got_first_exchange_order_id = !has_exchange_order_id(); if (got_first_exchange_order_id) { - native_state.set_exchange_order_id( - to_trim_str(er.data->exchange_order_id)); + me->exchange_order_id = to_trim_str(er.data->exchange_order_id); + native_state.set_exchange_order_id(me->exchange_order_id); add_exchange_order_id_to_fix(); } @@ -906,7 +957,12 @@ void NativeOrder::report_state() { void NativeOrder::init_fix() { bts_assert(me->sec); + using namespace jetfix; + me->create_encoding = FIXFragment{}; + me->update_encoding = FIXFragment{}; + me->cancel_encoding = FIXFragment{}; + auto const &def = me->definition; auto const &sec = *me->sec; auto const &rr = get_native_state(me->state).routing_record(); @@ -1053,7 +1109,6 @@ void NativeOrder::add_exchange_order_id_to_fix() { me->update_encoding.add(eoid); me->cancel_encoding.add(eoid); - me->received_exchanged_order_id = true; } OrderStatus map_external_status(NativeOrderStatus status) { @@ -1094,12 +1149,12 @@ OrderStatus map_external_status(NativeOrderStatus status) { } bool NativeOrder::has_exchange_order_id() { - return get_native_state(me->state).exchange_order_id().size(); + return me->exchange_order_id.size(); } void NativeOrder::transition(api::orderman::OrderStatus new_status, std::string const &msg) { - transition(Info,new_status,msg); + transition(Info, new_status, msg); } void NativeOrder::transition(log::Level level, diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 291c924a9..54eef5bab 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -28,6 +28,7 @@ class NativeOrder : public Order { OrderOpResult on_update(Price, Quantity) override; OrderOpResult on_detach() override; OrderOpResult on_cancel() override; + void on_attached(api::orderman::OrderDefinition const &new_parent) override; api::orderman::OrderDefinition on_init_from_exe_report(ExecutionReport const &, diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 43a0346d8..f9cbb720f 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -68,7 +68,7 @@ class Order { virtual OrderOpResult on_cancel() = 0; // Order has been attached to - virtual void on_attached(api::orderman::OrderDefinition const &); + virtual void on_attached(api::orderman::OrderDefinition const &new_parent); protected: virtual void warm_up_activate(OrderServicesData &, OrderServices &) {} From 609b0dceb133dbed84d18e07a7b395573590aa53 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 8 Mar 2019 17:49:51 -0500 Subject: [PATCH 131/218] Native orders now reflect new FIX tags when attached to. --- src/lib/orderman/orders/NativeOrder.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index be8747f00..96fd0d472 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -163,8 +163,10 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec, // if we made it this far we are good. init_fix(); - if (me->state.status() != ORDER_STATUS_PENDING_WORKING) + if (me->state.status() != ORDER_STATUS_PENDING_WORKING) { + me->exchange_order_id = native_state.exchange_order_id(); add_exchange_order_id_to_fix(); + } return; } @@ -656,8 +658,14 @@ void NativeOrder::on_attached( init_fix(); if (has_exchange_order_id()) add_exchange_order_id_to_fix(); + + // Update user, account and manual order indicator based on new parent me->definition.set_manual_order_indicator( api::orderman::ManualOrderIndicator::MANUAL_ORDER_INDICATOR_NO); + me->definition.set_user(new_parent.user()); + me->definition.set_user_id(new_parent.user_id()); + me->definition.set_account(new_parent.account()); + me->definition.set_account_id(new_parent.account_id()); me->services->report_definition(me->definition); report_state(); break; @@ -1104,11 +1112,8 @@ void NativeOrder::init_fix() { void NativeOrder::add_exchange_order_id_to_fix() { bts_assert(has_exchange_order_id()); - auto &state = get_native_state(me->state); - auto &eoid = state.exchange_order_id(); - - me->update_encoding.add(eoid); - me->cancel_encoding.add(eoid); + me->update_encoding.add(me->exchange_order_id); + me->cancel_encoding.add(me->exchange_order_id); } OrderStatus map_external_status(NativeOrderStatus status) { From 80ce5447e59bf693701a344040b112bdc9078dc4 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 8 Mar 2019 17:56:27 -0500 Subject: [PATCH 132/218] Validate that IcebergOrders must have child definitions. --- src/lib/orderman/orders/IcebergOrder2.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp index f268bc112..a527e8eb3 100644 --- a/src/lib/orderman/orders/IcebergOrder2.cpp +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -88,11 +88,9 @@ void IcebergOrder2::on_init_new(OrderDefinition const &def, "Show quantity must be greater than 0"); return; } - auto attach_target = OrderKey(me->def.attach_target_order_key()); - if (!ib.has_child() && attach_target == null_order_key()) { + if (!ib.has_child()) { terminate(ORDER_STATUS_REJECTED_BY_SPARK, - "Iceberg order must have a child order definition or attach to " - "an existing order"); + "Iceberg order must have a child order definition"); return; } initialize_child_builder(services.order_factory); From 429b0bb8f8d746e6c5e84239e727b6603c855cfb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Mar 2019 18:29:44 -0600 Subject: [PATCH 133/218] ObservableAggregateCollection.Aggregator implements IList (not new functionality, just refactored some methods) --- .../ObservableAggregateCollection.cs | 65 +++++++++++++------ 1 file changed, 45 insertions(+), 20 deletions(-) diff --git a/src/client/spark/core/Collections/ObservableAggregateCollection.cs b/src/client/spark/core/Collections/ObservableAggregateCollection.cs index a1b726c95..ca749c13b 100644 --- a/src/client/spark/core/Collections/ObservableAggregateCollection.cs +++ b/src/client/spark/core/Collections/ObservableAggregateCollection.cs @@ -11,7 +11,7 @@ namespace mbts.ui.controls { var rv = new ObservableAggregateCollection(); var aggregator = new Aggregator(rv); foreach (var o in source) - aggregator.add_collection(select_inner(o)); + aggregator.Add(select_inner(o)); source.CollectionChanged += _mk_outter_collection_changed_handler(aggregator, select_inner); return rv; } @@ -20,7 +20,7 @@ namespace mbts.ui.controls { aggregate.Clear(); var aggregator = new Aggregator(aggregate); foreach (var o in source) - aggregator.add_collection(select_inner(o)); + aggregator.Add(select_inner(o)); var handler = _mk_outter_collection_changed_handler(aggregator, select_inner); source.CollectionChanged += handler; return Disposable.Create(() => source.CollectionChanged -= handler); @@ -37,23 +37,23 @@ namespace mbts.ui.controls { add_collections(e.NewStartingIndex, e.NewItems); break; case NotifyCollectionChangedAction.Reset: - aggregator.clear_collections(); + aggregator.Clear(); foreach (TOutter o in (IEnumerable)s) - aggregator.add_collection(select_inner(o)); + aggregator.Add(select_inner(o)); break; } }; void add_collections(int new_item_index, IList new_items) { foreach (TOutter o in new_items) - aggregator.insert_collection(new_item_index++, select_inner(o)); + aggregator.Insert(new_item_index++, select_inner(o)); } void remove_collections(int old_item_index, IList old_items) { foreach (TOutter o in old_items) - aggregator.remove_collection_at(old_item_index); + aggregator.RemoveAt(old_item_index); } } - internal class Aggregator : IDisposable { + internal class Aggregator : IDisposable, IList>, IReadOnlyList> { readonly ObservableCollection _target; readonly List> _collections = new List>(); bool _is_disposed; @@ -61,28 +61,39 @@ namespace mbts.ui.controls { public Aggregator(ObservableCollection target, params ObservableCollection[] collections) { _target = target; foreach (var c in collections) - add_collection(c); + Add(c); } - public void add_collection(ObservableCollection collection) { + public ObservableCollection this[int index] { + get => _collections[index]; + set => Insert(index, value); + } + + public int Count => _collections.Count; + + public bool IsReadOnly => false; + + public void Add(ObservableCollection collection) { _check_disposed(); _target.AddRange(collection); _collections.Add(collection); collection.CollectionChanged += _on_collection_changed; } - public void remove_collection(ObservableCollection collection) { + public bool Remove(ObservableCollection collection) { + int num_before = _collections.Count; _check_disposed(); _remove_collection_items(collection, out int _, out int collection_index); _collections.RemoveAt(collection_index); collection.CollectionChanged -= _on_collection_changed; + return _collections.Count < num_before; } - public void insert_collection(int index, ObservableCollection collection) { + public void Insert(int index, ObservableCollection collection) { _check_disposed(); if (index < 0 || index > _collections.Count) throw new ArgumentOutOfRangeException(nameof(index)); if (index == _collections.Count) - add_collection(collection); + Add(collection); else { _collections.Insert(index, collection); _on_collection_changed(collection, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, collection, 0)); @@ -90,12 +101,12 @@ namespace mbts.ui.controls { } } - public void remove_collection_at(int index) { + public void RemoveAt(int index) { _check_disposed(); - remove_collection(_collections[index]); + Remove(_collections[index]); } - public void clear_collections() { + public void Clear() { _check_disposed(); foreach (var c in _collections) c.CollectionChanged -= _on_collection_changed; @@ -103,6 +114,15 @@ namespace mbts.ui.controls { _target.Clear(); } + public bool Contains(ObservableCollection item) => + _collections.Contains(item); + + public void CopyTo(ObservableCollection[] array, int arrayIndex) => + _collections.CopyTo(array, arrayIndex); + + public int IndexOf(ObservableCollection item) => + _collections.IndexOf(item); + public void Dispose() { if (!_is_disposed) { foreach (var c in _collections) @@ -111,6 +131,9 @@ namespace mbts.ui.controls { } } + public IEnumerator> GetEnumerator() => _collections.GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => _collections.GetEnumerator(); + void _on_collection_changed(object sender, NotifyCollectionChangedEventArgs e) { _check_disposed(); int offset = _get_collection_start(sender); @@ -166,10 +189,12 @@ namespace mbts.ui.controls { public ObservableAggregateCollection(params ObservableCollection[] collections) => _aggregator = new ObservableAggregateCollection.Aggregator(this, collections); - public void add_collection(ObservableCollection collection) => _aggregator.add_collection(collection); - public void remove_collection(ObservableCollection collection) => _aggregator.remove_collection(collection); - public void insert_collection(int index, ObservableCollection collection) => _aggregator.insert_collection(index, collection); - public void remove_collection_at(int index) => _aggregator.remove_collection_at(index); - public void clear_collections() => _aggregator.clear_collections(); + public IReadOnlyList> source_collections => _aggregator; + + public void add_collection(ObservableCollection collection) => _aggregator.Add(collection); + public void remove_collection(ObservableCollection collection) => _aggregator.Remove(collection); + public void insert_collection(int index, ObservableCollection collection) => _aggregator.Insert(index, collection); + public void remove_collection_at(int index) => _aggregator.RemoveAt(index); + public void clear_collections() => _aggregator.Clear(); } } \ No newline at end of file From 93afb5b602855cd4c3682138779ebe9a469e1cd8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Mar 2019 19:06:33 -0600 Subject: [PATCH 134/218] introduce FillsVMContainer --- .../spark/Modules/Trading/Fills/FillsVM.cs | 22 +++++---- .../Modules/Trading/Fills/FillsVMContainer.cs | 49 +++++++++++++++++++ 2 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 src/client/spark/Modules/Trading/Fills/FillsVMContainer.cs diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 80ae73adb..523ea62c8 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -14,10 +14,13 @@ using mbts.ui.shell; using mbts.ui.utility; using mbts.utils; using System; +using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Collections.Specialized; using System.ComponentModel; using System.Linq; +using System.Reactive.Disposables; using System.Reactive.Linq; using System.Reactive.Subjects; using System.Windows.Data; @@ -42,7 +45,7 @@ namespace mbts.spark { public FillsVM(IBus bus, OrdersModel model, IObservable state_obs, IWindowSettingsManager settings_manager) : this(bus, model, state_obs, _get_observable(bus, model, state_obs), settings_manager) { } - FillsVM(IBus bus, OrdersModel model, IObservable state_obs, IConnectableObservable> fills_source, IWindowSettingsManager settings_manager) { + public FillsVM(IBus bus, OrdersModel model, IObservable state_obs, IObservable> fills_source, IWindowSettingsManager settings_manager) { _model = model; _settings_manager = settings_manager; /// Columns @@ -98,16 +101,17 @@ namespace mbts.spark { // grid settings grid_settings_manager = new SimpleGridSettingsManager(columns, new Dictionary { }, rows); // this will initialize the immutable properties that correspond to the col_settings_flags above (e.g. Bid/Ask font_color_override, etc.) - grid_settings_manager.load_from(settings_manager.current_settings()); + if (_settings_manager != null) + grid_settings_manager.load_from(_settings_manager.current_settings()); // - _dispose = Disposable.Create( + _dispose = new CompositeDisposable( ObservableAutoWrapper.connect(col_tups, columns, ct => ct.col), fills_source.OnDispatcher().Subscribe(t => { _rows.update(t); Set(ref _total_row_count, t.state.Count, nameof(total_row_count)); }), state_obs.OnDispatcher().Subscribe(s => { - if (s.grid != null) { + if (s.grid != null && _settings_manager != null) { // this means we are not using defaults, // Note: settings_manager in turn notifies grid_settings_manager of this update _settings_manager.instance_settings = s.grid; @@ -120,8 +124,8 @@ namespace mbts.spark { }; rows_manager.on_settings(fs, s.sorting_criterion); }), - settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager), - fills_source.Connect() + settings_manager == null ? Disposable.empty : settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager), + (fills_source as IConnectableObservable>)?.Connect() ?? Disposable.empty ); // local methods void add_col(Columns col_key, string header, Func get_text, IDataGridColumnPersistentFilter filter, string filter_template, double width) => @@ -153,12 +157,12 @@ namespace mbts.spark { public IEnumerable get_sorting_criterion() => _sort_manager.create(); + public void on_sorting(object sender, DIYGridSortingEventArgs e) => + _sort_manager.on_sorting(e); + static Columns _col_key(ColumnBase column) => ((IKeyedColumn)column).key; - void IHandleGridSorting.on_sorting(object sender, DIYGridSortingEventArgs e) => - _sort_manager.on_sorting(e); - public FilterStates get_filters() => _filters_manager.create(); diff --git a/src/client/spark/Modules/Trading/Fills/FillsVMContainer.cs b/src/client/spark/Modules/Trading/Fills/FillsVMContainer.cs new file mode 100644 index 000000000..48a165171 --- /dev/null +++ b/src/client/spark/Modules/Trading/Fills/FillsVMContainer.cs @@ -0,0 +1,49 @@ +using mbts.ui; +using mbts.ui.controls; +using System; + +namespace mbts.spark { + /// + /// This class provides a stable DataContext for a fills view, with an internal that may be disposed and recreated as needed. + /// + class FillsVMContainer : IHandleGridSorting, IDisposable, IWillLetYouKnowWhenIDispose { + bool _disposed; + FillsVM _value; + + public event Action OnDisposed; + + public FillsVM value { + get => _value; + set { + if (value != _value) { + if (_disposed) + throw new ObjectDisposedException(nameof(FillsVMContainer)); + Disposable.replace(ref _value, value); + if (_value != null) { + rows.add_collection(_value.rows); + columns.add_collection(_value.columns); + } else { + rows.clear_collections(); + columns.clear_collections(); + } + } + } + } + + public ObservableAggregateCollection rows { get; } = new ObservableAggregateCollection(); + public ObservableAggregateCollection columns { get; } = new ObservableAggregateCollection(); + + public void Dispose() { + if (_disposed) + throw new ObjectDisposedException(nameof(FillsVMContainer)); + value = null; + OnDisposed?.Invoke(true); + _disposed = true; + } + + public void on_sorting(object sender, DIYGridSortingEventArgs e) { + if (!_disposed) + _value?.on_sorting(sender, e); + } + } +} \ No newline at end of file From c8cd2ae1ade67392f1ecccb869308e42cbb9ea7e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Mar 2019 19:18:10 -0600 Subject: [PATCH 135/218] fix 'sync_with_never_duplicate()' - should remove items from 'dest' that aren't in 'src' --- .../spark/core/Utility/CollectionHelper.cs | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/client/spark/core/Utility/CollectionHelper.cs b/src/client/spark/core/Utility/CollectionHelper.cs index 9778c41d0..1a29f939b 100644 --- a/src/client/spark/core/Utility/CollectionHelper.cs +++ b/src/client/spark/core/Utility/CollectionHelper.cs @@ -90,20 +90,25 @@ namespace mbts.utils { } // Note: this is not optimized, be wary of use with large collections - public static void sync_with_never_duplicate(ObservableCollection dest, IEnumerable src) => + public static void sync_with_never_duplicate(IList dest, IEnumerable src) => sync_with_never_duplicate(dest, src, EqualityComparer.Default); // Note: this is not optimized, be wary of use with large collections - public static void sync_with_never_duplicate(ObservableCollection dest, IEnumerable src, IEqualityComparer comp) { - int i = 0; - foreach (var val in src.empty_if_null()) { - int curr_index = dest.IndexOf(val); + public static void sync_with_never_duplicate(IList dest, IEnumerable src, IEqualityComparer comp) { + var src_list = src as IList ?? new List(src); + var src_set = src as ISet ?? new HashSet(src_list); + for (int i = 0; i < dest.Count; i++) { + if (!src_set.Contains(dest[i])) + dest.RemoveAt(i); + } + for (int i = 0; i < src_list.Count; i++) { + int curr_index = dest.IndexOf(src_list[i]); if (curr_index == i) { continue; - } else if (curr_index > 0 && curr_index < dest.Count) { + } else if (curr_index >= 0 && curr_index < dest.Count) { dest.RemoveAt(curr_index); } - dest.Insert(i++, val); + dest.Insert(i, src_list[i]); } } @@ -112,11 +117,16 @@ namespace mbts.utils { // Note: this is not optimized, be wary of use with large collections public static void sync_with_never_duplicate(ObservableCollection dest, IEnumerable src, Func create, Func key_selector, Func src_key_selector, IEqualityComparer key_comparer) { - int i = 0; - var src_map = src.ToDictionary(src_key_selector); + var src_list = src as IList ?? new List(src); + var src_map = src_list.ToDictionary(src_key_selector); + for (int i = 0; i < dest.Count; i++) { + var k = key_selector(dest[i]); + if (!src_map.ContainsKey(k)) + dest.RemoveAt(i); + } var dest_map = dest.ToDictionary(key_selector); - foreach (var val in src.empty_if_null()) { - TKey key = src_key_selector(val); + for (int i = 0; i < src_list.Count; i++) { + TKey key = src_key_selector(src_list[i]); if (dest_map.TryGetValue(key, out T dval)) { int curr_index = dest.IndexOf(dval); if (curr_index != i) { @@ -124,9 +134,8 @@ namespace mbts.utils { dest.Insert(i, dval); } } else { - dest.Insert(i, create(val)); + dest.Insert(i, create(src_list[i])); } - ++i; } } From 36684f8ee55e28d079367bf32dc773dad1688374 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Mar 2019 21:29:49 -0600 Subject: [PATCH 136/218] ObservableFilterCollection - in 'reset(),' clear the target collection if source is empty --- .../spark/core/Collections/ObservableFilterCollection.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/spark/core/Collections/ObservableFilterCollection.cs b/src/client/spark/core/Collections/ObservableFilterCollection.cs index 9f6760db1..5f6baba1d 100644 --- a/src/client/spark/core/Collections/ObservableFilterCollection.cs +++ b/src/client/spark/core/Collections/ObservableFilterCollection.cs @@ -87,7 +87,11 @@ namespace mbts.ui.utility { foreach (var value in source_collection.OfType()) value.PropertyChanged += on_item_PropertyChanged; } - CollectionHelper.sync_with_never_duplicate(filtered_collection, source_collection.Where(filter)); + if (source_collection.Count == 0) { + filtered_collection.Clear(); + } else { + CollectionHelper.sync_with_never_duplicate(filtered_collection, source_collection.Where(filter)); + } } } } From 82a93e39f83b5c43ff0f65282b6ec31568191561 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Mar 2019 21:32:12 -0600 Subject: [PATCH 137/218] DIYGrid - use max 'visible' column's font size to determine min row height --- src/client/spark/view/Controls/DIYGrid/DIYGrid.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs index c84ba5b27..b3f413ec1 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs +++ b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs @@ -704,8 +704,8 @@ namespace mbts.ui.controls { (o, v) => { if (DoubleHelper.IsNaNOrInfinity(v)) v = 0; - if (!o._visible_columns.is_null_or_empty() && o.Columns != null) { - double max_font_size = o.Columns.Max(c => c.font_size); + if (!o._visible_columns.is_null_or_empty()) { + double max_font_size = o._visible_columns.Max(c => c.font_size); double min_row_height = o.RowPadding.Top + max_font_size + o.RowPadding.Bottom; if (v < min_row_height) return min_row_height; From af1fbaf3ed1986fc9a5f91bbfa8340b6cc238d38 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Mar 2019 21:39:03 -0600 Subject: [PATCH 138/218] implement TableUpdate filter with IObservable predicate --- src/client/spark_api/api/Update.cs | 104 +++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index 1c751e774..4866d1b8a 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -277,6 +277,53 @@ namespace bts.api.core { internal Builder to_builder() => new Builder(this); + public static class FilterHelper { + internal static TableUpdate on_source_changed(TableUpdate filtered_target, IEnumerable raw_added, IEnumerable> raw_changes, IEnumerable raw_removed, Func predicate) { + var builder = filtered_target._state.ToBuilder(); + var added = new List(raw_added.Where(predicate)); + var removed = new List(raw_removed.Where(predicate)); + var changes = new List>(); + foreach (var ch in raw_changes) { + if (predicate(ch.Old)) { + if (predicate(ch.New)) { + changes.Add(ch); + } else { + removed.Add(ch.Old); + } + } else if (predicate(ch.New)) { + added.Add(ch.New); + } + } + var key = filtered_target.key_extractor; + builder.RemoveRange(removed.Select(key)); + foreach (var ch in changes) + builder[key(ch.New)] = ch.New; + builder.AddRange(added.Select(v => new KeyValuePair(key(v), v))); + return new TableUpdate(builder.ToImmutable(), added, changes, removed, key); + } + + internal static TableUpdate on_predicate_changed(TableUpdate filtered_target, IReadOnlyDictionary unfiltered_state, Func old_predicate, Func new_predicate) { + var added = new List(); + var removed = new List(); + foreach (var kv in unfiltered_state) { + if (old_predicate(kv.Value)) { + if (new_predicate(kv.Value)) { + continue; + } else { + removed.Add(kv.Value); + } + } else if (new_predicate(kv.Value)) { + added.Add(kv.Value); + } + } + var builder = filtered_target._state.ToBuilder(); + var key = filtered_target.key_extractor; + builder.RemoveRange(removed.Select(key)); + builder.AddRange(added.Select(v => new KeyValuePair(key(v), v))); + return new TableUpdate(builder.ToImmutable(), added, Array.Empty>(), removed, key); + } + } + /// /// This class is used to aggregate a series of changes into a single update. /// @@ -512,6 +559,63 @@ namespace bts.api.core { public static IObservable> Filter(this IObservable> source, Func predicate, Func key) where TKey : IEquatable => source.Scan(TableUpdate.mk_empty(key), (src, tgt) => _apply_predicate(src, tgt, predicate, key)); + public static IObservable> Filter(this IObservable> table_source, IObservable> predicate_source, Func key) where TKey : IEquatable => + Observable.Create>(observer => { + TableUpdate unfiltered_table = TableUpdate.mk_empty(key), filtered_table = TableUpdate.mk_empty(key); + Func predicate = _ => true; + Log.DataFlow.diag($"Create Table Filter {typeof(T).Name}"); + bool is_busy = false; + var op_queue = new Queue<(TableUpdate pending_table, Func pending_predicate)>(); + return new CompositeDisposable(table_source.Subscribe(on_table), predicate_source.Subscribe(on_predicate)); + + void on_predicate(Func new_predicate) { + if (try_begin_op((null, new_predicate))) + process_predicate(new_predicate); + } + void process_predicate(Func new_predicate) { + filtered_table = TableUpdate.FilterHelper.on_predicate_changed(filtered_table, unfiltered_table.state, predicate, new_predicate); + predicate = new_predicate; + on_op_completed(); + } + void on_table(TableUpdate new_table) { + if (try_begin_op((new_table, null))) + process_table(new_table); + } + void process_table(TableUpdate new_table) { + unfiltered_table = new_table; + filtered_table = TableUpdate.FilterHelper.on_source_changed(filtered_table, new_table.added, new_table.changes, new_table.removed, predicate); + on_op_completed(); + } + bool try_begin_op((TableUpdate table, Func predicate) op) { + lock (op_queue) { + if (is_busy) { + op_queue.Enqueue(op); + return false; + } else { + is_busy = true; + return true; + } + } + } + void on_op_completed() { + observer.OnNext(filtered_table); + Log.assert(is_busy); + (TableUpdate table, Func predicate) buffered_op; + lock (op_queue) { + if (op_queue.Count == 0) { + is_busy = false; + return; + } + buffered_op = op_queue.Dequeue(); + } + if (buffered_op.table != null) { + process_table(buffered_op.table); + } else { + process_predicate(buffered_op.predicate); + } + } + }); + static TableUpdate _apply_predicate(TableUpdate tgt_table, TableUpdate src_table, Func predicate, Func key) where TKey : IEquatable { var added = src_table.added.Where(predicate).ToList(); var removed = src_table.removed.Where(predicate).ToList(); From 1494c37cc7a9220b33871a3bfa4e9065b7e6acb9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 9 Mar 2019 21:47:06 -0600 Subject: [PATCH 139/218] OrderBook - add 'fills-slave-grid' above the algo editor (shows fills for current row-selection) --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 112 +++++++++++- .../OrderBook/OrderBookWindowFactory.cs | 9 +- .../Trading/OrderBook/View/OrderBookView.xaml | 119 ++++++++++-- .../OrderBook/View/OrderBookView.xaml.cs | 17 ++ .../spark/view/Spark/Core/OrderUtils.cs | 16 ++ .../ObservableTree/ImmutableUpdate.cs | 65 +++++++ .../ObservableTree/ObservableNode.cs | 173 ++++++++++++++++++ .../ObservableTree/ObservableTree.cs | 99 ++++++++++ .../spark_core/utils/StringBuilderEx.cs | 13 ++ 9 files changed, 600 insertions(+), 23 deletions(-) create mode 100644 src/client/spark_core/Collections/ObservableTree/ImmutableUpdate.cs create mode 100644 src/client/spark_core/Collections/ObservableTree/ObservableNode.cs create mode 100644 src/client/spark_core/Collections/ObservableTree/ObservableTree.cs diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index bc6636ad8..d1a18ada3 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -1,6 +1,8 @@ using bts; using bts.api; +using bts.api.core; using bts.api.orderman; +using bts.collections; using bts.shell; using bts.spark; using bts.utils; @@ -14,6 +16,7 @@ using mbts.ui.shell; using mbts.ui.utility; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; @@ -33,16 +36,21 @@ using Columns = mbts.spark.OrderBookGridView.ColumnKeys; namespace mbts.spark { partial class OrderBookVM : DisposableViewModelBase, IHandleRowSelection, IHandleGridSorting { - const double _min_visible_algo_editor_width = 10; + const double + _min_visible_algo_editor_width = 10, + _min_visible_algo_editor_height = 100; readonly IBus _bus; readonly OrdersModel _model; readonly Property _current_row; + readonly Property _fills_slave_grid_is_visible; readonly OrderBookRowCollection _row_collection; readonly OrderBookColumnCollection _columns; readonly IWindowSettingsManager _settings_manager; readonly SelectedAlgosMonitor _selected_algo_mon; bool _algo_editor_is_visible = OrderBookStartupData.Default.algo_editor_is_visible; - double _raw_algo_editor_width = OrderBookStartupData.Default.algo_editor_width; + double + _raw_algo_editor_width = OrderBookStartupData.Default.algo_editor_width, + _raw_algo_editor_height = OrderBookStartupData.Default.algo_editor_height; OrderBookStartupData _state; bool _is_row_collection_populated; @@ -53,6 +61,7 @@ namespace mbts.spark { algo_vm = AlgoDefinitionVM.create(model, new AlgoData(new CustomOrderDefinitionImmutable(new CustomOrderDefinition { Limit = new LimitOrderDefinition() })), editing_permissions: AlgoEditingPermissions.AllowEditValues); algo_vm.editing_permissions_mask = AlgoEditingPermissions.None; algo_vm.algo_root = null; + _fills_slave_grid_is_visible = backing(nameof(fills_slave_grid_is_visible), false); _settings_manager = settings_manager; _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(x => (x.added.Values, x.removed.Values))); // we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front @@ -65,12 +74,31 @@ namespace mbts.spark { expand_all_rows_command = new DelegateCommand(_row_collection.expand_all); var modify_selected_algos_async_cmd = new AsyncCommand(_modify_selected_algos_async, () => _selected_algo_mon.all_active); modify_selected_algos_command = modify_selected_algos_async_cmd; - toggle_algo_editor_is_visible_cmd = new DelegateCommand(() => this.algo_editor_is_visible = !this.algo_editor_is_visible); + toggle_algo_editor_is_visible_cmd = new DelegateCommand(() => algo_editor_is_visible = !algo_editor_is_visible); + toggle_fills_slave_grid_is_visible_cmd = new DelegateCommand(() => fills_slave_grid_is_visible = !fills_slave_grid_is_visible); grid_settings_manager = _create_grid_settings_manager(owner_title, bus, notification_service, model, rows, core_columns); _selected_algo_mon.common_algo_changed += on_common_selected_algo_changed; _selected_algo_mon.all_active_changed += on_all_selected_orders_active_changed; + // The order tree is used to create the row-filter used by the fills-slave-window (for more details, read below): + // When a row (order) is selected, a subscription is made (with order_tree) to observe that order's children. + // The fills grid then uses the resultant hierarchical set of selected orders to only display fills of the selected rows (orders). + // In pseudo code, the filter is: + // fill_row => selected_order_keys.Contains(fill_row.order_key) + var order_tree = new ObservableTree<(uint key, uint parent), uint>(o => o.key, o => o.parent); concat_disposable( model.on_order_tuples.OnDispatcher().Subscribe(_row_collection.update), + model.on_orders.Subscribe(table => { + foreach ((var sec, var order) in table.removed) + order_tree.remove(order.Key); + foreach (var ch in table.changes) { + if (ch.Old.order.ParentKey != ch.New.order.ParentKey) { + order_tree.remove(ch.Old.order.Key); + order_tree.add((ch.New.order.Key, ch.New.order.ParentKey)); + } + } + foreach ((var sec, var order) in table.added) + order_tree.add((order.Key, order.ParentKey)); + }), grid_settings_manager, algo_vm.connect_data(Observable.Return(model)), algo_vm.connect_data(Observable.FromEvent, SecurityImmutable?>( @@ -78,6 +106,13 @@ namespace mbts.spark { cb => _selected_algo_mon.common_spreader_sec_changed += cb, cb => _selected_algo_mon.common_spreader_sec_changed -= cb)), algo_vm, + _fills_slave_grid_is_visible.observe_current(true) + .Subscribe(is_visible => fills_vm.value = is_visible ? + new FillsVM( + bus, model, Observable.Return(FillsWindowFactory.StartupData.Default()), + model.on_fill_tuples.Filter(mk_fills_slave_predicate(), ft => ft.fill.FillKey), null + ) : + null), Disposable.Create(() => { _columns.filter_changed -= on_filter_changed; _row_collection.CollectionChanged -= _row_collection_CollectionChanged; @@ -89,6 +124,14 @@ namespace mbts.spark { if (settings_manager != null) { concat_disposable(settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager)); } + IObservable> mk_fills_slave_predicate() => + order_tree.subscribe( + _subscribe_selected_order_keys(selected_rows) + // a buffer is used bc the drag-style selection may otherwise cause rapid changes to the filter; with a lot of orders, processing each new filter could carry significant performance cost. + .BufferLatest(TimeSpan.FromSeconds(0.2)) + ) + .BufferLatest(TimeSpan.FromSeconds(0.2)) + .Select(update => new Func(ft => update.state.ContainsKey(ft.fill.OrderKey))); void on_filter_changed() => _row_collection.filter = _columns.get_filter(); void on_common_selected_algo_changed(CustomOrderDefinitionImmutable? oldval, CustomOrderDefinitionImmutable? newval) { if (newval.HasValue) { @@ -127,6 +170,8 @@ namespace mbts.spark { } public OrderRecordImmutable? current_order => current_row?.order; public AlgoDefinitionVM algo_vm { get; } + public FillsVMContainer fills_vm { get; } = new FillsVMContainer(); + public bool fills_slave_grid_is_visible { get => _fills_slave_grid_is_visible.Value; set => _fills_slave_grid_is_visible.set(value); } public ObservableCollection selected_rows { get; } = new ObservableCollection(); public IEnumerable selected_orders => selected_rows.Select(r => r.order); public _GridSettingsManager grid_settings_manager { get; } @@ -134,6 +179,7 @@ namespace mbts.spark { public ICommand expand_all_rows_command { get; } public ICommand modify_selected_algos_command { get; } public ICommand toggle_algo_editor_is_visible_cmd { get; } + public ICommand toggle_fills_slave_grid_is_visible_cmd { get; } public bool algo_editor_is_visible { get => _algo_editor_is_visible; set { @@ -151,6 +197,16 @@ namespace mbts.spark { } } } + public double algo_editor_height { + get => algo_editor_is_visible ? Math.Max(_raw_algo_editor_height, _min_visible_algo_editor_height) : 0; + set { + if (_raw_algo_editor_height != value) { + _raw_algo_editor_height = value; + if (algo_editor_is_visible) + RaisePropertyChanged(); + } + } + } public bool is_row_collection_populated { get => _is_row_collection_populated; set => Set(ref _is_row_collection_populated, value); @@ -184,7 +240,7 @@ namespace mbts.spark { public OrderBookStartupData create() { var (filters, sorting) = _columns.create(); var gs = grid_settings_manager.create(); - return new OrderBookStartupData(filters, gs.general.with(sorting_criterion: sorting), _algo_editor_is_visible, _raw_algo_editor_width, gs.predicate_animations, use_defaults: _settings_manager.instance_settings == null); + return new OrderBookStartupData(filters, gs.general.with(sorting_criterion: sorting), _algo_editor_is_visible, _raw_algo_editor_width, _raw_algo_editor_height, fills_slave_grid_is_visible, gs.predicate_animations, use_defaults: _settings_manager.instance_settings == null); } public void load_from(OrderBookStartupData state) { @@ -192,6 +248,8 @@ namespace mbts.spark { _state = state; algo_editor_is_visible = state.algo_editor_is_visible; algo_editor_width = state.algo_editor_width; + algo_editor_height = state.algo_editor_height; + fills_slave_grid_is_visible = state.fills_slave_grid_is_visible; var gs = state.grid_settings_wrapper(); if (gs != null) { grid_settings_manager.load_from(gs); @@ -335,6 +393,52 @@ namespace mbts.spark { } } + static IObservable> _subscribe_selected_order_keys(ObservableCollection selected_rows) => + Observable.Create>(o => { + bool waiting_for_mouse_up = false; + var sub_container = new DisposableContainer(); + var builder = ImmutableHashSet.Empty.ToBuilder(); + foreach (var row in selected_rows) + builder.Add(row.order_key); + var selected_keys = builder.ToImmutable(); + o.OnNext(selected_keys); + return Disposable.Create(selected_rows.Subscribe(on_selection_changed), sub_container); + void on_selection_changed(object sender, NotifyCollectionChangedEventArgs e) { + if (waiting_for_mouse_up) + return; + switch (e.Action) { + case NotifyCollectionChangedAction.Add: + case NotifyCollectionChangedAction.Replace: + foreach (OrderBookRowVM row in e.NewItems) + selected_keys = selected_keys.Add(row.order_key); + break; + case NotifyCollectionChangedAction.Remove: + foreach (OrderBookRowVM row in e.OldItems) + selected_keys = selected_keys.Remove(row.order_key); + break; + case NotifyCollectionChangedAction.Reset: + selected_keys = ImmutableHashSet.Empty; + break; + default: return; + } + if (Mouse.LeftButton == MouseButtonState.Pressed) { + waiting_for_mouse_up = true; + wait_for_mouse_up(); + async void wait_for_mouse_up() { + await Wait.until_true(() => Mouse.LeftButton == MouseButtonState.Released, TimeSpan.FromSeconds(60), 333); + builder = ImmutableHashSet.Empty.ToBuilder(); + foreach (var row in selected_rows) + builder.Add(row.order_key); + selected_keys = builder.ToImmutable(); + o.OnNext(selected_keys); + waiting_for_mouse_up = false; + } + } else { + o.OnNext(selected_keys); + } + } + }); + /// /// Monitors selected rows, and determines whether or not they are all active-orders, with a common algo structure. /// When all selected rows satisfy this condition, will be non-null, and its value may be used to populate algo-editor panel on the right side of the window. diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index 9df7c2ee0..01d41c7eb 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -9,6 +9,7 @@ using mbts.spark.filters; using mbts.ui; using mbts.ui.controls; using mbts.ui.settings; +using mbts.ui.shell; using ProtoBuf; using System; using System.Collections.Generic; @@ -60,6 +61,10 @@ namespace bts.shell { public bool algo_editor_is_visible { get; set; } [ProtoMember(17)] public double algo_editor_width { get; set; } + [ProtoMember(18)] + public double algo_editor_height { get; set; } + [ProtoMember(19)] + public bool fills_slave_grid_is_visible { get; set; } [ProtoMember(20)] [Obsolete] List _predicate_animations; @@ -68,11 +73,13 @@ namespace bts.shell { public OrderBookStartupData() { } - public OrderBookStartupData(FilterStates filters, GridSettings grid = default, bool algo_editor_is_visible = false, double algo_editor_width = 0, IEnumerable predicate_animations = null, bool use_defaults = false) { + public OrderBookStartupData(FilterStates filters, GridSettings grid = default, bool algo_editor_is_visible = false, double algo_editor_width = 0, double algo_editor_height = 0, bool fills_slave_grid_is_visible = false, IEnumerable predicate_animations = null, bool use_defaults = false) { this.filters = filters; this.use_defaults = use_defaults; this.algo_editor_is_visible = algo_editor_is_visible; this.algo_editor_width = algo_editor_width; + this.algo_editor_height = algo_editor_height; + this.fills_slave_grid_is_visible = fills_slave_grid_is_visible; #pragma warning disable CS0612 // Type or member is obsolete this.grid = grid; _predicate_animations = new List(); diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml index 4c7503351..706e73d7c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml @@ -5,14 +5,32 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sp="clr-namespace:mbts.spark" + xmlns:u="clr-namespace:mbts.ui" + xmlns:c="clr-namespace:mbts.ui.controls" xmlns:cv="clr-namespace:mbts.ui.converters" xmlns:usp="clr-namespace:mbts.ui.spark" + xmlns:sys="clr-namespace:System;assembly=mscorlib" Grid.Row="0" FocusManager.IsFocusScope="True" Background="{StaticResource CommonBackground}" > - + + + + + 5 + 5 + + + @@ -35,31 +53,96 @@ Panel.ZIndex="1" HorizontalAlignment="Left" VerticalAlignment="Stretch" - Width="5" + Width="{StaticResource GridSplitterWidth}" BorderThickness="1,0,0,0" - > - - - - - + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - + - + + + + - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + +