From f62df97f1d96518fc0dcfa66f92ea831bb2183c2 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 3 Sep 2019 10:20:17 -0400 Subject: [PATCH] OnixS instructions don't work. Wait to start the handlers until the market is open. --- .../md/platforms/mdp3_onixs/MDP3Main.cpp | 70 ++++++++++++------- .../sparkd/md/platforms/mdp3_onixs/MDP3Main.h | 19 +++-- src/server/sparkd/md/run_md.cpp | 4 +- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index cd1eac9cf..939217475 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -25,10 +25,11 @@ using std::size_t; namespace bts { namespace md { -MDP3Main::MDP3Main() : +MDP3Main::MDP3Main(MBOWriter* mbo) : _index(), _recorder ({ utils::Dispatcher::current(), [=](ExchangeKey k) { return SecurityKey(_index.get_key(k.value())); } }), - _producer(PLATFORM_MDP3ONIXS, _recorder ), + _producer(PLATFORM_MDP3ONIXS, _recorder), + _mbo(mbo), // _settlement_recorder(PLATFORM_MDP3ONIXS), _engines(), _handlers(), @@ -117,8 +118,7 @@ map> create_feed_engines(const vector& symbols, MBOWriter* mbo) { +void MDP3Main::start(std::vector& symbols) { await_cme_config(); initialize(); const auto& channels = parse_channels(symbols); _engines = create_feed_engines(channels); for (const auto& channel : channels) { - unique_ptr phandler = prepare_handler(channel.id, mbo); - _listeners.push_back(prepare_listener(*phandler, channel, mbo)); - _handlers.insert(std::make_pair(channel.id, move(phandler))); + unique_ptr phandler = prepare_handler(channel.id); + _listeners.push_back(prepare_listener(*phandler, channel)); + _handlers.insert(std::make_pair(channel.id, ChannelHandler{ false, move(phandler)} )); std::stringstream symstr; for (const auto& sym : channel.symbols) { symstr << sym.symbol() << "-" << SecurityType_Name(sym.type()) << " "; } LOG(md,Info, "CME: Initialized channel {} ({})",channel.id,symstr.str()); } - for (auto& pair : _handlers) { - onixs::SessionSettings settings = session_settings_for_channel(pair.first, mbo); - pair.second->start(settings); - } + start_handlers(); LOG(md,Info, "** CME MDP3 Publisher started **"); } +bool should_start(const CMEOptions::CMEChannel& options) { + if (options.sunday_pre_open() && + datetime::is_local_time_sunday()) { + return false; + } + return true; +} + +void MDP3Main::start_handlers() { + size_t count = 0; + for (auto& pair : _handlers) { + const auto& options = channel_settings_for(pair.first); + if (!pair.second.started && should_start(options)) { + onixs::SessionSettings settings = session_settings_for_channel(options, _mbo); + pair.second.handler->start(settings); + pair.second.started = true; + } + if(pair.second.started) ++count; + } + if (count != _handlers.size()) { + // If some handlers were not started try again later + utils::Dispatcher::current().post([this]() { start_handlers(); }, /*1 hour*/ 60*60*1000); + } +} + void MDP3Main::send_heartbeats() { - for (const auto& listener: _listeners) + for (const auto& listener: _listeners) { listener->heartbeat(); - - // utils::DispatcherTimer settlement_timer(disp, 100, [&]() { - // _settlement_recorder.do_work(); - // }); - // settlement_timer.start(); + } } void MDP3Main::initialize() { @@ -203,7 +221,7 @@ void MDP3Main::initialize() { // // // Initialize HandlerSettings and allocate the channel Handler -unique_ptr MDP3Main::prepare_handler(const string& channel_id, MBOWriter* mbo) { +unique_ptr MDP3Main::prepare_handler(const string& channel_id) { const auto& pub_options = config::get(); const auto& options = channel_settings_for(channel_id); LOG(md,Info,"Loaded channel options for channel {}:\n{}",channel_id ,options.DebugString()); @@ -216,7 +234,7 @@ unique_ptr MDP3Main::prepare_handler(const string& channel_id, M settings.bookManagement().directBooks().maintain(true); settings.bookManagement().impliedBooks().maintain(true); settings.bookManagement().consolidatedBooks().maintain(false); - if (options.validate_mbo() && mbo != nullptr) { + if (options.validate_mbo() && _mbo != nullptr) { settings.bookManagement().mboBooks().maintain(true); } @@ -346,14 +364,14 @@ unique_ptr MDP3Main::prepare_handler(const string& channel_id, M // // Create a listener for this channel and register callbacks -unique_ptr MDP3Main::prepare_listener(onixs::Handler& handler, const CMEChannel& channel, MBOWriter* mbo) { +unique_ptr MDP3Main::prepare_listener(onixs::Handler& handler, const CMEChannel& channel) { // We need to get a handler to the producer channels so we can produce heartbeats vector producer_channels; for (auto& symbol : channel.symbols) { producer_channels.push_back(_producer.get_channel(symbol.symbol().c_str(), symbol.type(), symbol.exchange())); } - unique_ptr listener(new MDP3Listener(_index, _producer, mbo, producer_channels)); + unique_ptr listener(new MDP3Listener(_index, _producer, _mbo, producer_channels)); for (auto& symbol : channel.symbols) { listener->add_filter_symbol(symbol.symbol()); } diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h index bda70e4c6..541f75044 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h @@ -26,18 +26,26 @@ struct CMEChannel; * There is a single listener for all callbacks which maps the exchange id to the MDProducerHandle and writes * the data to it. */ + +struct ChannelHandler { + bool started; + std::unique_ptr handler; +}; + class MDP3Main : public IMDPlatform { public: - MDP3Main(); + MDP3Main(MBOWriter*); ~MDP3Main(); - void start(std::vector&, MBOWriter*); + void start(std::vector&); void send_heartbeats() override; void initialize(); - std::unique_ptr prepare_handler(const std::string& channel, MBOWriter*); - std::unique_ptr prepare_listener(onixs::Handler& handler, const CMEChannel& channel, MBOWriter*); + std::unique_ptr prepare_handler(const std::string& channel); + std::unique_ptr prepare_listener(onixs::Handler& handler, const CMEChannel& channel); + + void start_handlers(); private: BTS_NO_COPY(MDP3Main); @@ -45,9 +53,10 @@ private: CMESecurityIndex _index; SecurityIDRecorder _recorder; MDProducer _producer; + MBOWriter* _mbo; // co2::SettlementRecorder _settlement_recorder; std::map> _engines; - std::map> _handlers; + std::map _handlers; std::vector> _listeners; std::vector> _recovery; }; diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 42f4da101..406178656 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -76,9 +76,9 @@ void run_onixs(MBOWriter* mbo) { get_system_md_symbols(api::VENUE_GLBX, api::SECURITYTYPE_UNSET, &cme_symbols); if(cme_symbols.size() > 0) { - MDP3Main* main = new MDP3Main(); + MDP3Main* main = new MDP3Main(mbo); std::shared_ptr ptr(main); - main->start(cme_symbols, mbo); + main->start(cme_symbols); platforms.push_back(ptr); }