From e1c2d8aaafb02f2b2e0a95cf7ebb0d769b5645fb Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 26 Sep 2019 12:33:42 -0400 Subject: [PATCH] it builds, ship it --- src/lib/logging/logging.h | 2 +- src/server/sparkd/fix/FixInit.cpp | 4 +- src/server/sparkd/fix/FixInit.h | 2 +- src/server/sparkd/fix/FixRouter.cpp | 53 +++++++++++++++++++++---- src/server/sparkd/fix/FixRouter.h | 23 ++++------- src/server/sparkd/fix/IFixRouter.h | 7 ++-- src/server/sparkd/fix/IFixSession.h | 6 +-- src/server/sparkd/fix/SecurityIndex.cpp | 16 +++++++- src/server/sparkd/fix/SecurityIndex.h | 5 ++- src/server/sparkd/fix/SessionBase.cpp | 9 ++--- 10 files changed, 84 insertions(+), 43 deletions(-) diff --git a/src/lib/logging/logging.h b/src/lib/logging/logging.h index 5539dc7a3..9b7fa89c2 100644 --- a/src/lib/logging/logging.h +++ b/src/lib/logging/logging.h @@ -46,7 +46,7 @@ constexpr log::Subsystem DataFlow {Latency.ordinal+1 }; constexpr log::Subsystem Plugin {DataFlow.ordinal+1 }; constexpr log::Subsystem ClientSdk {Plugin.ordinal+1 }; constexpr log::Subsystem Http {ClientSdk.ordinal+1 }; -constexpr log::Subsystem FIX {Http.ordinal+1 }; +constexpr log::Subsystem Fix {Http.ordinal+1 }; struct LoggerHandle { LoggerHandle(LoggerHandle const&) = delete; diff --git a/src/server/sparkd/fix/FixInit.cpp b/src/server/sparkd/fix/FixInit.cpp index d902bd5d9..a42919c7d 100644 --- a/src/server/sparkd/fix/FixInit.cpp +++ b/src/server/sparkd/fix/FixInit.cpp @@ -27,7 +27,7 @@ namespace fix GCC_DIAG_OFF("-Wdeprecated") GCC_DIAG_OFF("-Wignored-qualifiers") -int FixInit::start_acceptor(bts::api::ServiceContext&, const md::MDClient& md, const std::string& settings_file, bool orders_allowed) +int FixInit::start_acceptor(bts::api::ServiceContext&, md::MDClient& md, const std::string& settings_file, bool orders_allowed) { std::ifstream str{settings_file}; FIX::SessionSettings settings( str ); @@ -45,7 +45,7 @@ int FixInit::start_acceptor(bts::api::ServiceContext&, const md::MDClient& md, c FIX::SocketAcceptor acceptor( application, storeFactory, settings, logFactory ); acceptor.start(); - + return 0; } } diff --git a/src/server/sparkd/fix/FixInit.h b/src/server/sparkd/fix/FixInit.h index 0273a7a6c..93401429f 100644 --- a/src/server/sparkd/fix/FixInit.h +++ b/src/server/sparkd/fix/FixInit.h @@ -10,7 +10,7 @@ namespace fix { class FixInit { public: - static int start_acceptor(bts::api::ServiceContext& sc, const md::MDClient& md, const std::string& settings_file, bool orders_allowed); + static int start_acceptor(bts::api::ServiceContext& sc, md::MDClient& md, const std::string& settings_file, bool orders_allowed); }; }} \ No newline at end of file diff --git a/src/server/sparkd/fix/FixRouter.cpp b/src/server/sparkd/fix/FixRouter.cpp index a4e0a1637..c56e9f7ac 100644 --- a/src/server/sparkd/fix/FixRouter.cpp +++ b/src/server/sparkd/fix/FixRouter.cpp @@ -1,6 +1,8 @@ #include "FixRouter.h" #include "IFixSession.h" +#include "SecurityIndex.h" +#include "lib/md/MDConsumerHandle.h" #include #include @@ -20,14 +22,24 @@ namespace bts { namespace fix { + +struct FixRouter::PImpl +{ + boost::container::flat_map< FIX::SessionID, std::shared_ptr > sessions; + SecurityIndex index; + std::mutex lock; + Factory factory; + PImpl(md::MDClient& md, Factory factory) : + sessions(), + index(md), + lock(), + factory(factory) + { + } +}; -FixRouter::FixRouter(const md::MDClient& md, - std::function< std::shared_ptr (IFixRouter&, const FIX::SessionID&) > factory) : - _sessions(), - _index(md), - _sc(sc), - _lock() +FixRouter::FixRouter(md::MDClient& md, Factory factory) : me(new PImpl(md, factory)) { } @@ -65,7 +77,7 @@ void FixRouter::onLogon(const FIX::SessionID&) { } -void onLogout(const FIX::SessionID&) +void FixRouter::onLogout(const FIX::SessionID&) { } @@ -77,8 +89,18 @@ void FixRouter::toApp(FIX::Message&, const FIX::SessionID&) throw(FIX::DoNotSend { } -IFixSession& FixRouter::session(const FIX::SessionID&) +IFixSession& FixRouter::session(const FIX::SessionID& sid) { + std::lock_guard guard(me->lock); + auto it = me->sessions.find(sid); + if(it == me->sessions.end()) + { + auto ptr = me->factory(*this, sid); + me->sessions[sid] = ptr; + return *ptr; + } + else + return *it->second; } void FixRouter::handle_session_exception(const std::exception& ex, const FIX::SessionID& sessionID, const FIX::Message* message) @@ -89,6 +111,21 @@ void FixRouter::handle_field_not_found(const FIX::FieldNotFound& ex, const FIX:: { } +std::vector FixRouter::get_securities() +{ + return me->index.get_securities(); +} + +const md::SecurityPtr FixRouter::lookup(md::security_key key) +{ + return me->index.lookup(key); +} + +const md::SecurityPtr FixRouter::lookup(const std::string& desc) +{ + return me->index.lookup(desc); +} + } } \ No newline at end of file diff --git a/src/server/sparkd/fix/FixRouter.h b/src/server/sparkd/fix/FixRouter.h index 1e64b1298..7b12ee954 100644 --- a/src/server/sparkd/fix/FixRouter.h +++ b/src/server/sparkd/fix/FixRouter.h @@ -2,8 +2,6 @@ #include "IFixSession.h" #include "IFixRouter.h" -#include "SecurityIndex.h" -#include "lib/md/MDConsumerHandle.h" #include #include @@ -15,22 +13,18 @@ #include #include -#include "lib/utils/warn_ctrl.h" namespace bts { namespace api { class ServiceContext; } namespace md { class MDClient; } namespace fix { -GCC_DIAG_OFF("-Wdeprecated") -GCC_DIAG_OFF("-Wignored-qualifiers") - - class FixRouter : public IFixSession, public FIX::MessageCracker, public IFixRouter { public: - FixRouter(const md::MDClient&, - std::function< std::shared_ptr (IFixRouter&, const FIX::SessionID&) > factory); + typedef std::function< std::shared_ptr (IFixRouter&, const FIX::SessionID&) > Factory; + + FixRouter(md::MDClient&, Factory factory); ~FixRouter(); void send(const FIX::Message&, const FIX::SessionID&) override; @@ -55,14 +49,13 @@ private: void handle_field_not_found(const FIX::FieldNotFound& ex, const FIX::SessionID& sess, const FIX::Message& message); private: - std::vector get_securities() override; - const api::Security* lookup(security_key key) override; - const api::Security* lookup(const std::string& desc) override; + std::vector get_securities() override; + const md::SecurityPtr lookup(md::security_key key) override; + const md::SecurityPtr lookup(const std::string& desc) override; private: - boost::container::flat_map< FIX::SessionID, std::shared_ptr > _sessions; - md::DescHandleIndex _index; - std::mutex _lock; + struct PImpl; + std::unique_ptr me; }; }} \ No newline at end of file diff --git a/src/server/sparkd/fix/IFixRouter.h b/src/server/sparkd/fix/IFixRouter.h index da04963ce..191809b4e 100644 --- a/src/server/sparkd/fix/IFixRouter.h +++ b/src/server/sparkd/fix/IFixRouter.h @@ -1,6 +1,7 @@ #pragma once #include "lib/md/common.h" +#include "lib/md/SecurityPtr.h" #include #include @@ -24,9 +25,9 @@ namespace fix class IFixRouter { public: - virtual std::vector get_securities() = 0; - virtual const api::Security* lookup(md::security_key key) = 0; - virtual const api::Security* lookup(const std::string& desc) = 0; + virtual std::vector get_securities() = 0; + virtual const md::SecurityPtr lookup(md::security_key key) = 0; + virtual const md::SecurityPtr lookup(const std::string& desc) = 0; virtual void send(const FIX::Message& mess, const FIX::SessionID& sess) = 0; virtual void send_session_reject(const FIX::SessionID& sess, const std::string& text, const FIX::Message* refmessage = nullptr) = 0; diff --git a/src/server/sparkd/fix/IFixSession.h b/src/server/sparkd/fix/IFixSession.h index e92c8f4b8..8da871e19 100644 --- a/src/server/sparkd/fix/IFixSession.h +++ b/src/server/sparkd/fix/IFixSession.h @@ -4,15 +4,13 @@ GCC_DIAG_OFF("-Woverloaded-virtual") GCC_DIAG_OFF("-Wdeprecated") GCC_DIAG_OFF("-Wignored-qualifiers") +GCC_DIAG_OFF("-Wunused-parameter") #include namespace bts { namespace fix { - -GCC_DIAG_OFF("-Wdeprecated") -GCC_DIAG_OFF("-Wignored-qualifiers") - + class IFixSession : public FIX::Application { }; diff --git a/src/server/sparkd/fix/SecurityIndex.cpp b/src/server/sparkd/fix/SecurityIndex.cpp index cb12bf92c..855dc399d 100644 --- a/src/server/sparkd/fix/SecurityIndex.cpp +++ b/src/server/sparkd/fix/SecurityIndex.cpp @@ -9,13 +9,14 @@ namespace fix { struct SecurityIndex::PImpl { md::DescHandleIndex index; - PImpl(const md::MDClient& md) : index(md) + md::KeyHandleIndex key_index; + PImpl(md::MDClient& md) : index(md), key_index(md) { } }; -SecurityIndex::SecurityIndex(const md::MDClient& md) : me(new PImpl(md)) +SecurityIndex::SecurityIndex(md::MDClient& md) : me(new PImpl(md)) { } @@ -43,6 +44,17 @@ md::SecurityPtr SecurityIndex::lookup(const std::string& desc) return ptr; } +md::SecurityPtr SecurityIndex::lookup(md::security_key key) +{ + md::SecurityPtr ptr = nullptr; + me->key_index.security_index.lock([&ptr, &key] (const auto& secmap) + { + auto it = secmap.find( SecurityKey(key) ); + if(it != secmap.end()) + ptr = it->second; + }); + return ptr; +} }} diff --git a/src/server/sparkd/fix/SecurityIndex.h b/src/server/sparkd/fix/SecurityIndex.h index f366d87fa..e18b7189b 100644 --- a/src/server/sparkd/fix/SecurityIndex.h +++ b/src/server/sparkd/fix/SecurityIndex.h @@ -15,14 +15,15 @@ namespace fix { class SecurityIndex { public: - SecurityIndex(const md::MDClient&); + SecurityIndex(md::MDClient&); std::vector get_securities(); md::SecurityPtr lookup(const std::string& desc); + md::SecurityPtr lookup(md::security_key key); private: struct PImpl; - std::unique_ptr me; + std::shared_ptr me; }; }} diff --git a/src/server/sparkd/fix/SessionBase.cpp b/src/server/sparkd/fix/SessionBase.cpp index 3646403f6..bd22249a6 100644 --- a/src/server/sparkd/fix/SessionBase.cpp +++ b/src/server/sparkd/fix/SessionBase.cpp @@ -31,7 +31,7 @@ SessionBase::SessionBase(bts::api::ServiceContext& sc, IFixRouter& router, const _admin_data(), _lock() { - _admin_service.get_admin_data(api::VoidMessage(), [this] (auto& result) + _admin_service.get_admin_data(api::VoidMessage(), [this] (auto result) { std::lock_guard guard(_lock); if(result.success()) @@ -121,7 +121,7 @@ bts::api::SecurityType SessionBase::convert_security_type(FIX::SecurityType fixt return bts::api::SecurityType::SECURITYTYPE_FUTURE; else if(s == "OPT") return bts::api::SecurityType::SECURITYTYPE_OPTION; - else if(s == "MLEG")) + else if(s == "MLEG") return bts::api::SecurityType::SECURITYTYPE_SPREAD; else if(s == "CS") return bts::api::SecurityType::SECURITYTYPE_STOCK; @@ -174,7 +174,6 @@ bts::api::Venue SessionBase::convert_exchange(FIX::SecurityExchange fixtype) return bts::api::Venue::VENUE_SIM; else return bts::api::Venue::VENUE_UNSET; - } } FIX::OrdStatus SessionBase::translate_status(const bts::api::orderman::OrderStateImmutable& state, @@ -189,7 +188,7 @@ uint SessionBase::lookup_account(const std::string& acct) if(a) return a->id(); else - throw FIX::IncorrectTagValue(FIX::FIEILD::Account); + throw FIX::IncorrectTagValue(FIX::FIELD::Account); } uint SessionBase::lookup_user(const std::string& user) @@ -198,7 +197,7 @@ uint SessionBase::lookup_user(const std::string& user) if(u) return u->id(); else - throw FIX::IncorrectTagValue(FIX::FIEILD::Username); + throw FIX::IncorrectTagValue(FIX::FIELD::Username); }