it builds, ship it

This commit is contained in:
Kevin Darby committed 2019-09-26 12:33:42 -04:00
1 parent 719fd03063
commit e1c2d8aaaf
10 files changed
+84 -43

No files matched your search

+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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;
}
}
+1 -1
View File
@@ -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);
};
}}
+45 -8
View File
@@ -1,6 +1,8 @@
#include "FixRouter.h"
#include "IFixSession.h"
#include "SecurityIndex.h"
#include "lib/md/MDConsumerHandle.h"
#include <quickfix/FileStore.h>
#include <quickfix/SocketAcceptor.h>
@@ -20,14 +22,24 @@ namespace bts
{
namespace fix
{
struct FixRouter::PImpl
{
boost::container::flat_map< FIX::SessionID, std::shared_ptr<IFixSession> > 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<IFixSession> (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<std::mutex> 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<md::SecurityPtr> 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);
}
}
}
+8 -15
View File
@@ -2,8 +2,6 @@
#include "IFixSession.h"
#include "IFixRouter.h"
#include "SecurityIndex.h"
#include "lib/md/MDConsumerHandle.h"
#include <quickfix/MessageCracker.h>
#include <quickfix/Message.h>
@@ -15,22 +13,18 @@
#include <mutex>
#include <functional>
#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<IFixSession> (IFixRouter&, const FIX::SessionID&) > factory);
typedef std::function< std::shared_ptr<IFixSession> (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<const api::Security*> get_securities() override;
const api::Security* lookup(security_key key) override;
const api::Security* lookup(const std::string& desc) override;
std::vector<md::SecurityPtr> 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<IFixSession> > _sessions;
md::DescHandleIndex _index;
std::mutex _lock;
struct PImpl;
std::unique_ptr<PImpl> me;
};
}}
+4 -3
View File
@@ -1,6 +1,7 @@
#pragma once
#include "lib/md/common.h"
#include "lib/md/SecurityPtr.h"
#include <vector>
#include <memory>
@@ -24,9 +25,9 @@ namespace fix
class IFixRouter
{
public:
virtual std::vector<const api::Security*> 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<md::SecurityPtr> 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;
+2 -4
View File
@@ -4,15 +4,13 @@
GCC_DIAG_OFF("-Woverloaded-virtual")
GCC_DIAG_OFF("-Wdeprecated")
GCC_DIAG_OFF("-Wignored-qualifiers")
GCC_DIAG_OFF("-Wunused-parameter")
#include <quickfix/Application.h>
namespace bts {
namespace fix {
GCC_DIAG_OFF("-Wdeprecated")
GCC_DIAG_OFF("-Wignored-qualifiers")
class IFixSession : public FIX::Application
{
};
+14 -2
View File
@@ -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;
}
}}
+3 -2
View File
@@ -15,14 +15,15 @@ namespace fix {
class SecurityIndex
{
public:
SecurityIndex(const md::MDClient&);
SecurityIndex(md::MDClient&);
std::vector<md::SecurityPtr> get_securities();
md::SecurityPtr lookup(const std::string& desc);
md::SecurityPtr lookup(md::security_key key);
private:
struct PImpl;
std::unique_ptr<PImpl> me;
std::shared_ptr<PImpl> me;
};
}}
+4 -5
View File
@@ -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<std::mutex> 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);
}