Changed QoS assignments in throughput and latency examples

Signed-off-by: Martijn Reicher <[email protected]>
eclipse-cyclonedds · Feb 2, 2023 · 8b82dc5 · 8b82dc5
1 parent 1a56e4b
commit 8b82dc5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 34 deletions.
diff --git a/examples/roundtrip/ping.c b/examples/roundtrip/ping.c
@@ -448,14 +448,17 @@ static dds_entity_t prepare_dds(dds_entity_t *wr, dds_entity_t *rd, dds_entity_t
   const char *pubPartitions[] = { "ping" };
   const char *subPartitions[] = { "pong" };
   dds_qos_t *pubQos;
-  dds_qos_t *dwQos;
-  dds_qos_t *drQos;
   dds_qos_t *subQos;
+  dds_qos_t *tQos;
+  dds_qos_t *wQos;
 
   /* A DDS_Topic is created for our sample type on the domain participant. */
-  topic = dds_create_topic (participant, &RoundTripModule_DataType_desc, "RoundTrip", NULL, NULL);
+  tQos = dds_create_qos ();
+  dds_qset_reliability (tQos, DDS_RELIABILITY_RELIABLE, DDS_SECS (10));
+  topic = dds_create_topic (participant, &RoundTripModule_DataType_desc, "RoundTrip", tQos, NULL);
   if (topic < 0)
     DDS_FATAL("dds_create_topic: %s\n", dds_strretcode(-topic));
+  dds_delete_qos (tQos);
 
   /* A DDS_Publisher is created on the domain participant. */
   pubQos = dds_create_qos ();
@@ -467,13 +470,12 @@ static dds_entity_t prepare_dds(dds_entity_t *wr, dds_entity_t *rd, dds_entity_t
   dds_delete_qos (pubQos);
 
   /* A DDS_DataWriter is created on the Publisher & Topic with a modified Qos. */
-  dwQos = dds_create_qos ();
-  dds_qset_reliability (dwQos, DDS_RELIABILITY_RELIABLE, DDS_SECS (10));
-  dds_qset_writer_data_lifecycle (dwQos, false);
-  *wr = dds_create_writer (publisher, topic, dwQos, NULL);
+  wQos = dds_create_qos ();
+  dds_qset_writer_data_lifecycle (wQos, false);
+  *wr = dds_create_writer (publisher, topic, wQos, NULL);
   if (*wr < 0)
     DDS_FATAL("dds_create_writer: %s\n", dds_strretcode(-*wr));
-  dds_delete_qos (dwQos);
+  dds_delete_qos (wQos);
 
   /* A DDS_Subscriber is created on the domain participant. */
   subQos = dds_create_qos ();
@@ -485,12 +487,9 @@ static dds_entity_t prepare_dds(dds_entity_t *wr, dds_entity_t *rd, dds_entity_t
     DDS_FATAL("dds_create_subscriber: %s\n", dds_strretcode(-subscriber));
   dds_delete_qos (subQos);
   /* A DDS_DataReader is created on the Subscriber & Topic with a modified QoS. */
-  drQos = dds_create_qos ();
-  dds_qset_reliability (drQos, DDS_RELIABILITY_RELIABLE, DDS_SECS(10));
-  *rd = dds_create_reader (subscriber, topic, drQos, listener);
+  *rd = dds_create_reader (subscriber, topic, NULL, listener);
   if (*rd < 0)
     DDS_FATAL("dds_create_reader: %s\n", dds_strretcode(-*rd));
-  dds_delete_qos (drQos);
 
   waitSet = dds_create_waitset (participant);
   if (listener == NULL) {

diff --git a/examples/roundtrip/pong.c b/examples/roundtrip/pong.c
@@ -168,9 +168,12 @@ static dds_entity_t prepare_dds(dds_entity_t *wr, dds_entity_t *rd, dds_entity_t
 
   /* A DDS Topic is created for our sample type on the domain participant. */
 
-  topic = dds_create_topic (participant, &RoundTripModule_DataType_desc, "RoundTrip", NULL, NULL);
+  qos = dds_create_qos ();
+  dds_qset_reliability (qos, DDS_RELIABILITY_RELIABLE, DDS_SECS(10));
+  topic = dds_create_topic (participant, &RoundTripModule_DataType_desc, "RoundTrip", qos, NULL);
   if (topic < 0)
     DDS_FATAL("dds_create_topic: %s\n", dds_strretcode(-topic));
+  dds_delete_qos (qos);
 
   /* A DDS Publisher is created on the domain participant. */
 
@@ -185,7 +188,6 @@ static dds_entity_t prepare_dds(dds_entity_t *wr, dds_entity_t *rd, dds_entity_t
   /* A DDS DataWriter is created on the Publisher & Topic with a modififed Qos. */
 
   qos = dds_create_qos ();
-  dds_qset_reliability (qos, DDS_RELIABILITY_RELIABLE, DDS_SECS(10));
   dds_qset_writer_data_lifecycle (qos, false);
   *wr = dds_create_writer (publisher, topic, qos, NULL);
   if (*wr < 0)
@@ -204,12 +206,9 @@ static dds_entity_t prepare_dds(dds_entity_t *wr, dds_entity_t *rd, dds_entity_t
 
   /* A DDS DataReader is created on the Subscriber & Topic with a modified QoS. */
 
-  qos = dds_create_qos ();
-  dds_qset_reliability (qos, DDS_RELIABILITY_RELIABLE, DDS_SECS(10));
-  *rd = dds_create_reader (subscriber, topic, qos, rdlist);
+  *rd = dds_create_reader (subscriber, topic, NULL, rdlist);
   if (*rd < 0)
     DDS_FATAL("dds_create_reader: %s\n", dds_strretcode(-*rd));
-  dds_delete_qos (qos);
 
   waitSet = dds_create_waitset (participant);
   if (rdlist == NULL) {

diff --git a/examples/throughput/publisher.c b/examples/throughput/publisher.c
@@ -140,7 +140,7 @@ static dds_entity_t prepare_dds(dds_entity_t *writer, const char *partitionName)
   dds_entity_t publisher;
   const char *pubParts[1];
   dds_qos_t *pubQos;
-  dds_qos_t *dwQos;
+  dds_qos_t *tQos;
 
   /* A domain participant is created for the default domain. */
   participant = dds_create_participant (DDS_DOMAIN_DEFAULT, NULL, NULL);
@@ -151,7 +151,11 @@ static dds_entity_t prepare_dds(dds_entity_t *writer, const char *partitionName)
   dds_write_set_batch (true);
 
   /* A topic is created for our sample type on the domain participant. */
-  topic = dds_create_topic (participant, &ThroughputModule_DataType_desc, "Throughput", NULL, NULL);
+  tQos = dds_create_qos ();
+  dds_qset_reliability (tQos, DDS_RELIABILITY_RELIABLE, DDS_SECS (10));
+  dds_qset_history (tQos, DDS_HISTORY_KEEP_ALL, 0);
+  dds_qset_resource_limits (tQos, MAX_SAMPLES, DDS_LENGTH_UNLIMITED, DDS_LENGTH_UNLIMITED);
+  topic = dds_create_topic (participant, &ThroughputModule_DataType_desc, "Throughput", tQos, NULL);
   if (topic < 0)
     DDS_FATAL("dds_create_topic: %s\n", dds_strretcode(-topic));
 
@@ -165,14 +169,10 @@ static dds_entity_t prepare_dds(dds_entity_t *writer, const char *partitionName)
   dds_delete_qos (pubQos);
 
   /* A DataWriter is created on the publisher. */
-  dwQos = dds_create_qos ();
-  dds_qset_reliability (dwQos, DDS_RELIABILITY_RELIABLE, DDS_SECS (10));
-  dds_qset_history (dwQos, DDS_HISTORY_KEEP_ALL, 0);
-  dds_qset_resource_limits (dwQos, MAX_SAMPLES, DDS_LENGTH_UNLIMITED, DDS_LENGTH_UNLIMITED);
-  *writer = dds_create_writer (publisher, topic, dwQos, NULL);
+  *writer = dds_create_writer (publisher, topic, NULL, NULL);
   if (*writer < 0)
     DDS_FATAL("dds_create_writer: %s\n", dds_strretcode(-*writer));
-  dds_delete_qos (dwQos);
+  dds_delete_qos (tQos);
 
   return participant;
 }

diff --git a/examples/throughput/subscriber.c b/examples/throughput/subscriber.c
@@ -315,7 +315,7 @@ static dds_entity_t prepare_dds(dds_entity_t *reader, const char *partitionName)
   int32_t maxSamples = 4000;
   const char *subParts[1];
   dds_qos_t *subQos = dds_create_qos ();
-  dds_qos_t *drQos = dds_create_qos ();
+  dds_qos_t *tQos = dds_create_qos ();
 
   /* A Participant is created for the default domain. */
 
@@ -325,7 +325,10 @@ static dds_entity_t prepare_dds(dds_entity_t *reader, const char *partitionName)
 
   /* A Topic is created for our sample type on the domain participant. */
 
-  topic = dds_create_topic (participant, &ThroughputModule_DataType_desc, "Throughput", NULL, NULL);
+  dds_qset_reliability (tQos, DDS_RELIABILITY_RELIABLE, DDS_SECS (10));
+  dds_qset_history (tQos, DDS_HISTORY_KEEP_ALL, 0);
+  dds_qset_resource_limits (tQos, maxSamples, DDS_LENGTH_UNLIMITED, DDS_LENGTH_UNLIMITED);
+  topic = dds_create_topic (participant, &ThroughputModule_DataType_desc, "Throughput", tQos, NULL);
   if (topic < 0)
     DDS_FATAL("dds_create_topic: %s\n", dds_strretcode(-topic));
 
@@ -340,10 +343,6 @@ static dds_entity_t prepare_dds(dds_entity_t *reader, const char *partitionName)
 
   /* A Reader is created on the Subscriber & Topic with a modified Qos. */
 
-  dds_qset_reliability (drQos, DDS_RELIABILITY_RELIABLE, DDS_SECS (10));
-  dds_qset_history (drQos, DDS_HISTORY_KEEP_ALL, 0);
-  dds_qset_resource_limits (drQos, maxSamples, DDS_LENGTH_UNLIMITED, DDS_LENGTH_UNLIMITED);
-
   rd_listener = dds_create_listener(NULL);
   dds_lset_data_available(rd_listener, data_available_handler);
 
@@ -364,7 +363,7 @@ static dds_entity_t prepare_dds(dds_entity_t *reader, const char *partitionName)
     samples[i] = &data[i];
   }
 
-  *reader = dds_create_reader (subscriber, topic, drQos, pollingDelay < 0 ? rd_listener : NULL);
+  *reader = dds_create_reader (subscriber, topic, NULL, pollingDelay < 0 ? rd_listener : NULL);
   if (*reader < 0)
     DDS_FATAL("dds_create_reader: %s\n", dds_strretcode(-*reader));
 
@@ -375,7 +374,7 @@ static dds_entity_t prepare_dds(dds_entity_t *reader, const char *partitionName)
       DDS_FATAL("dds_waitset_attach: %s\n", dds_strretcode(-status));
   }
 
-  dds_delete_qos (drQos);
+  dds_delete_qos (tQos);
   dds_delete_listener(rd_listener);
 
   return participant;