summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-04-09 12:33:59 +0000
committermsmit <msmit@remedy.nl>2010-04-09 12:33:59 +0000
commitfab1cd1fae21597b05bedd61f742b2c6c105ed90 (patch)
tree525689c6e5fe1832c8b070b89543cdb211daccb8
parentb4c834e37a04f174e6a91f5927c2ba9d97d67f12 (diff)
downloadATCD-fab1cd1fae21597b05bedd61f742b2c6c105ed90.tar.gz
Fri Apr 9 12:28:34 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl: * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl: * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h: * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp: Moved connector declaration to the namespace of the test. Give an error when this test does not run. Also made some layout changes. * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl: * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h: * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: Moved connector declaration to the namespace of the test. Resolved test error. Number of subscribers is less than expected. Give an error when this test does not run. Also made some layout changes. * connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp: * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: * connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp: * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: Renamed QoS profile. * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl: Removed unnecessary code.
-rw-r--r--CIAO/ChangeLog28
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl8
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl4
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp15
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h6
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl8
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp69
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h6
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp4
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml4
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp4
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml4
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl1
14 files changed, 99 insertions, 64 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 294d570a6c6..1db0cb40e6f 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,31 @@
+Fri Apr 9 12:28:34 UTC 2010 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl:
+ * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl:
+ * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h:
+ * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp:
+ Moved connector declaration to the namespace of the test.
+ Give an error when this test does not run.
+ Also made some layout changes.
+
+ * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl:
+ * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h:
+ * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp:
+ Moved connector declaration to the namespace of the test.
+ Resolved test error. Number of subscribers is less than expected.
+ Give an error when this test does not run.
+ Also made some layout changes.
+
+ * connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp:
+ * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml:
+ * connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp:
+ * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml:
+ Renamed QoS profile.
+
+ * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h:
+ * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl:
+ Removed unnecessary code.
+
Fri Apr 9 11:42:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/IDL3/Connectors:
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl
index 353de5b0b18..9d86cb5385a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl
@@ -16,14 +16,10 @@
#pragma ciao lem "Connector/LatencyTT_Test_ConnectorE.idl"
-module CCM_DDS
-{
- module ::CCM_DDS::Typed < ::LatencyTTTest, ::LatencyTTTestSeq> LatencyTTTest;
-};
-
module LatencyTT_Test
{
- connector LatencyTT_Test_Connector : ::CCM_DDS::LatencyTTTest::DDS_Event
+ module ::CCM_DDS::Typed < ::LatencyTTTest, ::LatencyTTTestSeq> LatencyTTTestConn;
+ connector LatencyTT_Test_Connector : LatencyTTTestConn::DDS_Event
{
};
};
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl
index 129dd116877..751094ae18f 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl
@@ -14,8 +14,8 @@ module LatencyTT_Test
{
component Receiver
{
- port CCM_DDS::LatencyTTTest::DDS_Listen info_listen;
- port CCM_DDS::LatencyTTTest::DDS_Write write_ping;
+ port LatencyTTTestConn::DDS_Listen info_listen;
+ port LatencyTTTestConn::DDS_Write write_ping;
};
};
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp
index fa2ee3b5141..8b1aae943cc 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp
@@ -63,7 +63,7 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl
dlc->mode (::CCM_DDS::ONE_BY_ONE);
}
- ::CCM_DDS::LatencyTTTest::CCM_Listener_ptr
+ ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr
Receiver_exec_i::get_info_listen_data_listener (void)
{
return new LatencyTTTest_Listener_exec_i (*this);
@@ -103,9 +103,16 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl
void
Receiver_exec_i::ccm_passivate (void)
{
- ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
- "Total number of messages sent back: %u \n",
- this->count_));
+ if (this->count_ == 0)
+ {
+ ACE_ERROR ((LM_ERROR, "ERROR RECEIVER: No messages sent back.\n"));
+ }
+ else
+ {
+ ACE_DEBUG ((LM_DEBUG, "SUMMARY RECEIVER:\n "
+ "Total number of messages sent back: %u \n",
+ this->count_));
+ }
}
void
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h
index 33da273e382..d6f4b6c35c9 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h
@@ -24,7 +24,7 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl
// LatencyTTTest_Listener_exec_i
//============================================================
class RECEIVER_EXEC_Export LatencyTTTest_Listener_exec_i
- : public virtual ::CCM_DDS::LatencyTTTest::CCM_Listener,
+ : public virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener,
public virtual ::CORBA::LocalObject
{
public:
@@ -57,7 +57,7 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl
void start ();
void record_time (unsigned long datalen);
- virtual ::CCM_DDS::LatencyTTTest::CCM_Listener_ptr
+ virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr
get_info_listen_data_listener (void);
virtual ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -76,7 +76,7 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl
private:
::LatencyTT_Test::CCM_Receiver_Context_var context_;
- CCM_DDS::LatencyTTTest::Writer_var writer_;
+ ::LatencyTT_Test::LatencyTTTestConn::Writer_var writer_;
CORBA::ULong count_;
};
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl
index 9477275f359..8e86adfc33a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl
@@ -16,12 +16,14 @@ module LatencyTT_Test
{
component Sender
{
- port CCM_DDS::LatencyTTTest::DDS_Write info_write;
+ port LatencyTTTestConn::DDS_Write info_write;
+ port LatencyTTTestConn::DDS_Listen ping_listen;
+
+ provides CCM_DDS::ConnectorStatusListener connector_status;
+
attribute unsigned long iterations;
attribute unsigned short sleep;
attribute unsigned short number_of_sub; //number of subscribers
- provides CCM_DDS::ConnectorStatusListener connector_status;
- port CCM_DDS::LatencyTTTest::DDS_Listen ping_listen;
};
};
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp
index b0a7afd2d49..780657de268 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp
@@ -92,26 +92,24 @@ namespace CIAO_LatencyTT_Test_Sender_Impl
::DDS::Entity_ptr the_entity,
::DDS::StatusKind status_kind)
{
- if ((! ::CORBA::is_nil(the_entity)) &&
- (status_kind = DDS::PUBLICATION_MATCHED_STATUS))
+ if (! ::CORBA::is_nil (the_entity) &&
+ status_kind == DDS::PUBLICATION_MATCHED_STATUS)
{
::DDS::PublicationMatchedStatus_var stat;
DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow(the_entity);
if(::CORBA::is_nil(wr))
- {
+ {
throw ::CORBA::INTERNAL ();
- }
+ }
::DDS::ReturnCode_t retval = wr->get_publication_matched_status(stat.out ());
if (retval == DDS::RETCODE_OK)
{
-
- if((stat.in().current_count >=
- (this->number_of_subscribers_ + 1)) &&
- !this->matched_.value())
- {
- this->matched_ = true;
- this->callback_.start();
- }
+ if (stat.in().current_count >= this->number_of_subscribers_ &&
+ !this->matched_.value())
+ {
+ this->matched_ = true;
+ this->callback_.start();
+ }
}
}
}
@@ -322,7 +320,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl
*this);
}
- ::CCM_DDS::LatencyTTTest::CCM_Listener_ptr
+ ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr
Sender_exec_i::get_ping_listen_data_listener (void)
{
return new LatencyTTTest_Listener_exec_i (*this);
@@ -351,11 +349,11 @@ namespace CIAO_LatencyTT_Test_Sender_Impl
ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
ACE_TEXT ("Error scheduling timer")));
}
- this->timer_ = true;
- }
+ this->timer_ = true;
+ }
-void
-Sender_exec_i::record_time (ACE_UINT64 receive_time)
+ void
+ Sender_exec_i::record_time (ACE_UINT64 receive_time)
{
ACE_UINT64 interval = receive_time - this->start_time_;
ACE_UINT64 duration = interval - this->_clock_overhead_;
@@ -389,9 +387,9 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time)
throw ::CORBA::BAD_PARAM ();
}
else
- {
- this->iterations_ = iterations;
- }
+ {
+ this->iterations_ = iterations;
+ }
}
::CORBA::UShort
@@ -486,7 +484,7 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time)
::CCM_DDS::DataListenerControl_var dlc =
this->context_->get_connection_ping_listen_data_control ();
dlc->mode (::CCM_DDS::ONE_BY_ONE);
- }
+ }
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Exception caught:");
@@ -505,10 +503,10 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time)
Sender_exec_i::stop (void)
{
if (this->timer_.value ())
- {
- this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
- delete this->ticker_;
- }
+ {
+ this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
+ delete this->ticker_;
+ }
}
void
@@ -520,14 +518,21 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time)
void
Sender_exec_i::ccm_remove (void)
{
- if((this->nr_of_runs_ -1) != this->datalen_idx_)
+ if ((this->nr_of_runs_ -1) != this->datalen_idx_)
{
- ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n"
- " Number of messages sent of last run (%u): %u\n",
- (this->datalen_idx_),
- this->nr_of_runs_,
- (this->datalen_idx_ + 1),
- this->number_of_msg_));
+ if (this->datalen_idx_ == 0)
+ {
+ ACE_ERROR ((LM_ERROR, "ERROR SENDER: No run has taken place.\n"));
+ }
+ else
+ {
+ ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n"
+ " Number of messages sent of last run (%u): %u\n",
+ this->datalen_idx_,
+ this->nr_of_runs_,
+ this->datalen_idx_ + 1,
+ this->number_of_msg_));
+ }
}
else
{
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h
index 9b6a19b89a7..af111e1b63c 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h
@@ -24,7 +24,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl
// LatencyTTTest_Listener_exec_i
//============================================================
class SENDER_EXEC_Export LatencyTTTest_Listener_exec_i
- : public virtual ::CCM_DDS::LatencyTTTest::CCM_Listener,
+ : public virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener,
public virtual ::CORBA::LocalObject
{
public:
@@ -101,7 +101,7 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
get_connector_status (void);
- virtual ::CCM_DDS::LatencyTTTest::CCM_Listener_ptr
+ virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr
get_ping_listen_data_listener (void);
virtual ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -138,7 +138,7 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
private:
::LatencyTT_Test::CCM_Sender_Context_var context_;
- CCM_DDS::LatencyTTTest::Writer_var writer_;
+ ::LatencyTT_Test::LatencyTTTestConn::Writer_var writer_;
WriteTicker *ticker_;
CORBA::UShort iterations_;
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp
index 04ef061032e..76c0cd7dde1 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp
@@ -191,7 +191,7 @@
<kind>tk_string</kind>
</type>
<value>
- <string>QueryFilter_Library#QueryFilter_Profile</string>
+ <string>CoherentUpdater_Library#CoherentUpdater_Profile</string>
</value>
</value>
</configProperty>
@@ -220,7 +220,7 @@
<kind>tk_string</kind>
</type>
<value>
- <string>QueryFilter_Library#QueryFilter_Profile</string>
+ <string>CoherentUpdater_Library#CoherentUpdater_Profile</string>
</value>
</value>
</configProperty>
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml
index 571930e854d..a19958a9ef2 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml
@@ -19,13 +19,13 @@ RTI Data Distribution Service user manual.
A QoS library is a named set of QoS profiles.
-->
- <qos_library name="QueryFilter_Library">
+ <qos_library name="CoherentUpdater_Library">
<!-- QoS profile used to configure reliable communication between the DataWriter
and DataReader created in the example code.
A QoS profile groups a set of related QoS.
-->
- <qos_profile name="QueryFilter_Profile" is_default_qos="true">
+ <qos_profile name="CoherentUpdater_Profile" is_default_qos="true">
<!-- QoS used to configure the data writer created in the example code -->
<datawriter_qos>
<reliability>
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp
index 1b6bfc007de..521972a9fab 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp
@@ -191,7 +191,7 @@
<kind>tk_string</kind>
</type>
<value>
- <string>QueryFilter_Library#QueryFilter_Profile</string>
+ <string>CoherentWriter_Library#CoherentWriter_Profile</string>
</value>
</value>
</configProperty>
@@ -220,7 +220,7 @@
<kind>tk_string</kind>
</type>
<value>
- <string>QueryFilter_Library#QueryFilter_Profile</string>
+ <string>CoherentWriter_Library#CoherentWriter_Profile</string>
</value>
</value>
</configProperty>
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml
index 571930e854d..97da5d0ee8a 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml
@@ -19,13 +19,13 @@ RTI Data Distribution Service user manual.
A QoS library is a named set of QoS profiles.
-->
- <qos_library name="QueryFilter_Library">
+ <qos_library name="CoherentWriter_Library">
<!-- QoS profile used to configure reliable communication between the DataWriter
and DataReader created in the example code.
A QoS profile groups a set of related QoS.
-->
- <qos_profile name="QueryFilter_Profile" is_default_qos="true">
+ <qos_profile name="CoherentWriter_Profile" is_default_qos="true">
<!-- QoS used to configure the data writer created in the example code -->
<datawriter_qos>
<reliability>
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h
index 9fb2d84eccc..53ca5deb3c2 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h
@@ -17,8 +17,6 @@
#include "dds4ccm/impl/dds/DataWriter.h"
-#include <map>
-
class WriterTestDataWriter;
namespace CIAO_Writer_Sender_Impl
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
index c96d84077ce..ca0ced47bd1 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
@@ -15,7 +15,6 @@ module QosProfile_Test
component QosProfileComponent
{
port QosProfileTestConn::DDS_Write info_write;
- //port QosProfileTestConn::DDS_Update info_update;
};
};