From c694129abaf290b212769cd08f679253c0ffcb0b Mon Sep 17 00:00:00 2001 From: ClarkTucker Date: Fri, 15 Mar 2024 17:27:21 -0600 Subject: [PATCH] CoreDX DDS specific adjustments for improving test timing, and update company and product name --- generate_xlsx_report.py | 4 ++-- srcCxx/shape_configurator_toc_coredx_dds.h | 7 +++++++ srcCxx/shape_main.cxx | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/generate_xlsx_report.py b/generate_xlsx_report.py index 1b97c44..0eefff2 100644 --- a/generate_xlsx_report.py +++ b/generate_xlsx_report.py @@ -55,7 +55,7 @@ def get_company_name(product:str) -> str: elif 'opendds' in product.lower(): return 'OpenDDS Foundation' elif 'coredx' in product.lower(): - return 'Twin Oaks Computing' + return 'Twin Oaks Computing, Inc' elif 'intercom' in product.lower(): return 'Kongsberg' elif 'fastdds' in product.lower(): @@ -72,7 +72,7 @@ def get_product_name(product:str) -> str: elif 'opendds' in product.lower(): return 'OpenDDS ' + re.search(r'([\d.]+)', product).group(1) elif 'coredx' in product.lower(): - return 'CoreDX ' + re.search(r'([\d.]+)', product).group(1) + return 'CoreDX DDS ' + re.search(r'([\d.]+)', product).group(1) elif 'intercom' in product.lower(): return 'InterCOM DDS ' + re.search(r'([\d.]+)', product).group(1) elif 'fastdds' in product.lower(): diff --git a/srcCxx/shape_configurator_toc_coredx_dds.h b/srcCxx/shape_configurator_toc_coredx_dds.h index 5c658f3..bccb52e 100644 --- a/srcCxx/shape_configurator_toc_coredx_dds.h +++ b/srcCxx/shape_configurator_toc_coredx_dds.h @@ -5,6 +5,7 @@ #include "shapeDataReader.hh" #include "shapeDataWriter.hh" +#define CONFIGURE_PARTICIPANT_FACTORY config_transport(); #define LISTENER_STATUS_MASK_ALL (ALL_STATUS) void StringSeq_push(DDS::StringSeq &string_seq, const char *elem) @@ -17,3 +18,9 @@ const char *get_qos_policy_name(DDS_QosPolicyId_t policy_id) return DDS_qos_policy_str(policy_id); // not standard... } + + +static void config_transport() +{ + setenv( "COREDX_UDP_RX_BUFFER_SIZE", "65536", 1 ); /* so we don't miss the first packets if they are large, retransmits may throw off test timing */ +} diff --git a/srcCxx/shape_main.cxx b/srcCxx/shape_main.cxx index b62abb9..ebbec4e 100644 --- a/srcCxx/shape_main.cxx +++ b/srcCxx/shape_main.cxx @@ -819,6 +819,7 @@ class ShapeApplication { dw_qos.representation.value = data_representation_seq; #elif defined(TWINOAKS_COREDX) + dw_qos.rtps_writer.apply_filters = 0; dw_qos.representation.value.clear( ); dw_qos.representation.value.push_back( options->data_representation ); @@ -923,6 +924,8 @@ class ShapeApplication { data_representation_seq[0] = options->data_representation; dr_qos.representation.value = data_representation_seq; #elif defined(TWINOAKS_COREDX) + dr_qos.rtps_reader.send_initial_nack = 1; + dr_qos.rtps_reader.precache_max_samples = 0; dr_qos.representation.value.clear( ); dr_qos.representation.value.push_back( options->data_representation );