Skip to content

Commit 3b05314

Browse files
MiguelCompanylauramg15MiguelBarroIkerLuengoEduPonz
authored
Taking improvements from 1.9.x into master (#98)
* Added release v1.9.2 notes (#66) * Release notes 1.9.3 (#71) * Release notes 1.9.3 * Adding new features and improvements * Added notes from 1.8.x * Fixing spell checks * Adding features from 1.9.3 (#72) * Update to introduce new 1.9.x features: participant filtering and intraprocess delivery. * Apply suggestions from code review * Fixing linters * More linters * More fixes. * Fixing XMLTester.xml * Update that participant filtering isn't enabled for secured participants (#73) * Update that participant filtering isn't enable with SECURITY=ON * Fixing linters. * Fixing position of <log> tag (#77) * Changed intraprocess default value. (#75) * Release notes for v1.9.4 (#78) * Refs #7291. Release notes for v1.9.4 * Refs #7291. Fixing mispellings. * Bump version to 1.9.4 * Refs 7515 Improve discovery documentation Static Discovery is covered in PR #81 * Revert "Refs 7515 Improve discovery documentation" This reverts commit c0c8079. * Documentation of variable length submessage limits (#80) * Refs 7306 Documenting variable lenght submessage size limits * Refs 7306 correct spelling errors * add submessage size imit to RealTime Behavior * Fixed typo on CodeTester.cpp Co-authored-by: Miguel Company <[email protected]> * Maximum payload for builtin endpoints (#84) * Maximum payload for builtin endpoints * Update default values according to eProsima/Fast-DDS#918 * Improvements on Static Discovery doc (#81) * Ref 7319 Improvements on static discovery section * clarify userID usage * Fixed blank line before list Co-authored-by: Miguel Company <[email protected]> * Documenting partitions (#86) * Documenting partitions * Apply suggestions from code review Co-Authored-By: Miguel Company <[email protected]> Co-authored-by: Miguel Company <[email protected]> * Apply suggestions from code review Co-Authored-By: Eduardo Ponz Segrelles <[email protected]> * Apply suggestions from code review Co-Authored-By: Eduardo Ponz Segrelles <[email protected]> * Refs #7824. Added builtin payload sizes to XML file. * Refs #7824. Moved participant filtering to discovery section. * Adding XML example to the intra-process section. * Refs #7824. Fixed line too long. * Apply suggestions from code review Co-Authored-By: Eduardo Ponz Segrelles <[email protected]> Co-authored-by: laura <[email protected]> Co-authored-by: MiguelBarro <[email protected]> Co-authored-by: Iker Luengo <[email protected]> Co-authored-by: IkerLuengo <[email protected]> Co-authored-by: Eduardo Ponz Segrelles <[email protected]>
1 parent 6b88980 commit 3b05314

File tree

9 files changed

+812
-123
lines changed

9 files changed

+812
-123
lines changed

‎code/CodeTester.cpp

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,35 @@ subscriber_attr.topic.resourceLimitsQos.max_instances = 3;
114114
subscriber_attr.topic.resourceLimitsQos.max_samples_per_instance = 20;
115115
//!--
116116

117+
{
118+
//CONF-QOS-PARTITIONS
119+
PublisherAttributes pub_11_attr;
120+
pub_11_attr.qos.m_partition.push_back("Partition_1");
121+
pub_11_attr.qos.m_partition.push_back("Partition_2");
122+
123+
PublisherAttributes pub_12_attr;
124+
pub_12_attr.qos.m_partition.push_back("*");
125+
126+
PublisherAttributes pub_21_attr;
127+
//No partitions defined for pub_21
128+
129+
PublisherAttributes pub_22_attr;
130+
pub_22_attr.qos.m_partition.push_back("Partition*");
131+
132+
SubscriberAttributes subs_31_attr;
133+
subs_31_attr.qos.m_partition.push_back("Partition_1");
134+
135+
SubscriberAttributes subs_32_attr;
136+
subs_32_attr.qos.m_partition.push_back("Partition_2");
137+
138+
SubscriberAttributes subs_33_attr;
139+
subs_33_attr.qos.m_partition.push_back("Partition_3");
140+
141+
SubscriberAttributes subs_34_attr;
142+
//No partitions defined for subs_34
143+
//!--
144+
}
145+
117146
//CONF-COMMON-TRANSPORT-SETTING
118147
//Create a descriptor for the new transport.
119148
auto custom_transport = std::make_shared<UDPv4TransportDescriptor>();
@@ -166,6 +195,12 @@ participant_attr.rtps.allocation.participants = eprosima::fastrtps::ResourceLimi
166195
participant_attr.rtps.allocation.readers = eprosima::fastrtps::ResourceLimitedContainerConfig::fixed_size_configuration(2u);
167196
// We know we have at most 1 writer on each participant
168197
participant_attr.rtps.allocation.writers = eprosima::fastrtps::ResourceLimitedContainerConfig::fixed_size_configuration(1u);
198+
// We know the maximum size of partition data
199+
participant_attr.rtps.allocation.data_limits.max_partitions = 256u;
200+
// We know the maximum size of user data
201+
participant_attr.rtps.allocation.data_limits.max_user_data = 256u;
202+
// We know the maximum size of properties data
203+
participant_attr.rtps.allocation.data_limits.max_properties = 512u;
169204

170205
// Before creating the publisher for topic 1:
171206
// we know we will only have three matching subscribers
@@ -426,8 +461,19 @@ participant_attr.rtps.builtin.discovery_config.use_STATIC_EndpointDiscoveryProto
426461
//!--
427462

428463
//CONF_QOS_STATIC_DISCOVERY_XML
429-
participant_attr.rtps.builtin.discovery_config.setStaticEndpointXMLFilename("ParticipantWithASubscriber.xml");
464+
participant_attr.rtps.builtin.discovery_config.setStaticEndpointXMLFilename("RemotePublisher.xml");
465+
participant_attr.rtps.builtin.discovery_config.setStaticEndpointXMLFilename("RemoteSubscriber.xml");
466+
//!--
467+
468+
{
469+
//CONF_QOS_STATIC_DISCOVERY_USERID
470+
SubscriberAttributes sub_attr;
471+
sub_attr.setUserDefinedID(3);
472+
473+
PublisherAttributes pub_attr;
474+
pub_attr.setUserDefinedID(5);
430475
//!--
476+
}
431477

432478
//CONF_QOS_TUNING_RELIABLE_PUBLISHER
433479
publisher_attr.times.heartbeatPeriod.seconds = 0;

‎code/StaticTester.xml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,40 @@
55
<reader>
66
<userId>3</userId>
77
<entityId>4</entityId>
8+
<expectsInlineQos>true</expectsInlineQos>
89
<topicName>HelloWorldTopic</topicName>
910
<topicDataType>HelloWorld</topicDataType>
11+
<topicKind>WITH_KEY</topicKind>
12+
<partitionQos>HelloPartition</partitionQos>
13+
<partitionQos>WorldPartition</partitionQos>
14+
<unicastLocator address="192.168.0.128" port="5000"/>
15+
<unicastLocator address="10.47.8.30" port="6000"/>
16+
<multicastLocator address="239.255.1.1" port="7000"/>
17+
<reliabilityQos>BEST_EFFORT_RELIABILITY_QOS </reliabilityQos>
18+
<durabilityQos>VOLATILE_DURABILITY_QOS</durabilityQos>
19+
<ownershipQos kind="SHARED_OWNERSHIP_QOS"/>
20+
<livelinessQos kind="AUTOMATIC_LIVELINESS_QOS" leaseDuration_ms="1000"/>
1021
</reader>
1122
</participant>
1223
<participant>
1324
<name>HelloWorldPublisher</name>
1425
<writer>
15-
<userId>1</userId>
16-
<entityId>2</entityId>
26+
<unicastLocator address="192.168.0.120" port="9000"/>
27+
<unicastLocator address="10.47.8.31" port="8000"/>
28+
<multicastLocator address="239.255.1.1" port="7000"/>
29+
<userId>5</userId>
30+
<entityId>6</entityId>
1731
<topicName>HelloWorldTopic</topicName>
1832
<topicDataType>HelloWorld</topicDataType>
33+
<topicKind>WITH_KEY</topicKind>
34+
<partitionQos>HelloPartition</partitionQos>
35+
<partitionQos>WorldPartition</partitionQos>
36+
<reliabilityQos>BEST_EFFORT_RELIABILITY_QOS </reliabilityQos>
37+
<durabilityQos>VOLATILE_DURABILITY_QOS</durabilityQos>
38+
<ownershipQos kind="SHARED_OWNERSHIP_QOS" strength="50"/>
39+
<livelinessQos kind="AUTOMATIC_LIVELINESS_QOS" leaseDuration_ms="1000"/>
1940
</writer>
2041
</participant>
2142
</staticdiscovery>
43+
2244
<!--><-->

‎code/XMLTester.xml

Lines changed: 128 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@
5656
</subscriber>
5757
<!--><-->
5858

59+
<!-->CONF_QOS_STATIC_DISCOVERY_USERID<-->
60+
<publisher profile_name="publisher_xml_conf_static_discovery">
61+
<userDefinedID>3</userDefinedID>
62+
</publisher>
63+
64+
<subscriber profile_name="subscriber_xml_conf_static_discovery">
65+
<userDefinedID>5</userDefinedID>
66+
</subscriber>
67+
<!--><-->
68+
5969
<!-->PUBSUB_API_CONF_PUBSUB_RELIABILITY<-->
6070
<publisher profile_name="publisher_xml_conf_reliability_profile">
6171
<qos>
@@ -287,6 +297,107 @@
287297
</subscriber>
288298
<!--><-->
289299

300+
<!-->CONF-QOS-PARTITIONS<-->
301+
<publisher profile_name="pub_11">
302+
<topic>
303+
<name>TopicName</name>
304+
<dataType>TopicDataTypeName</dataType>
305+
</topic>
306+
<qos>
307+
<partition>
308+
<names>
309+
<name>Partition_1</name>
310+
<name>Partition_2</name>
311+
</names>
312+
</partition>
313+
</qos>
314+
</publisher>
315+
316+
<publisher profile_name="pub_12">
317+
<topic>
318+
<name>TopicName</name>
319+
<dataType>TopicDataTypeName</dataType>
320+
</topic>
321+
<qos>
322+
<partition>
323+
<names>
324+
<name>*</name>
325+
</names>
326+
</partition>
327+
</qos>
328+
</publisher>
329+
330+
<publisher profile_name="pub_21">
331+
<topic>
332+
<name>TopicName</name>
333+
<dataType>TopicDataTypeName</dataType>
334+
</topic>
335+
</publisher>
336+
337+
<publisher profile_name="pub_22">
338+
<topic>
339+
<name>TopicName</name>
340+
<dataType>TopicDataTypeName</dataType>
341+
</topic>
342+
<qos>
343+
<partition>
344+
<names>
345+
<name>Partition*</name>
346+
</names>
347+
</partition>
348+
</qos>
349+
</publisher>
350+
351+
<subscriber profile_name="subs_31">
352+
<topic>
353+
<name>TopicName</name>
354+
<dataType>TopicDataTypeName</dataType>
355+
</topic>
356+
<qos>
357+
<partition>
358+
<names>
359+
<name>Partition_1</name>
360+
</names>
361+
</partition>
362+
</qos>
363+
</subscriber>
364+
365+
<subscriber profile_name="subs_32">
366+
<topic>
367+
<name>TopicName</name>
368+
<dataType>TopicDataTypeName</dataType>
369+
</topic>
370+
<qos>
371+
<partition>
372+
<names>
373+
<name>Partition_2</name>
374+
</names>
375+
</partition>
376+
</qos>
377+
</subscriber>
378+
379+
<subscriber profile_name="subs_33">
380+
<topic>
381+
<name>TopicName</name>
382+
<dataType>TopicDataTypeName</dataType>
383+
</topic>
384+
<qos>
385+
<partition>
386+
<names>
387+
<name>Partition_3</name>
388+
</names>
389+
</partition>
390+
</qos>
391+
</subscriber>
392+
393+
<subscriber profile_name="subs_34">
394+
<topic>
395+
<name>TopicName</name>
396+
<dataType>TopicDataTypeName</dataType>
397+
</topic>
398+
</subscriber>
399+
<!--><-->
400+
290401
<!-->CONF-COMMON-TRANSPORT-SETTING<-->
291402
<transport_descriptors>
292403
<transport_descriptor>
@@ -993,6 +1104,9 @@
9931104
<maximum>0</maximum>
9941105
<increment>1</increment>
9951106
</total_writers>
1107+
<max_partitions>256</max_partitions>
1108+
<max_user_data>256</max_user_data>
1109+
<max_properties>512</max_properties>
9961110
</allocation>
9971111
<!--><-->
9981112
</rtps>
@@ -1006,6 +1120,8 @@
10061120

10071121
<discoveryProtocol>NONE</discoveryProtocol> <!-- DiscoveryProtocol enum -->
10081122

1123+
<ignoreParticipantFlags>FILTER_DIFFERENT_HOST</ignoreParticipantFlags> <!-- ParticipantFlags enum -->
1124+
10091125
<EDP>SIMPLE</EDP> <!-- string -->
10101126

10111127
<leaseDuration>
@@ -1061,8 +1177,10 @@
10611177
</initialPeersList>
10621178

10631179
<readerHistoryMemoryPolicy>PREALLOCATED_WITH_REALLOC</readerHistoryMemoryPolicy>
1180+
<readerPayloadSize>512</readerPayloadSize>
10641181

10651182
<writerHistoryMemoryPolicy>PREALLOCATED_WITH_REALLOC</writerHistoryMemoryPolicy>
1183+
<writerPayloadSize>512</writerPayloadSize>
10661184

10671185
<mutation_tries>55</mutation_tries>
10681186
</builtin>
@@ -1399,6 +1517,9 @@
13991517
<maximum>1</maximum>
14001518
<increment>0</increment>
14011519
</total_writers>
1520+
<max_partitions>256</max_partitions>
1521+
<max_user_data>256</max_user_data>
1522+
<max_properties>512</max_properties>
14021523
</allocation>
14031524
</rtps>
14041525
</participant>
@@ -2046,9 +2167,15 @@
20462167

20472168
<entityID>66</entityID>
20482169
</subscriber>
2049-
</profiles>
2170+
2171+
<!-->CONF-LIBRARY-SETTINGS<-->
2172+
<library_settings>
2173+
<intraprocess_delivery>FULL</intraprocess_delivery> <!-- OFF | USER_DATA_ONLY | FULL -->
2174+
</library_settings>
20502175
<!--><-->
20512176

2177+
</profiles>
2178+
20522179
<!-->LOG-CONFIG<-->
20532180
<log>
20542181
<use_default>FALSE</use_default>

0 commit comments

Comments
 (0)