From 4eb2931cb8cd74bd55e3c12f01bee70e82a9587e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Sat, 28 Mar 2020 21:08:47 -0500 Subject: [PATCH] Additional ilink3 refactoring --- .../orderman/actors/ilink3/IL3Dispatcher.h | 88 ++++++++++++ .../orderman/actors/ilink3/IL3GeneratedFull.h | 56 ++++++++ .../orderman/actors/ilink3/IL3GeneratedFwd.h | 37 ++++++ src/lib/orderman/actors/ilink3/ILinkGW.cpp | 125 +----------------- src/lib/orderman/actors/ilink3/ILinkGW.h | 47 +------ .../actors/ilink3/test/ILinkGWTests.cpp | 7 +- 6 files changed, 191 insertions(+), 169 deletions(-) create mode 100644 src/lib/orderman/actors/ilink3/IL3Dispatcher.h create mode 100644 src/lib/orderman/actors/ilink3/IL3GeneratedFull.h create mode 100644 src/lib/orderman/actors/ilink3/IL3GeneratedFwd.h diff --git a/src/lib/orderman/actors/ilink3/IL3Dispatcher.h b/src/lib/orderman/actors/ilink3/IL3Dispatcher.h new file mode 100644 index 000000000..72d603fdf --- /dev/null +++ b/src/lib/orderman/actors/ilink3/IL3Dispatcher.h @@ -0,0 +1,88 @@ +#pragma once +#include +#include "IL3GeneratedFull.h" +#include "IL3MessageFramer.h" + +namespace bts { +namespace orderman { +namespace ilink3 { + +template +void handle(Handler& h, const char* data, uint16_t len) { + h.handle( + T { + const_cast(data), + sizeof(FramingHeader) + iLinkBinary::MessageHeader::encodedLength(), + len, + T::sbeBlockLength(), + T::sbeSchemaVersion() }); +} + + +template +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, data, header->message_size); break; + case 502: handle(handler, data, header->message_size); break; + case 504: handle(handler, data, header->message_size); break; + case 505: handle(handler, data, header->message_size); break; + case 506: handle(handler, data, header->message_size); break; + case 507: handle(handler, data, header->message_size); break; + case 509: handle(handler, data, header->message_size); break; + case 510: handle(handler, data, header->message_size); break; + case 513: handle(handler, data, header->message_size); break; + case 519: handle(handler, data, header->message_size); break; + case 521: handle(handler, data, header->message_size); break; + case 522: handle(handler, data, header->message_size); break; + case 523: handle(handler, data, header->message_size); break; + case 524: handle(handler, data, header->message_size); break; + case 525: handle(handler, data, header->message_size); break; + case 526: handle(handler, data, header->message_size); break; + case 527: handle(handler, data, header->message_size); break; + case 531: handle(handler, data, header->message_size); break; + case 532: handle(handler, data, header->message_size); break; + case 534: handle(handler, data, header->message_size); break; + case 535: handle(handler, data, header->message_size); break; + case 536: handle(handler, data, header->message_size); break; + // case 538: handle(handler, data, header->message_size); break; + case 539: handle(handler, data, header->message_size); break; + // case 544: handle(handler, data, header->message_size); break; + // case 545: handle(handler, data, header->message_size); break; + // case 546: handle(handler, data, header->message_size); break; + // case 547: handle(handler, data, header->message_size); break; + case 548: handle(handler, data, header->message_size); break; + case 549: handle(handler, data, header->message_size); break; + case 550: handle(handler, data, header->message_size); break; + // case 558: handle(handler, data, header->message_size); break; + // case 561: handle(handler, data, header->message_size); break; + } +} + +template +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(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 \ No newline at end of file diff --git a/src/lib/orderman/actors/ilink3/IL3GeneratedFull.h b/src/lib/orderman/actors/ilink3/IL3GeneratedFull.h new file mode 100644 index 000000000..01e8319c1 --- /dev/null +++ b/src/lib/orderman/actors/ilink3/IL3GeneratedFull.h @@ -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" \ No newline at end of file diff --git a/src/lib/orderman/actors/ilink3/IL3GeneratedFwd.h b/src/lib/orderman/actors/ilink3/IL3GeneratedFwd.h new file mode 100644 index 000000000..3446e9e3a --- /dev/null +++ b/src/lib/orderman/actors/ilink3/IL3GeneratedFwd.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; +} diff --git a/src/lib/orderman/actors/ilink3/ILinkGW.cpp b/src/lib/orderman/actors/ilink3/ILinkGW.cpp index 97ec9a597..7db602b35 100644 --- a/src/lib/orderman/actors/ilink3/ILinkGW.cpp +++ b/src/lib/orderman/actors/ilink3/ILinkGW.cpp @@ -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(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(data, header->message_size); break; - case 502: handle(data, header->message_size); break; - case 504: handle(data, header->message_size); break; - case 505: handle(data, header->message_size); break; - case 506: handle(data, header->message_size); break; - case 507: handle(data, header->message_size); break; - case 509: handle(data, header->message_size); break; - case 510: handle(data, header->message_size); break; - case 513: handle(data, header->message_size); break; - case 519: handle(data, header->message_size); break; - case 521: handle(data, header->message_size); break; - case 522: handle(data, header->message_size); break; - case 523: handle(data, header->message_size); break; - case 524: handle(data, header->message_size); break; - case 525: handle(data, header->message_size); break; - case 526: handle(data, header->message_size); break; - case 527: handle(data, header->message_size); break; - case 531: handle(data, header->message_size); break; - case 532: handle(data, header->message_size); break; - case 534: handle(data, header->message_size); break; - case 535: handle(data, header->message_size); break; - case 536: handle(data, header->message_size); break; - // case 538: handle(data, header->message_size); break; - case 539: handle(data, header->message_size); break; - // case 544: handle(data, header->message_size); break; - // case 545: handle(data, header->message_size); break; - // case 546: handle(data, header->message_size); break; - // case 547: handle(data, header->message_size); break; - case 548: handle(data, header->message_size); break; - case 549: handle(data, header->message_size); break; - case 550: handle(data, header->message_size); break; - // case 558: handle(data, header->message_size); break; - // case 561: handle(data, header->message_size); break; - } + return consume_messages(*this, data, len); } template diff --git a/src/lib/orderman/actors/ilink3/ILinkGW.h b/src/lib/orderman/actors/ilink3/ILinkGW.h index 02bc8f7ae..dac3a794c 100644 --- a/src/lib/orderman/actors/ilink3/ILinkGW.h +++ b/src/lib/orderman/actors/ilink3/ILinkGW.h @@ -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 - void handle(const char* data, uint16_t len) { - handle( - T { - const_cast(data), - sizeof(FramingHeader) + iLinkBinary::MessageHeader::encodedLength(), - len, - T::sbeBlockLength(), - T::sbeSchemaVersion() }); - } void handle(const iLinkBinary::NegotiationResponse501&); void handle(const iLinkBinary::NegotiationReject502&); diff --git a/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp b/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp index 5093cb9d7..40c76877c 100644 --- a/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp +++ b/src/lib/orderman/actors/ilink3/test/ILinkGWTests.cpp @@ -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") { }