Upgrade ccapi to v6.12.0
This commit is contained in:
1 parent
8069cc893f
commit
90492733fd
109 files changed
+4172
-8930
No files matched your search
@@ -11,11 +11,11 @@
|
||||
#include "hffix.hpp"
|
||||
namespace hff = hffix;
|
||||
namespace ccapi {
|
||||
template <class T>
|
||||
/**
|
||||
* Defines a service which provides access to exchange API and normalizes them. This is a base class that implements generic functionalities for dealing with
|
||||
* exchange FIX APIs. The Session object is responsible for routing requests and subscriptions to the desired concrete service.
|
||||
*/
|
||||
template <class T>
|
||||
class FixService : public Service {
|
||||
public:
|
||||
FixService(std::function<void(Event&, Queue<Event>*)> eventHandler, SessionOptions sessionOptions, SessionConfigs sessionConfigs,
|
||||
@@ -105,7 +105,7 @@ class FixService : public Service {
|
||||
});
|
||||
this->connectRetryOnFailTimerByConnectionIdMap[fixConnectionPtr->id] = timerPtr;
|
||||
}
|
||||
std::shared_ptr<T> createStreamFix(std::shared_ptr<net::io_context> iocPtr, std::shared_ptr<net::ssl::context> ctxPtr, const std::string& host);
|
||||
std::shared_ptr<T> createStreamFix(net::io_context* iocPtr, net::ssl::context* ctxPtr, const std::string& host);
|
||||
void connect(Subscription& subscription) {
|
||||
std::string aHostFix = this->hostFix;
|
||||
std::string aPortFix = this->portFix;
|
||||
@@ -454,11 +454,11 @@ class FixService : public Service {
|
||||
std::function<void(std::shared_ptr<FixConnection<T>>)> pingMethod, bool pingNow = false) {
|
||||
CCAPI_LOGGER_FUNCTION_ENTER;
|
||||
CCAPI_LOGGER_TRACE("method = " + pingPongMethodToString(method));
|
||||
auto pingIntervalMilliSeconds = this->pingIntervalMilliSecondsByMethodMap[method];
|
||||
auto pongTimeoutMilliSeconds = this->pongTimeoutMilliSecondsByMethodMap[method];
|
||||
CCAPI_LOGGER_TRACE("pingIntervalMilliSeconds = " + toString(pingIntervalMilliSeconds));
|
||||
CCAPI_LOGGER_TRACE("pongTimeoutMilliSeconds = " + toString(pongTimeoutMilliSeconds));
|
||||
if (pingIntervalMilliSeconds <= pongTimeoutMilliSeconds) {
|
||||
auto pingIntervalMilliseconds = this->pingIntervalMillisecondsByMethodMap[method];
|
||||
auto pongTimeoutMilliseconds = this->pongTimeoutMillisecondsByMethodMap[method];
|
||||
CCAPI_LOGGER_TRACE("pingIntervalMilliseconds = " + toString(pingIntervalMilliseconds));
|
||||
CCAPI_LOGGER_TRACE("pongTimeoutMilliseconds = " + toString(pongTimeoutMilliseconds));
|
||||
if (pingIntervalMilliseconds <= pongTimeoutMilliseconds) {
|
||||
return;
|
||||
}
|
||||
if (fixConnectionPtr->status == FixConnection<T>::Status::OPEN) {
|
||||
@@ -471,8 +471,8 @@ class FixService : public Service {
|
||||
this->pingTimerByMethodByConnectionIdMap.at(fixConnectionPtr->id).at(method)->cancel();
|
||||
}
|
||||
TimerPtr timerPtr(
|
||||
new boost::asio::steady_timer(*this->serviceContextPtr->ioContextPtr, std::chrono::milliseconds(pingIntervalMilliSeconds - pongTimeoutMilliSeconds)));
|
||||
timerPtr->async_wait([fixConnectionPtr, that = shared_from_base<FixService>(), pingMethod, pongTimeoutMilliSeconds, method](ErrorCode const& ec) {
|
||||
new boost::asio::steady_timer(*this->serviceContextPtr->ioContextPtr, std::chrono::milliseconds(pingIntervalMilliseconds - pongTimeoutMilliseconds)));
|
||||
timerPtr->async_wait([fixConnectionPtr, that = shared_from_base<FixService>(), pingMethod, pongTimeoutMilliseconds, method](ErrorCode const& ec) {
|
||||
if (that->fixConnectionPtrByIdMap.find(fixConnectionPtr->id) != that->fixConnectionPtrByIdMap.end()) {
|
||||
if (ec) {
|
||||
CCAPI_LOGGER_ERROR("fixConnectionPtr = " + toString(*fixConnectionPtr) + ", ping timer error: " + ec.message());
|
||||
@@ -484,7 +484,7 @@ class FixService : public Service {
|
||||
if (ec) {
|
||||
that->onError(Event::Type::FIX_STATUS, Message::Type::GENERIC_ERROR, ec, "ping");
|
||||
}
|
||||
if (pongTimeoutMilliSeconds <= 0) {
|
||||
if (pongTimeoutMilliseconds <= 0) {
|
||||
return;
|
||||
}
|
||||
if (that->pongTimeOutTimerByMethodByConnectionIdMap.find(fixConnectionPtr->id) != that->pongTimeOutTimerByMethodByConnectionIdMap.end() &&
|
||||
@@ -492,8 +492,8 @@ class FixService : public Service {
|
||||
that->pongTimeOutTimerByMethodByConnectionIdMap.at(fixConnectionPtr->id).end()) {
|
||||
that->pongTimeOutTimerByMethodByConnectionIdMap.at(fixConnectionPtr->id).at(method)->cancel();
|
||||
}
|
||||
TimerPtr timerPtr(new boost::asio::steady_timer(*that->serviceContextPtr->ioContextPtr, std::chrono::milliseconds(pongTimeoutMilliSeconds)));
|
||||
timerPtr->async_wait([fixConnectionPtr, that, pingMethod, pongTimeoutMilliSeconds, method](ErrorCode const& ec) {
|
||||
TimerPtr timerPtr(new boost::asio::steady_timer(*that->serviceContextPtr->ioContextPtr, std::chrono::milliseconds(pongTimeoutMilliseconds)));
|
||||
timerPtr->async_wait([fixConnectionPtr, that, pingMethod, pongTimeoutMilliseconds, method](ErrorCode const& ec) {
|
||||
if (that->fixConnectionPtrByIdMap.find(fixConnectionPtr->id) != that->fixConnectionPtrByIdMap.end()) {
|
||||
if (ec) {
|
||||
CCAPI_LOGGER_ERROR("fixConnectionPtr = " + toString(*fixConnectionPtr) + ", pong timeout timer error: " + ec.message());
|
||||
@@ -506,7 +506,7 @@ class FixService : public Service {
|
||||
that->lastPongTpByMethodByConnectionIdMap.at(fixConnectionPtr->id).end() &&
|
||||
std::chrono::duration_cast<std::chrono::milliseconds>(now -
|
||||
that->lastPongTpByMethodByConnectionIdMap.at(fixConnectionPtr->id).at(method))
|
||||
.count() >= pongTimeoutMilliSeconds) {
|
||||
.count() >= pongTimeoutMilliseconds) {
|
||||
auto thisFixConnectionPtr = fixConnectionPtr;
|
||||
that->onFail(fixConnectionPtr, "pong timeout");
|
||||
} else {
|
||||
@@ -558,8 +558,9 @@ class FixService : public Service {
|
||||
std::string targetCompID;
|
||||
};
|
||||
template <>
|
||||
inline std::shared_ptr<beast::ssl_stream<beast::tcp_stream>> FixService<beast::ssl_stream<beast::tcp_stream>>::createStreamFix(
|
||||
std::shared_ptr<net::io_context> iocPtr, std::shared_ptr<net::ssl::context> ctxPtr, const std::string& host) {
|
||||
inline std::shared_ptr<beast::ssl_stream<beast::tcp_stream>> FixService<beast::ssl_stream<beast::tcp_stream>>::createStreamFix(net::io_context* iocPtr,
|
||||
net::ssl::context* ctxPtr,
|
||||
const std::string& host) {
|
||||
std::shared_ptr<beast::ssl_stream<beast::tcp_stream>> streamPtr(new beast::ssl_stream<beast::tcp_stream>(*iocPtr, *ctxPtr));
|
||||
// Set SNI Hostname (many hosts need this to handshake successfully)
|
||||
if (!SSL_set_tlsext_host_name(streamPtr->native_handle(), host.c_str())) {
|
||||
@@ -570,8 +571,8 @@ inline std::shared_ptr<beast::ssl_stream<beast::tcp_stream>> FixService<beast::s
|
||||
return streamPtr;
|
||||
}
|
||||
template <>
|
||||
inline std::shared_ptr<beast::tcp_stream> FixService<beast::tcp_stream>::createStreamFix(std::shared_ptr<net::io_context> iocPtr,
|
||||
std::shared_ptr<net::ssl::context> ctxPtr, const std::string& host) {
|
||||
inline std::shared_ptr<beast::tcp_stream> FixService<beast::tcp_stream>::createStreamFix(net::io_context* iocPtr, net::ssl::context* ctxPtr,
|
||||
const std::string& host) {
|
||||
std::shared_ptr<beast::tcp_stream> streamPtr(new beast::tcp_stream(*iocPtr));
|
||||
return streamPtr;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user