From 6d0eb627124b9c201d7cd9a08dedc6a5f846e9cd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Apr 2019 15:55:29 -0400 Subject: [PATCH] changes to compile ice work with clang --- src/lib/md/ice/ICEUtils.cpp | 4 +-- src/server/sparkd/md/platforms/IMDPlatform.h | 3 +- .../md/platforms/ice_onixs/ICEListener.cpp | 36 ++++++------------- .../sparkd/md/platforms/ice_onixs/ICEMain.cpp | 1 - 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/src/lib/md/ice/ICEUtils.cpp b/src/lib/md/ice/ICEUtils.cpp index d25fb696a..1533964a0 100644 --- a/src/lib/md/ice/ICEUtils.cpp +++ b/src/lib/md/ice/ICEUtils.cpp @@ -26,7 +26,7 @@ std::string ICEChannel::to_string() const { std::string mt = name; for(const auto& x : market_types) - mt += " " + x; + mt += " " + std::to_string(x); return mt; } @@ -123,4 +123,4 @@ const std::vector get_configured_ice_channels() { }}} //namespace -#endif \ No newline at end of file +#endif diff --git a/src/server/sparkd/md/platforms/IMDPlatform.h b/src/server/sparkd/md/platforms/IMDPlatform.h index df4840f30..fb36c9168 100644 --- a/src/server/sparkd/md/platforms/IMDPlatform.h +++ b/src/server/sparkd/md/platforms/IMDPlatform.h @@ -7,6 +7,7 @@ class IMDPlatform { public: virtual void send_heartbeats(); + virtual ~IMDPlatform() {} }; -}} \ No newline at end of file +}} diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index df13de9bb..7c85642ad 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -56,17 +56,14 @@ void ICEListener::onMarketStateChange(const onixs_ice::MarketStateChange& , cons void ICEListener::onError(const onixs_ice::Error& error) { std::string error_desc(error.description()); - tracepoint (bts_trace,trace_order,(char*) "onError", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE Error: {} - {}", error.toString(), error_desc ); } void ICEListener::onFeedError(onixs_ice::FeedId feedid, onixs_ice::ErrorCode code, const std::string& desc) { - tracepoint (bts_trace,trace_order,(char*) "onFeedError", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE FeedError: {} - {}", feedid, desc, code); } void ICEListener::onWarning(const onixs_ice::Warning& warning) { - tracepoint (bts_trace,trace_order,(char*) "onWarning", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE Warn: {} - {}", warning.toString(), std::string(warning.description()) ); } @@ -74,31 +71,27 @@ void ICEListener::onWarning(const onixs_ice::Warning& warning) // Security discovery void ICEListener::onFuturesProductDefinition(const onixs_ice::FuturesProductDefinition& msg, bool& is_interested) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesProductDefinition", 0, (uint16_t) 0, 0); if(msg.isSpread) on_future_strip(msg, is_interested); else on_future(msg, is_interested); } -void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interested, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onNewExpiry", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); on_future(msg, is_interested); } void ICEListener::onFuturesStrategyDefinition(const onixs_ice::FuturesStrategyDefinition& def, bool& is_interested) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesStrategyDefinition", 0, (uint16_t) 0, 0); //TODO need to find out how to produce data for testing //on_uds_future_spread(def, is_interested); UNUSED(def); UNUSED(is_interested); } //This is only for UDS -void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesStrategyDefinition", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); //TODO need to find out how to produce data for testing //on_uds_future_spread(msg, is_interested); UNUSED(msg); @@ -152,7 +145,7 @@ void ICEListener::onMarketSnapshotPriceLevel(const onixs_ice::MarketSnapshotPric // Book void ICEListener::onOrderBookUpdated(const onixs_ice::OrderBook& onixs_book, const onixs_ice::MessageInfo& msg_info) { - tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); + //tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto data = _index.get_security(onixs_book.marketId()); if (data == nullptr) @@ -214,9 +207,8 @@ void on_trade(ICESecurityData* data, const onixs_ice::Price& price, int size, on data->handle.add_trade(ts, ps, date, map_aggressor(agside), size); } -void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onTrade", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != NULL) { @@ -230,9 +222,8 @@ void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageI // // RFQ -void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onRfq", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -267,9 +258,8 @@ void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& // // Misc -void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -287,9 +277,8 @@ void ICEListener::onOpenInterest(const onixs_ice::OpenInterest &msg, const onixs UNUSED(msg_info); } -void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onOpenPrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -301,9 +290,8 @@ void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice:: } } -void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onClosePrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -315,9 +303,8 @@ void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice } } -void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfDayMarketSummary", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -333,18 +320,15 @@ void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary // // Feed -void ICEListener::onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& ) { UNUSED(feedId); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockBegin", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); } void ICEListener::onMulticastMessageBlockEnd(onixs_ice::FeedId feedId, const onixs_ice::MarketIds& marketIds) { UNUSED(feedId); UNUSED(marketIds); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockEnd.begin", 0, (uint16_t) 0, 0); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockEnd.end", 0, (uint16_t) 0, 0); } void ICEListener::onFeedStarted(onixs_ice::FeedId, const onixs_ice::MarketIds&) diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index c44ad0d3a..f36be139d 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -217,7 +217,6 @@ unique_ptr ICEMain::prepare_listener(onixs_ice::Handler& handler, c producer_channels.push_back(_producer.get_channel(symbol.symbol().c_str(), symbol.type(), symbol.exchange())); } - const auto& options = channel_settings_for(channel); unique_ptr listener(new ICEListener(_index, _producer, /*_settlement_recorder,*/ producer_channels)); for (auto& symbol : channel.symbols) listener->add_filter_symbol(symbol.symbol());