Additional ilink3 refactoring

This commit is contained in:
Eric Harding committed 2020-03-28 21:08:47 -05:00
1 parent 5326015a48
commit 4eb2931cb8
6 files changed
+191 -169

No files matched your search

@@ -0,0 +1,88 @@
#pragma once
#include <cstdint>
#include "IL3GeneratedFull.h"
#include "IL3MessageFramer.h"
namespace bts {
namespace orderman {
namespace ilink3 {
template <class Handler, class T>
void handle(Handler& h, const char* data, uint16_t len) {
h.handle(
T {
const_cast<char*>(data),
sizeof(FramingHeader) + iLinkBinary::MessageHeader::encodedLength(),
len,
T::sbeBlockLength(),
T::sbeSchemaVersion() });
}
template <class Handler>
void dispatch_message(Handler& handler, const FramingHeader* header, const char* data) {
using namespace iLinkBinary;
bts_assert_d(header->encoding_type == 0XCAFE);
MessageHeader mheader {
(char*)data, sizeof(FramingHeader), header->message_size,
MessageHeader::sbeSchemaVersion() };
switch(mheader.templateId()) {
case 501: handle<Handler, iLinkBinary::NegotiationResponse501>(handler, data, header->message_size); break;
case 502: handle<Handler, iLinkBinary::NegotiationReject502>(handler, data, header->message_size); break;
case 504: handle<Handler, iLinkBinary::EstablishmentAck504>(handler, data, header->message_size); break;
case 505: handle<Handler, iLinkBinary::EstablishmentReject505>(handler, data, header->message_size); break;
case 506: handle<Handler, iLinkBinary::Sequence506>(handler, data, header->message_size); break;
case 507: handle<Handler, iLinkBinary::Terminate507>(handler, data, header->message_size); break;
case 509: handle<Handler, iLinkBinary::Retransmission509>(handler, data, header->message_size); break;
case 510: handle<Handler, iLinkBinary::RetransmitReject510>(handler, data, header->message_size); break;
case 513: handle<Handler, iLinkBinary::NotApplied513>(handler, data, header->message_size); break;
case 519: handle<Handler, iLinkBinary::PartyDetailsDefinitionRequestAck519>(handler, data, header->message_size); break;
case 521: handle<Handler, iLinkBinary::BusinessReject521>(handler, data, header->message_size); break;
case 522: handle<Handler, iLinkBinary::ExecutionReportNew522>(handler, data, header->message_size); break;
case 523: handle<Handler, iLinkBinary::ExecutionReportReject523>(handler, data, header->message_size); break;
case 524: handle<Handler, iLinkBinary::ExecutionReportElimination524>(handler, data, header->message_size); break;
case 525: handle<Handler, iLinkBinary::ExecutionReportTradeOutright525>(handler, data, header->message_size); break;
case 526: handle<Handler, iLinkBinary::ExecutionReportTradeSpread526>(handler, data, header->message_size); break;
case 527: handle<Handler, iLinkBinary::ExecutionReportTradeSpreadLeg527>(handler, data, header->message_size); break;
case 531: handle<Handler, iLinkBinary::ExecutionReportModify531>(handler, data, header->message_size); break;
case 532: handle<Handler, iLinkBinary::ExecutionReportStatus532>(handler, data, header->message_size); break;
case 534: handle<Handler, iLinkBinary::ExecutionReportCancel534>(handler, data, header->message_size); break;
case 535: handle<Handler, iLinkBinary::OrderCancelReject535>(handler, data, header->message_size); break;
case 536: handle<Handler, iLinkBinary::OrderCancelReplaceReject536>(handler, data, header->message_size); break;
// case 538: handle<Handler, iLinkBinary::PartyDetailsListReport538>(handler, data, header->message_size); break;
case 539: handle<Handler, iLinkBinary::ExecutionAck539>(handler, data, header->message_size); break;
// case 544: handle<Handler, iLinkBinary::NewOrderCross544>(handler, data, header->message_size); break;
// case 545: handle<Handler, iLinkBinary::MassQuoteAck545>(handler, data, header->message_size); break;
// case 546: handle<Handler, iLinkBinary::RequestForQuoteAck546>(handler, data, header->message_size); break;
// case 547: handle<Handler, iLinkBinary::QuoteCancelAck547>(handler, data, header->message_size); break;
case 548: handle<Handler, iLinkBinary::ExecutionReportTradeAddendumOutright548>(handler, data, header->message_size); break;
case 549: handle<Handler, iLinkBinary::ExecutionReportTradeAddendumSpread549>(handler, data, header->message_size); break;
case 550: handle<Handler, iLinkBinary::ExecutionReportTradeAddendumSpreadLeg550>(handler, data, header->message_size); break;
// case 558: handle<Handler, iLinkBinary::OrderMassActionReport558>(handler, data, header->message_size); break;
// case 561: handle<Handler, iLinkBinary::SecurityDefinitionResponse561>(handler, data, header->message_size); break;
}
}
template <class Handler>
size_t consume_messages(Handler& handler, const char* data, size_t len) {
size_t read = 0;
while(len > sizeof(FramingHeader)) {
// read the FramingHeader
const FramingHeader* header = reinterpret_cast<const FramingHeader*>(data);
// Check if we can consume the message
auto msize = header->message_size;
if (msize <= len) {
read += msize;
dispatch_message(handler, header, data);
data += msize;
len -= msize;
}
else {
return read;
}
}
return read;
}
}}}//namespace
@@ -0,0 +1,56 @@
#pragma once
//
// Message templates
// BTS -> CME
#include "generated/Negotiate500.h"
#include "generated/Establish503.h"
#include "generated/RetransmitRequest508.h"
#include "generated/NewOrderSingle514.h"
#include "generated/OrderCancelReplaceRequest515.h"
#include "generated/OrderCancelRequest516.h"
// #include "generated/MassQuote517.h"
#include "generated/PartyDetailsDefinitionRequest518.h"
// #include "generated/QuoteCancel528.h"
// #include "generated/OrderMassActionRequest529.h"
// #include "generated/OrderMassStatusRequest530.h"
// #include "generated/OrderStatusRequest533.h"
// #include "generated/PartyDetailsListRequest537.h"
// #include "generated/RequestForQuote543.h"
// #include "generated/SecurityDefinitionRequest560.h"
// CME -> BTS
#include "generated/NegotiationResponse501.h"
#include "generated/NegotiationReject502.h"
#include "generated/EstablishmentAck504.h"
#include "generated/EstablishmentReject505.h"
#include "generated/Sequence506.h"
#include "generated/Terminate507.h"
#include "generated/Retransmission509.h"
#include "generated/RetransmitReject510.h"
#include "generated/NotApplied513.h"
#include "generated/PartyDetailsDefinitionRequestAck519.h"
#include "generated/BusinessReject521.h"
#include "generated/ExecutionReportNew522.h"
#include "generated/ExecutionReportReject523.h"
#include "generated/ExecutionReportElimination524.h"
#include "generated/ExecutionReportTradeOutright525.h"
#include "generated/ExecutionReportTradeSpread526.h"
#include "generated/ExecutionReportTradeSpreadLeg527.h"
#include "generated/ExecutionReportModify531.h"
#include "generated/ExecutionReportStatus532.h"
#include "generated/ExecutionReportCancel534.h"
#include "generated/OrderCancelReject535.h"
#include "generated/OrderCancelReplaceReject536.h"
// #include "generated/PartyDetailsListReport538.h"
#include "generated/ExecutionAck539.h"
// #include "generated/NewOrderCross544.h"
// #include "generated/MassQuoteAck545.h"
// #include "generated/RequestForQuoteAck546.h"
// #include "generated/QuoteCancelAck547.h"
#include "generated/ExecutionReportTradeAddendumOutright548.h"
#include "generated/ExecutionReportTradeAddendumSpread549.h"
#include "generated/ExecutionReportTradeAddendumSpreadLeg550.h"
// #include "generated/OrderMassActionReport558.h"
// #include "generated/SecurityDefinitionResponse561.h"
@@ -0,0 +1,37 @@
#pragma once
namespace iLinkBinary {
class Negotiate500;
class Establish503;
class RetransmitRequest508;
class NewOrderSingle514;
class OrderCancelReplaceRequest515;
class OrderCancelRequest516;
class PartyDetailsDefinitionRequest518;
class NegotiationResponse501;
class NegotiationReject502;
class EstablishmentAck504;
class EstablishmentReject505;
class Sequence506;
class Terminate507;
class Retransmission509;
class RetransmitReject510;
class NotApplied513;
class PartyDetailsDefinitionRequestAck519;
class BusinessReject521;
class ExecutionReportNew522;
class ExecutionReportReject523;
class ExecutionReportElimination524;
class ExecutionReportTradeOutright525;
class ExecutionReportTradeSpread526;
class ExecutionReportTradeSpreadLeg527;
class ExecutionReportModify531;
class ExecutionReportStatus532;
class ExecutionReportCancel534;
class OrderCancelReject535;
class OrderCancelReplaceReject536;
class ExecutionAck539;
class ExecutionReportTradeAddendumOutright548;
class ExecutionReportTradeAddendumSpread549;
class ExecutionReportTradeAddendumSpreadLeg550;
}
+3 -122
View File
@@ -2,6 +2,8 @@
#include "lib/utils/bts_assert.h"
#include "lib/utils/SecureLogon.h"
#include "ILink3Utils.h"
#include "IL3GeneratedFull.h"
#include "IL3Dispatcher.h"
/*
# Some notes about session binding and initialization: #
@@ -24,61 +26,6 @@
-> Establish seq=N
*/
//
// Message templates
// BTS -> CME
#include "generated/Negotiate500.h"
#include "generated/Establish503.h"
#include "generated/RetransmitRequest508.h"
#include "generated/NewOrderSingle514.h"
#include "generated/OrderCancelReplaceRequest515.h"
#include "generated/OrderCancelRequest516.h"
// #include "generated/MassQuote517.h"
#include "generated/PartyDetailsDefinitionRequest518.h"
// #include "generated/QuoteCancel528.h"
// #include "generated/OrderMassActionRequest529.h"
// #include "generated/OrderMassStatusRequest530.h"
// #include "generated/OrderStatusRequest533.h"
// #include "generated/PartyDetailsListRequest537.h"
// #include "generated/RequestForQuote543.h"
// #include "generated/SecurityDefinitionRequest560.h"
// CME -> BTS
#include "generated/NegotiationResponse501.h"
#include "generated/NegotiationReject502.h"
#include "generated/EstablishmentAck504.h"
#include "generated/EstablishmentReject505.h"
#include "generated/Sequence506.h"
#include "generated/Terminate507.h"
#include "generated/Retransmission509.h"
#include "generated/RetransmitReject510.h"
#include "generated/NotApplied513.h"
#include "generated/PartyDetailsDefinitionRequestAck519.h"
#include "generated/BusinessReject521.h"
#include "generated/ExecutionReportNew522.h"
#include "generated/ExecutionReportReject523.h"
#include "generated/ExecutionReportElimination524.h"
#include "generated/ExecutionReportTradeOutright525.h"
#include "generated/ExecutionReportTradeSpread526.h"
#include "generated/ExecutionReportTradeSpreadLeg527.h"
#include "generated/ExecutionReportModify531.h"
#include "generated/ExecutionReportStatus532.h"
#include "generated/ExecutionReportCancel534.h"
#include "generated/OrderCancelReject535.h"
#include "generated/OrderCancelReplaceReject536.h"
// #include "generated/PartyDetailsListReport538.h"
#include "generated/ExecutionAck539.h"
// #include "generated/NewOrderCross544.h"
// #include "generated/MassQuoteAck545.h"
// #include "generated/RequestForQuoteAck546.h"
// #include "generated/QuoteCancelAck547.h"
#include "generated/ExecutionReportTradeAddendumOutright548.h"
#include "generated/ExecutionReportTradeAddendumSpread549.h"
#include "generated/ExecutionReportTradeAddendumSpreadLeg550.h"
// #include "generated/OrderMassActionReport558.h"
// #include "generated/SecurityDefinitionResponse561.h"
namespace bts {
namespace orderman {
namespace ilink3 {
@@ -377,73 +324,7 @@ void ILinkGW::on_retransmit_complete() {
size_t ILinkGW::on_data(const char* data, size_t len) {
if (len <= sizeof(FramingHeader)) return 0;
size_t read = 0;
do {
// read the FramingHeader
const FramingHeader* header = reinterpret_cast<const FramingHeader*>(data);
// Check if we can consume the message
auto msize = header->message_size;
if (msize <= len) {
read += msize;
on_message(header, data);
data += msize;
len -= msize;
}
else {
return read;
}
} while(len > sizeof(FramingHeader));
return read;
}
//
// Handle Incoming messages
//
void ILinkGW::on_message(const FramingHeader* header, const char* data) {
using namespace iLinkBinary;
bts_assert_d(header->encoding_type == 0XCAFE);
MessageHeader mheader {
(char*)data, sizeof(FramingHeader), header->message_size,
MessageHeader::sbeSchemaVersion() };
switch(mheader.templateId()) {
// Generated by a tool - operations/codegen/ilink3gen
case 501: handle<iLinkBinary::NegotiationResponse501>(data, header->message_size); break;
case 502: handle<iLinkBinary::NegotiationReject502>(data, header->message_size); break;
case 504: handle<iLinkBinary::EstablishmentAck504>(data, header->message_size); break;
case 505: handle<iLinkBinary::EstablishmentReject505>(data, header->message_size); break;
case 506: handle<iLinkBinary::Sequence506>(data, header->message_size); break;
case 507: handle<iLinkBinary::Terminate507>(data, header->message_size); break;
case 509: handle<iLinkBinary::Retransmission509>(data, header->message_size); break;
case 510: handle<iLinkBinary::RetransmitReject510>(data, header->message_size); break;
case 513: handle<iLinkBinary::NotApplied513>(data, header->message_size); break;
case 519: handle<iLinkBinary::PartyDetailsDefinitionRequestAck519>(data, header->message_size); break;
case 521: handle<iLinkBinary::BusinessReject521>(data, header->message_size); break;
case 522: handle<iLinkBinary::ExecutionReportNew522>(data, header->message_size); break;
case 523: handle<iLinkBinary::ExecutionReportReject523>(data, header->message_size); break;
case 524: handle<iLinkBinary::ExecutionReportElimination524>(data, header->message_size); break;
case 525: handle<iLinkBinary::ExecutionReportTradeOutright525>(data, header->message_size); break;
case 526: handle<iLinkBinary::ExecutionReportTradeSpread526>(data, header->message_size); break;
case 527: handle<iLinkBinary::ExecutionReportTradeSpreadLeg527>(data, header->message_size); break;
case 531: handle<iLinkBinary::ExecutionReportModify531>(data, header->message_size); break;
case 532: handle<iLinkBinary::ExecutionReportStatus532>(data, header->message_size); break;
case 534: handle<iLinkBinary::ExecutionReportCancel534>(data, header->message_size); break;
case 535: handle<iLinkBinary::OrderCancelReject535>(data, header->message_size); break;
case 536: handle<iLinkBinary::OrderCancelReplaceReject536>(data, header->message_size); break;
// case 538: handle<iLinkBinary::PartyDetailsListReport538>(data, header->message_size); break;
case 539: handle<iLinkBinary::ExecutionAck539>(data, header->message_size); break;
// case 544: handle<iLinkBinary::NewOrderCross544>(data, header->message_size); break;
// case 545: handle<iLinkBinary::MassQuoteAck545>(data, header->message_size); break;
// case 546: handle<iLinkBinary::RequestForQuoteAck546>(data, header->message_size); break;
// case 547: handle<iLinkBinary::QuoteCancelAck547>(data, header->message_size); break;
case 548: handle<iLinkBinary::ExecutionReportTradeAddendumOutright548>(data, header->message_size); break;
case 549: handle<iLinkBinary::ExecutionReportTradeAddendumSpread549>(data, header->message_size); break;
case 550: handle<iLinkBinary::ExecutionReportTradeAddendumSpreadLeg550>(data, header->message_size); break;
// case 558: handle<iLinkBinary::OrderMassActionReport558>(data, header->message_size); break;
// case 561: handle<iLinkBinary::SecurityDefinitionResponse561>(data, header->message_size); break;
}
return consume_messages(*this, data, len);
}
template <class T>
+1 -46
View File
@@ -11,41 +11,7 @@
#include "IL3MessageFramer.h"
#include "generated/MessageHeader.h"
namespace iLinkBinary {
class Negotiate500;
class Establish503;
class RetransmitRequest508;
class NewOrderSingle514;
class OrderCancelReplaceRequest515;
class OrderCancelRequest516;
class PartyDetailsDefinitionRequest518;
class NegotiationResponse501;
class NegotiationReject502;
class EstablishmentAck504;
class EstablishmentReject505;
class Sequence506;
class Terminate507;
class Retransmission509;
class RetransmitReject510;
class NotApplied513;
class PartyDetailsDefinitionRequestAck519;
class BusinessReject521;
class ExecutionReportNew522;
class ExecutionReportReject523;
class ExecutionReportElimination524;
class ExecutionReportTradeOutright525;
class ExecutionReportTradeSpread526;
class ExecutionReportTradeSpreadLeg527;
class ExecutionReportModify531;
class ExecutionReportStatus532;
class ExecutionReportCancel534;
class OrderCancelReject535;
class OrderCancelReplaceReject536;
class ExecutionAck539;
class ExecutionReportTradeAddendumOutright548;
class ExecutionReportTradeAddendumSpread549;
class ExecutionReportTradeAddendumSpreadLeg550;
}
#include "IL3GeneratedFwd.h"
namespace bts {
namespace orderman {
@@ -134,17 +100,6 @@ private: // Functions
// Message handlers
size_t on_data(const char* data, size_t len) override;
void on_message(const FramingHeader*, const char* data);
template <class T>
void handle(const char* data, uint16_t len) {
handle(
T {
const_cast<char*>(data),
sizeof(FramingHeader) + iLinkBinary::MessageHeader::encodedLength(),
len,
T::sbeBlockLength(),
T::sbeSchemaVersion() });
}
void handle(const iLinkBinary::NegotiationResponse501&);
void handle(const iLinkBinary::NegotiationReject502&);
@@ -123,11 +123,16 @@ TEST_CASE("ilink3 message framer", "[ilink3][execution]") {
}
TEST_CASE("ilink3 login", "[ilink3][execution]") {
TestConnection con { [](const std::string_view) {
}};
Session session { 100, 0, 0 };
Config config { std::nullopt, "NGG", "004", false };
SECTION("New Session") {
// Simplest scenario. Log in with no messages to replay
// TestConnection tc;
}
SECTION("Existing Session") {
// Log in and get notified of an old session
// Old session does *NOT* have new messages so do not attempt replay
}
SECTION("Previous Session has messages") {
}